Skip to content

Commit

Permalink
travis: Replace CentOS stream 8 with stream 9
Browse files Browse the repository at this point in the history
CentOS stream 8 reached end of life (EOL) on May 31, 2024. Replace
with CentOS stream 9.

Neither tpm2-tss-devel nor tss2-devel packages exist on CentOS 9.
Differentiate between Fedora and CentOS.

Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
  • Loading branch information
mimizohar committed Jun 27, 2024
1 parent 6adc50f commit f956a4b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ matrix:
compiler: gcc

- os: linux
env: REPO="quay.io/centos/" DISTRO="${REPO}centos:stream8" TSS=tpm2-tss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host"
env: REPO="quay.io/centos/" DISTRO="${REPO}centos:stream9" TSS=tpm2-tss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host"
compiler: clang

- os: linux
Expand Down
17 changes: 11 additions & 6 deletions ci/fedora.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ if [ -z "$CC" ]; then
exit 1
fi

case "$TSS" in
ibmtss) TSS="tss2-devel";;
tpm2-tss) TSS="tpm2-tss-devel";;
'') echo "Missing TSS!" >&2; exit 1;;
*) echo "Unsupported TSS: '$TSS'!" >&2; exit 1;;
esac
# Neither tss2-devel nor tpm2-tss-devel exist on CentOS stream 9
if [ -f /etc/centos-release ]; then
TSS="$TSS"
else
case "$TSS" in
ibmtss) TSS="tss2-devel";;
tpm2-tss) TSS="tpm2-tss-devel";;
'') echo "Missing TSS!" >&2; exit 1;;
*) echo "Unsupported TSS: '$TSS'!" >&2; exit 1;;
esac
fi

# ibmswtpm2 requires gcc
[ "$CC" = "gcc" ] || CC="gcc $CC"
Expand Down

0 comments on commit f956a4b

Please sign in to comment.