From: Andreas Schneider <asn@samba.org>
Date: Thu, 3 Feb 2022 06:53:33 +0000 (+0100)
Subject: bootstrap: Fix CentOS8 runner
X-Git-Tag: samba-4.15.11~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6881b17bf277c7b4958f66de7af5bdbdecc32eac;p=thirdparty%2Fsamba.git

bootstrap: Fix CentOS8 runner

CentOS8 is EOL since December 31, 2021. The packages move to vault.centos.org.
We should migrate to CentOS8 Stream soon.

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

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Feb  3 14:31:01 UTC 2022 on sn-devel-184

[abartlet@samba.org Adapted from commit 0c6554aa0d6812343a8155fca3d7a7993cd5c703
 by updating sha1sum]
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 125b3901832..c9864707de4 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: dd2b9a1848eed2d200e1a525695e40f06c23d888
+  SAMBA_CI_CONTAINER_TAG: fcac3e6e4fef4e0bef6c6e364c35e6e192b23add
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index fd75a771252..326d96ff9d8 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -235,6 +235,10 @@ CENTOS8_YUM_BOOTSTRAP = r"""
 {GENERATED_MARKER}
 set -xueo pipefail
 
+# CentOS8 is EOL
+sed -i -e "s|^mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-*
+sed -i -e "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
@@ -244,6 +248,11 @@ yum config-manager --set-enabled PowerTools -y || \
     yum config-manager --set-enabled powertools -y
 yum config-manager --set-enabled Devel -y || \
     yum config-manager --set-enabled devel -y
+
+# CentOS8 is EOL
+sed -i -e "s|^mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-*
+sed -i -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-*
+
 yum update -y
 
 yum install -y \
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 60cf3937cf7..db9d0bb8b6c 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -7,6 +7,10 @@
 
 set -xueo pipefail
 
+# CentOS8 is EOL
+sed -i -e "s|^mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-*
+sed -i -e "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
@@ -16,6 +20,11 @@ yum config-manager --set-enabled PowerTools -y || \
     yum config-manager --set-enabled powertools -y
 yum config-manager --set-enabled Devel -y || \
     yum config-manager --set-enabled devel -y
+
+# CentOS8 is EOL
+sed -i -e "s|^mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-*
+sed -i -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-*
+
 yum update -y
 
 yum install -y \
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 11369ced5f7..5716af2a689 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-dd2b9a1848eed2d200e1a525695e40f06c23d888
+fcac3e6e4fef4e0bef6c6e364c35e6e192b23add