Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retire CentOS 7 and CentOS Stream 8 for our CIs #228

Merged
merged 3 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
26 changes: 15 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ jobs:
- &run_tests
# Template; subsequent uses modify 'env'
arch:
- ppc64le
#- ppc64le
- arm64
env:
- IMAGE=centos:centos7 TASK=tests COMPONENTS=udt,myproxy,ssh
#- IMAGE=rockylinux:9 TASK=tests COMPONENTS=udt,myproxy,ssh
- IMAGE=rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh
stage: test
services:
- docker
Expand All @@ -39,18 +41,20 @@ jobs:
script:
- travis-ci/setup_tasks.sh

- <<: *run_tests
arch:
- arm64
# - <<: *run_tests
# arch:
# - arm64
# env:
# - IMAGE=rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh

- <<: *run_tests
arch:
- ppc64le
env:
- IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5
# - <<: *run_tests
# arch:
# - ppc64le
# env:
# - IMAGE=rockylinux:9 TASK=tests COMPONENTS=gram5

- <<: *run_tests
arch:
- arm64
env:
- IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5
- IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5
2 changes: 0 additions & 2 deletions travis-ci/make_rpms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ usage()
umask 022

case $(</etc/redhat-release) in
CentOS*\ 7*) OS=centos7 ;;
CentOS\ Stream*\ 8*) OS=centos-stream-8;;
CentOS\ Stream*\ 9*) OS=centos-stream-9;;
Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
Rocky\ Linux*\ 9*) OS=rockylinux9 ;;
Expand Down
2 changes: 0 additions & 2 deletions travis-ci/make_source_tarballs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
set -eu

case $(</etc/redhat-release) in
CentOS*\ 7*) OS=centos7 ;;
CentOS\ Stream*\ 8*) OS=centos-stream-8;;
CentOS\ Stream*\ 9*) OS=centos-stream-9;;
Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
Rocky\ Linux*\ 9*) OS=rockylinux9 ;;
Expand Down
61 changes: 15 additions & 46 deletions travis-ci/run_task_inside_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@ COMPONENTS=${3-}
set -e

case $(</etc/redhat-release) in
CentOS*\ 7*)

OS=centos7
release_ver=el7
;;

CentOS\ Stream*\ 8*)

OS=centos-stream-8
release_ver=el8
;;

CentOS\ Stream*\ 9*)

Expand All @@ -45,8 +34,6 @@ esac
# EPEL required for UDT
case $OS in
# from `https://docs.fedoraproject.org/en-US/epel/#_quickstart`
centos7) yum -y install epel-release
;;
rockylinux8)
dnf -y install dnf-plugins-core
dnf config-manager --set-enabled powertools
Expand All @@ -57,11 +44,6 @@ case $OS in
dnf config-manager --set-enabled crb
dnf -y install epel-release
;;
centos-stream-8)
dnf -y install dnf-plugins-core
dnf config-manager --set-enabled powertools
dnf -y install epel-release epel-next-release
;;
centos-stream-9)
dnf -y install dnf-plugins-core
dnf config-manager --set-enabled crb
Expand All @@ -79,23 +61,19 @@ packages=(gcc gcc-c++ make autoconf automake libtool \
'perl(URI)' file sudo bison patch curl \
pam pam-devel libedit libedit-devel)

if [[ $OS != *7 ]]; then

# provides `cmp` used by `packaging/git-dirt-filter`
packages+=(diffutils)
if [[ $OS == *9 ]]; then

# also install "zlib zlib-devel" because it's needed for `configure`ing
# "gridftp/server/src"
packages+=(zlib zlib-devel)
# "perl-English" isn't installed by default, so install it explicitly,
# because needed for "gridmap-tools-test.pl"
packages+=(perl-English)
# "perl-Sys-Hostname" isn't installed by default, so install it explicitly,
# because needed for globus_ftp_client test scripta.
# see https://github.com/fscheiner/gct/runs/5144915195?check_suite_focus=true#step:3:15649
packages+=(perl-Sys-Hostname)
fi
# provides `cmp` used by `packaging/git-dirt-filter`
packages+=(diffutils)
if [[ $OS == *9 ]]; then

# also install "zlib zlib-devel" because it's needed for `configure`ing
# "gridftp/server/src"
packages+=(zlib zlib-devel)
# "perl-English" isn't installed by default, so install it explicitly,
# because needed for "gridmap-tools-test.pl"
packages+=(perl-English)
# "perl-Sys-Hostname" isn't installed by default, so install it explicitly,
# because needed for globus_ftp_client test scripts.
packages+=(perl-Sys-Hostname)
fi

if [[ $TASK == tests ]]; then
Expand Down Expand Up @@ -123,12 +101,7 @@ elif [[ $TASK == *rpms ]]; then
# for myproxy:
packages+=(pam-devel voms-devel cyrus-sasl-devel openldap-devel voms-clients initscripts)
# for globus-net-manager:
if [[ $OS == *7 ]]; then

packages+=(python-devel)
else
packages+=(python3-devel)
fi
packages+=(python3-devel)
# for globus-gram-audit:
packages+=('perl(DBI)')
# for globus-scheduler-event-generator:
Expand All @@ -144,11 +117,7 @@ elif [[ $TASK == *rpms ]]; then
packages+=(pam libedit libedit-devel)
fi

if [[ $OS == *7 ]]; then
yum -y -d1 install "${packages[@]}"
else
dnf --allowerasing -y -d1 install "${packages[@]}"
fi
dnf --allowerasing -y -d1 install "${packages[@]}"

# UID of travis user inside needs to match UID of travis user outside
getent passwd travis > /dev/null || useradd travis -u $TRAVISUID -o
Expand Down
Loading