[7.4] acdfe3d7e circleci: Retire CentOS jobs
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Fri Jun 21 13:42:15 UTC 2024
commit acdfe3d7e4fcd1257025de2ebecfa2f78e0e3b48
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Tue Jun 11 16:34:25 2024 +0200
circleci: Retire CentOS jobs
With CentOS reaching EOL at the end of the month and CentOS Stream 9
flaky packaging jobs, we don't need to keep them around. For el9 builds
we rely on the almalinux:9 image.
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 387743847..0cf89f30d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,7 +124,7 @@ jobs:
package:
parameters:
platform:
- description: the Linux distribution, with release, e.g. debian:buster, centos:7
+ description: the Linux distribution, with release, e.g. debian:buster, fedora:latest
type: string
rclass:
description: the resource class to use, usually arm.medium or medium
@@ -164,20 +164,14 @@ jobs:
command: |
mkdir -p packages
case "<< parameters.platform >>" in
- debian:*|ubuntu:*) EXT=deb ;;
- centos:*|fedora:*) EXT=rpm ;;
- almalinux:*) EXT=rpm ;;
- alpine:*) EXT=apk ;;
+ debian:*|ubuntu:*) EXT=deb ;;
+ almalinux:*|fedora:*) EXT=rpm ;;
+ alpine:*) EXT=apk ;;
*)
echo "unrecognized platform: << parameters.platform >>"
exit 1
esac
- case "<< parameters.platform >>" in
- centos:stream9) REPO=quay.io/centos/ ;;
- *) REPO= ;;
- esac
-
case "<< parameters.rclass >>" in
arm.*) ARCH=arm64 ;;
*) ARCH=amd64 ;;
@@ -191,7 +185,7 @@ jobs:
-e PARAM_RELEASE=$(echo "<< parameters.platform >>" | cut -d: -f2) \
-v$(pwd):/varnish-cache \
--platform linux/$ARCH \
- ${REPO}<< parameters.platform >> \
+ << parameters.platform >> \
/varnish-cache/.circleci/make-$EXT-packages.sh
- run:
name: List created packages
@@ -241,26 +235,23 @@ jobs:
docker cp /workspace workspace:/
docker run --volumes-from workspace -w /workspace << parameters.prefix >><< parameters.dist >>:<< parameters.release >> sh -c '
case "<< parameters.dist >>" in
- centos|almalinux|fedora)
- yum groupinstall -y "Development Tools"
+ almalinux|fedora)
+ dnf -y groupinstall "Development Tools"
case "<< parameters.dist >>:<< parameters.release >>" in
- centos:stream9|almalinux:9)
- dnf install -y "dnf-command(config-manager)"
- yum config-manager --set-enabled crb
- yum install -y diffutils
- yum install -y epel-release
+ almalinux:9)
+ dnf -y install "dnf-command(config-manager)"
+ dnf config-manager --set-enabled crb
+ dnf -y install diffutils
+ dnf -y install epel-release
;;
almalinux:8)
- dnf install -y "dnf-command(config-manager)"
- yum config-manager --set-enabled powertools
- yum install -y diffutils
- yum install -y epel-release
- ;;
- centos:7)
- yum install -y epel-release
+ dnf -y install "dnf-command(config-manager)"
+ dnf config-manager --set-enabled powertools
+ dnf -y install diffutils
+ dnf -y install epel-release
;;
esac
- yum install -y \
+ dnf -y install \
cpio \
automake \
git \
@@ -336,7 +327,7 @@ jobs:
archlinux)
useradd varnish
;;
- centos|almalinux|fedora)
+ almalinux|fedora)
adduser varnish
;;
*)
@@ -388,15 +379,6 @@ workflows:
- << pipeline.parameters.build-pkgs >>
- << pipeline.parameters.dist-url >>
jobs:
- - build:
- name: build_centos_7
- dist: centos
- release: "7"
- - build:
- name: build_centos_stream_9
- prefix: quay.io/centos/
- dist: centos
- release: stream9
- build:
name: build_almalinux_8
dist: almalinux
@@ -470,8 +452,6 @@ workflows:
- debian:buster
- debian:bullseye
- debian:bookworm
- - centos:7
- - centos:stream9
- almalinux:8
- almalinux:9
- fedora:latest
diff --git a/.circleci/make-rpm-packages.sh b/.circleci/make-rpm-packages.sh
index 848084bc4..4a9f8a142 100755
--- a/.circleci/make-rpm-packages.sh
+++ b/.circleci/make-rpm-packages.sh
@@ -6,30 +6,27 @@ echo "PARAM_RELEASE: $PARAM_RELEASE"
echo "PARAM_DIST: $PARAM_DIST"
if [ -z "$PARAM_RELEASE" ]; then
- echo "Env variable PARAM_RELEASE is not set! For example PARAM_RELEASE=stream, for CentOS stream"
+ echo "Env variable PARAM_RELEASE is not set! For example PARAM_RELEASE=9, for almalinux"
exit 1
elif [ -z "$PARAM_DIST" ]; then
- echo "Env variable PARAM_DIST is not set! For example PARAM_DIST=centos"
+ echo "Env variable PARAM_DIST is not set! For example PARAM_DIST=fedora"
exit 1
fi
case "$PARAM_DIST:$PARAM_RELEASE" in
almalinux:9)
- dnf install -y 'dnf-command(config-manager)'
- yum config-manager --set-enabled crb
- yum install -y epel-release
+ dnf -y install 'dnf-command(config-manager)'
+ dnf config-manager --set-enabled crb
+ dnf -y install epel-release
;;
- centos:stream|almalinux:8)
- dnf install -y 'dnf-command(config-manager)'
- yum config-manager --set-enabled powertools
- yum install -y epel-release
- ;;
- centos:7)
- yum install -y epel-release
+ almalinux:8)
+ dnf -y install 'dnf-command(config-manager)'
+ dnf config-manager --set-enabled powertools
+ dnf -y install epel-release
;;
esac
-yum install -y rpm-build yum-utils
+dnf -y install rpm-build dnf-utils
export DIST_DIR=build
@@ -73,7 +70,7 @@ rpmbuild() {
"$@"
}
-yum-builddep -y "$DIST_DIR"/redhat/varnish.spec
+dnf builddep -y "$DIST_DIR"/redhat/varnish.spec
rpmbuild -bs "$DIST_DIR"/redhat/varnish.spec
rpmbuild --rebuild "$RESULT_DIR"/varnish-*.src.rpm
More information about the varnish-commit
mailing list