bootstrap: Migrate to CentOS8 Stream

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): Fri Feb  4 21:11:40 UTC 2022 on sn-devel-184

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 5235254889e80a224b1e2bd0b54261e57e5455cd..8f5c0581cf9ec6c2896ac25dc98372a488c0ae77 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: 3179d5d22844628ed6b3f4236f90b859315770b4
+  SAMBA_CI_CONTAINER_TAG: 751901cf8356d45e7027b23a60e7a8179e014b98
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -64,7 +64,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34
   SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
   SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
-  SAMBA_CI_CONTAINER_IMAGE_centos8: centos8
+  SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
 
 include:
   # The image creation details are specified in a separate file
@@ -594,10 +594,10 @@ centos7-samba-o3:
     # We need a newer GnuTLS version on CentOS7
     PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls37/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
 
-centos8-samba-o3:
+centos8s-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
 
 fedora34-samba-o3:
   extends: .samba-o3-template

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index f3ec2e98dff8d7b3cbb42b098e973d0c377401c4..bf41a9845b8573bb4588ba504453585e0ce701f1 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -106,7 +106,7 @@ fedora34:
 fedora35:
   extends: .build_image_template
 
-centos8:
+centos8s:
   extends: .build_image_template
 
 centos7:

diff --git a/bootstrap/config.py b/bootstrap/config.py
index eeedd72f8201504856baff958bfa7d1fb481f05c..9abef5074d0e6869e2ca9c957ed1f50c2a75ed93 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -230,28 +230,18 @@ if [ ! -f /usr/bin/python3 ]; then
 fi
 """
 
-CENTOS8_YUM_BOOTSTRAP = r"""
+CENTOS8S_YUM_BOOTSTRAP = r"""
 #!/bin/bash
 {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
 
 yum -v repolist all
-yum config-manager --set-enabled PowerTools -y || \
+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
 
@@ -469,10 +459,10 @@ RPM_DISTS = {
             'tracker-devel': '', # do not install
         }
     },
-    'centos8': {
-        'docker_image': 'centos:8',
-        'vagrant_box': 'centos/8',
-        'bootstrap': CENTOS8_YUM_BOOTSTRAP,
+    'centos8s': {
+        'docker_image': 'quay.io/centos/centos:stream8',
+        'vagrant_box': 'centos/stream8',
+        'bootstrap': CENTOS8S_YUM_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
             '@development-tools': '"@Development Tools"',  # add quotes

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 6d29c774cc9f4b3fccc14a32c9ff78c250740a1c..0bee124afa92f138a2a7872c72bd4a67bdc620c0 100644 (file)
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -17,11 +17,11 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "centos7/locale.sh"
     end
 
-    config.vm.define "centos8" do |v|
-        v.vm.box = "centos/8"
-        v.vm.hostname = "centos8"
-        v.vm.provision :shell, path: "centos8/bootstrap.sh"
-        v.vm.provision :shell, path: "centos8/locale.sh"
+    config.vm.define "centos8s" do |v|
+        v.vm.box = "centos/stream8"
+        v.vm.hostname = "centos8s"
+        v.vm.provision :shell, path: "centos8s/bootstrap.sh"
+        v.vm.provision :shell, path: "centos8s/locale.sh"
     end
 
     config.vm.define "debian10" do |v|

diff --git a/bootstrap/generated-dists/centos8/Dockerfile b/bootstrap/generated-dists/centos8s/Dockerfile
similarity index 95%
rename from bootstrap/generated-dists/centos8/Dockerfile
rename to bootstrap/generated-dists/centos8s/Dockerfile
index f6343e9d5a23d730c0fccd469aec94f5b45f8dbf..1c932f58a940a299d1ca83d4e7426e4434948cea 100644 (file)
--- a/bootstrap/generated-dists/centos8/Dockerfile
+++ b/bootstrap/generated-dists/centos8s/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM centos:8
+FROM quay.io/centos/centos:stream8
 
 # pass in with --build-arg while build
 ARG SHA1SUM

diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
similarity index 79%
rename from bootstrap/generated-dists/centos8/bootstrap.sh
rename to bootstrap/generated-dists/centos8s/bootstrap.sh
index db9d0bb8b6c150134ad9756b402938d3a4193695..1111450c400f3cff8b61e089a02dab3e9858a058 100755 (executable)
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -7,23 +7,13 @@
 
 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
 
 yum -v repolist all
-yum config-manager --set-enabled PowerTools -y || \
+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
 

diff --git a/bootstrap/generated-dists/centos8/locale.sh b/bootstrap/generated-dists/centos8s/locale.sh
similarity index 100%
rename from bootstrap/generated-dists/centos8/locale.sh
rename to bootstrap/generated-dists/centos8s/locale.sh

diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml
similarity index 100%
rename from bootstrap/generated-dists/centos8/packages.yml
rename to bootstrap/generated-dists/centos8s/packages.yml

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b889fd18b1f36cea1660cb6dfc7ff8a3fcf5a18b..ba31d4aff3c49db1959eecf07a5864a35eed2552 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-3179d5d22844628ed6b3f4236f90b859315770b4
+751901cf8356d45e7027b23a60e7a8179e014b98