diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index c0fc81073..2d1c21d6d 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -16,7 +16,7 @@ jobs: # Don't cancel the remaining running jobs if some job(s) fail(s) fail-fast: false matrix: - image: ['centos:centos7', 'rockylinux:8', 'quay.io/centos/centos:stream8'] + image: ['rockylinux:8'] components: ['udt,myproxy,ssh', 'gram5'] # Ignore UDT for the CentOS Stream 9 case because libnice is not available there yet include: @@ -52,11 +52,11 @@ jobs: # SSH key recipe from https://www.webfactory.de/blog/use-ssh-key-for-private-repositories-in-github-actions - name: Establish ssh and upload source tarballs - # Only run this step for the centos:centos7 case and + # Only run this step for the rockylinux:8 case and # for only one component selection (must be the same as for the previous step!) and # only when a tag was created if: | - contains(matrix.image , 'centos:centos7') && + contains(matrix.image , 'rockylinux:8') && contains(matrix.components , 'gram5') && contains(github.ref , 'refs/tags/') env: diff --git a/.travis.yml b/.travis.yml index f2443fb30..66ec3b43a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ jobs: arch: - ppc64le env: - - IMAGE=centos:centos7 TASK=tests COMPONENTS=udt,myproxy,ssh + - IMAGE=rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh stage: test services: - docker @@ -47,10 +47,10 @@ jobs: arch: - ppc64le env: - - IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5 + - IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5 - <<: *run_tests arch: - arm64 env: - - IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5 + - IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5 diff --git a/travis-ci/make_rpms.sh b/travis-ci/make_rpms.sh index 7086e489d..f4974a039 100755 --- a/travis-ci/make_rpms.sh +++ b/travis-ci/make_rpms.sh @@ -17,8 +17,6 @@ usage() umask 022 case $( /dev/null || useradd travis -u $TRAVISUID -o