[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Feb 4 21:12:01 UTC 2022
The branch, master has been updated
via 136ec5bc01e bootstrap: Migrate to CentOS8 Stream
from b2c301ad3b8 sharesec: Add SEC_DIR_DELETE_CHILD to CHANGE permissions
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 136ec5bc01e2648bae34a1158f923fbf5a86d561
Author: Andreas Schneider <asn at samba.org>
Date: Thu Feb 3 15:43:54 2022 +0100
bootstrap: Migrate to CentOS8 Stream
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Feb 4 21:11:40 UTC 2022 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 8 ++++----
bootstrap/.gitlab-ci.yml | 2 +-
bootstrap/config.py | 22 ++++++----------------
bootstrap/generated-dists/Vagrantfile | 10 +++++-----
.../{centos8 => centos8s}/Dockerfile | 2 +-
.../{centos8 => centos8s}/bootstrap.sh | 12 +-----------
.../{centos8 => centos8s}/locale.sh | 0
.../{centos8 => centos8s}/packages.yml | 0
bootstrap/sha1sum.txt | 2 +-
9 files changed, 19 insertions(+), 39 deletions(-)
rename bootstrap/generated-dists/{centos8 => centos8s}/Dockerfile (90%)
rename bootstrap/generated-dists/{centos8 => centos8s}/bootstrap.sh (79%)
rename bootstrap/generated-dists/{centos8 => centos8s}/locale.sh (100%)
rename bootstrap/generated-dists/{centos8 => centos8s}/packages.yml (100%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 5235254889e..8f5c0581cf9 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: 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 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
similarity index 90%
rename from bootstrap/generated-dists/centos8/Dockerfile
rename to 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
similarity index 79%
rename from bootstrap/generated-dists/centos8/bootstrap.sh
rename to 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
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 b889fd18b1f..ba31d4aff3c 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-3179d5d22844628ed6b3f4236f90b859315770b4
+751901cf8356d45e7027b23a60e7a8179e014b98
--
Samba Shared Repository
More information about the samba-cvs
mailing list