diff options
author | Andreas Schneider <asn@samba.org> | 2022-02-03 15:43:54 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2022-02-04 21:11:40 +0000 |
commit | 136ec5bc01e2648bae34a1158f923fbf5a86d561 (patch) | |
tree | 566cc0d22bb86ed887b61bc9198cdc1a74387109 /bootstrap | |
parent | b2c301ad3b80c2a25627035e0caf1f8e619fe071 (diff) | |
download | samba-136ec5bc01e2648bae34a1158f923fbf5a86d561.tar.gz |
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
Diffstat (limited to 'bootstrap')
-rw-r--r-- | bootstrap/.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | bootstrap/config.py | 22 | ||||
-rw-r--r-- | bootstrap/generated-dists/Vagrantfile | 10 | ||||
-rw-r--r-- | bootstrap/generated-dists/centos8s/Dockerfile (renamed from bootstrap/generated-dists/centos8/Dockerfile) | 2 | ||||
-rwxr-xr-x | bootstrap/generated-dists/centos8s/bootstrap.sh (renamed from bootstrap/generated-dists/centos8/bootstrap.sh) | 12 | ||||
-rwxr-xr-x | bootstrap/generated-dists/centos8s/locale.sh (renamed from bootstrap/generated-dists/centos8/locale.sh) | 0 | ||||
-rw-r--r-- | bootstrap/generated-dists/centos8s/packages.yml (renamed from bootstrap/generated-dists/centos8/packages.yml) | 0 | ||||
-rw-r--r-- | bootstrap/sha1sum.txt | 2 |
8 files changed, 15 insertions, 35 deletions
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index f3ec2e98dff..bf41a9845b8 100644 --- 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 eeedd72f820..9abef5074d0 100644 --- 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 6d29c774cc9..0bee124afa9 100644 --- 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 index f6343e9d5a2..1c932f58a94 100644 --- 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 index db9d0bb8b6c..1111450c400 100755 --- 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 index cc64e180483..cc64e180483 100755 --- a/bootstrap/generated-dists/centos8/locale.sh +++ b/bootstrap/generated-dists/centos8s/locale.sh diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml index f5d0ac5ffe6..f5d0ac5ffe6 100644 --- a/bootstrap/generated-dists/centos8/packages.yml +++ b/bootstrap/generated-dists/centos8s/packages.yml diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index b889fd18b1f..ba31d4aff3c 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -3179d5d22844628ed6b3f4236f90b859315770b4 +751901cf8356d45e7027b23a60e7a8179e014b98 |