bootstrap: Fix building CentOS 8 Stream container images

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15660

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit f3af6e860800d0f837cdf6c2d16d1cd12feb08df)

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 4c8656f592ad2794b6a8ac2aced1a28bb7c48a8e..4d6691b0d7c1cc968b5a8bb80f41d3946fa67a1d 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: d9d19d52a15960d98fa027aca14ffad20c84a980
+  SAMBA_CI_CONTAINER_TAG: bbc2e41b217a3318c654a45b79d4b5a5af4abeb3
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 5daf2d3ce5474da2624c540c4b3dbaa577693c33..aeea500aa9f1793b026e2b0441ed889f21800238 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -242,6 +242,9 @@ CENTOS8S_YUM_BOOTSTRAP = r"""
 {GENERATED_MARKER}
 set -xueo pipefail
 
+sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+
 yum update -y
 yum install -y dnf-plugins-core
 yum install -y epel-release

diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 6a76d40d70e2f5b0e698f8dd76ccb32afdcf1d29..5eea6f766a1717d3c17c1124dec14294f77529a0 100755 (executable)
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -7,6 +7,9 @@
 
 set -xueo pipefail
 
+sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+
 yum update -y
 yum install -y dnf-plugins-core
 yum install -y epel-release

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b790bd4bb34679aae22d98fbd894b5bf2134f0b9..669804c45452a1b179da862b6de38ee11b247db8 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-d9d19d52a15960d98fa027aca14ffad20c84a980
+bbc2e41b217a3318c654a45b79d4b5a5af4abeb3