From 231b599c7613900a7e22f36428805a369ffa2736 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 8 Feb 2022 22:27:25 +0100 Subject: [PATCH 1/2] rpm/centos-8: adjust SUITE variable to keep it the same as before This was a bit of an oversight in 49ff9113494665d7aff0496a6aacf54a96bc344a; when checking if the `$SUITE` variable was used elsewhere, I searched for `$SUITE`, and not for `${SUITE}`. While it looks like the variable is not used for any of the rpm-related build-scripts, it _is_ used in deb-related scripts. Let's change it back to the previous value; just in case it will be used somewhere and causing side-effects. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit a82904b79cc9ad5dd90a6caef3ec4e010fe9080a) Signed-off-by: Sebastiaan van Stijn --- rpm/centos-8/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/centos-8/Dockerfile b/rpm/centos-8/Dockerfile index 75db612941..c4270befab 100644 --- a/rpm/centos-8/Dockerfile +++ b/rpm/centos-8/Dockerfile @@ -1,7 +1,7 @@ ARG GO_IMAGE ARG DISTRO=centos -ARG SUITE=stream8 -ARG BUILD_IMAGE=quay.io/centos/${DISTRO}:${SUITE} +ARG SUITE=8 +ARG BUILD_IMAGE=quay.io/centos/${DISTRO}:stream${SUITE} FROM ${GO_IMAGE} AS golang From a75ce2b81a233357e265b7f8fafa258d3a192a36 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 8 Feb 2022 22:35:28 +0100 Subject: [PATCH 2/2] Jenkinsfile: use quay.io/centos/centos:stream8 as well The `image` field in the Jenkinsfile is not really used in this repository (other than to name the stage), but in our internal pipeline, the equivalent is used for some validation steps (to be upstreamed to this repository). Let's update the Jenkinsfile to match our internal one, and to make sure we don't forget updating it when we upstream some of those validation steps. Relates to 49ff9113494665d7aff0496a6aacf54a96bc344a Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 95bf13b24bab938d64433a5eee790343e187045c) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 85b2beab3b..3ab44308b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ def branch = env.CHANGE_TARGET ?: env.BRANCH_NAME def pkgs = [ [target: "centos-7", image: "centos:7", arches: ["amd64", "aarch64"]], // (EOL: June 30, 2024) - [target: "centos-8", image: "centos:8", arches: ["amd64", "aarch64"]], + [target: "centos-8", image: "quay.io/centos/centos:stream8", arches: ["amd64", "aarch64"]], [target: "debian-buster", image: "debian:buster", arches: ["amd64", "aarch64", "armhf"]], // Debian 10 (EOL: 2024) [target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (Next stable) [target: "fedora-34", image: "fedora:34", arches: ["amd64", "aarch64"]], // EOL: May 17, 2022