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.

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

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index dc46d4beaeb4eda021f0b67504a0dde2b2c22e99..5235254889e80a224b1e2bd0b54261e57e5455cd 100644 (file)
--- 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: 44771060ac5c91a1feb9a85a7b722893b6f8d843
+  SAMBA_CI_CONTAINER_TAG: 3179d5d22844628ed6b3f4236f90b859315770b4
   #
   # 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 621912a7d94d5123a81f2b986dc5838feb0426da..eeedd72f8201504856baff958bfa7d1fb481f05c 100644 (file)
--- 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 60cf3937cf7166c240c032b139d1aeff87034981..db9d0bb8b6c150134ad9756b402938d3a4193695 100755 (executable)
--- 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 22c597c236182b80380a24489f3190579eed7180..b889fd18b1f36cea1660cb6dfc7ff8a3fcf5a18b 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-44771060ac5c91a1feb9a85a7b722893b6f8d843
+3179d5d22844628ed6b3f4236f90b859315770b4