diff --git a/.github/workflows/tarball-build-test.yml b/.github/workflows/tarball-build-test.yml index 90c6321..25980fb 100644 --- a/.github/workflows/tarball-build-test.yml +++ b/.github/workflows/tarball-build-test.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - OS_TYPE: ["centos"] - OS_VERSION: [7, 8] - OSG_VERSION: [3.6] + OS_TYPE: ["almalinux"] + OS_VERSION: [8, 9] + OSG_VERSION: [3.6.123456, 23.123456] env: OS_TYPE: ${{ matrix.OS_TYPE }} OS_VERSION: ${{ matrix.OS_VERSION }} diff --git a/tests/setup_tests.sh b/tests/setup_tests.sh index 3c8fe37..b676600 100755 --- a/tests/setup_tests.sh +++ b/tests/setup_tests.sh @@ -3,8 +3,8 @@ pkg_name=tarball-client image= case "${OS_TYPE}${OS_VERSION}" in - centos7) image=centos:centos7 ;; - centos8) image=quay.io/centos/centos:stream8 ;; + almalinux8) image=almalinux:8 ;; + almalinux9) image=almalinux:9 ;; *) echo >&2 "${OS_TYPE}${OS_VERSION} not supported"; exit 1 ;; esac diff --git a/tests/test_inside_docker.sh b/tests/test_inside_docker.sh index 80831c6..7fa704e 100755 --- a/tests/test_inside_docker.sh +++ b/tests/test_inside_docker.sh @@ -14,16 +14,13 @@ rpm -U https://dl.fedoraproject.org/pub/epel/epel-release-latest-${OS_VERSION}.n # Broken mirror? echo "exclude=mirror.beyondhosting.net" >> /etc/yum/pluginconf.d/fastestmirror.conf -yum -y install /bin/mount patch python2 yum-utils +yum -y install /bin/mount patch python3 yum-utils if [[ $OS_VERSION -lt 8 ]]; then yum -y install yum-plugin-priorities fi pushd tarball-client -args=(--osgver ${OSG_VERSION} --dver el${OS_VERSION} --basearch x86_64 --bundle osg-wn-client-${OSG_VERSION}) -if [[ $OSG_VERSION == 3.5 ]]; then - args+=(--version=3.5.99) -fi +args=(--version ${OSG_VERSION} --dver el${OS_VERSION} --basearch x86_64) ./make-client-tarball "${args[@]}" popd