[SCM] Samba Shared Repository - branch master updated
Martin Schwenke
martins at samba.org
Wed Aug 28 00:25:01 UTC 2024
The branch, master has been updated
via 8ab5a032d72 bootstrap: Migrate to Rocky8
from fab7416a3d2 idl: dnsp.h references NTTIME
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8ab5a032d72da6dfab595c00efd8c6123a4eefcd
Author: David Mulder <dmulder at samba.org>
Date: Tue Aug 27 09:32:43 2024 -0600
bootstrap: Migrate to Rocky8
Signed-off-by: David Mulder <dmulder at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Wed Aug 28 00:24:35 UTC 2024 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 8 ++++----
bootstrap/.gitlab-ci.yml | 2 +-
bootstrap/config.py | 13 +++++--------
bootstrap/generated-dists/Vagrantfile | 14 +++++++-------
bootstrap/generated-dists/{centos8s => rocky8}/Dockerfile | 2 +-
.../generated-dists/{centos8s => rocky8}/bootstrap.sh | 3 ---
bootstrap/generated-dists/{centos8s => rocky8}/locale.sh | 0
.../generated-dists/{centos8s => rocky8}/packages.yml | 0
bootstrap/sha1sum.txt | 2 +-
9 files changed, 19 insertions(+), 25 deletions(-)
rename bootstrap/generated-dists/{centos8s => rocky8}/Dockerfile (90%)
rename bootstrap/generated-dists/{centos8s => rocky8}/bootstrap.sh (92%)
rename bootstrap/generated-dists/{centos8s => rocky8}/locale.sh (100%)
rename bootstrap/generated-dists/{centos8s => rocky8}/packages.yml (100%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index acca9e0754b..660cb6e9735 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: d7e721bceae90834dfe04e8a9ba864a55d1c49e1
+ SAMBA_CI_CONTAINER_TAG: d1ce7e10953d16253a34b8e58077fd32c1dbd59c
#
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224
@@ -64,7 +64,7 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_debian11_32bit: debian11-32bit
SAMBA_CI_CONTAINER_IMAGE_debian12: debian12
SAMBA_CI_CONTAINER_IMAGE_opensuse155: opensuse155
- SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
+ SAMBA_CI_CONTAINER_IMAGE_rocky8: rocky8
SAMBA_CI_CONTAINER_IMAGE_centos9s: centos9s
SAMBA_CI_CONTAINER_IMAGE_fedora40: fedora40
@@ -662,10 +662,10 @@ opensuse155-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse155}
-centos8s-samba-o3:
+rocky8-samba-o3:
extends: .samba-o3-template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_rocky8}
centos9s-samba-o3:
extends: .samba-o3-template
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 1f94532e757..ac2b4ebed09 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -106,7 +106,7 @@ debian11-32bit:
variables:
SAMBA_CI_TEST_JOB: "samba-32bit"
-centos8s:
+rocky8:
extends: .build_image_template
centos9s:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 178c9029098..7e6c0f47d67 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -236,14 +236,11 @@ if [ ! -f /usr/bin/python3 ]; then
fi
"""
-CENTOS8S_YUM_BOOTSTRAP = r"""
+ROCKY8_DNF_BOOTSTRAP = r"""
#!/bin/bash
{GENERATED_MARKER}
set -xueo pipefail
-sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-sed -i '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
@@ -507,10 +504,10 @@ DEB_DISTS = {
RPM_DISTS = {
- 'centos8s': {
- 'docker_image': 'quay.io/centos/centos:stream8',
- 'vagrant_box': 'centos/stream8',
- 'bootstrap': CENTOS8S_YUM_BOOTSTRAP,
+ 'rocky8': {
+ 'docker_image': 'docker.io/library/rockylinux:8',
+ 'vagrant_box': 'rocky/8',
+ 'bootstrap': ROCKY8_DNF_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 79ccea780be..c1809cfe6b8 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -10,13 +10,6 @@ Vagrant.configure("2") do |config|
config.ssh.insert_key = false
- 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 "centos9s" do |v|
v.vm.box = "centos/stream9"
v.vm.hostname = "centos9s"
@@ -66,6 +59,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "opensuse155/locale.sh"
end
+ config.vm.define "rocky8" do |v|
+ v.vm.box = "rocky/8"
+ v.vm.hostname = "rocky8"
+ v.vm.provision :shell, path: "rocky8/bootstrap.sh"
+ v.vm.provision :shell, path: "rocky8/locale.sh"
+ end
+
config.vm.define "ubuntu1804" do |v|
v.vm.box = "ubuntu/bionic64"
v.vm.hostname = "ubuntu1804"
diff --git a/bootstrap/generated-dists/centos8s/Dockerfile b/bootstrap/generated-dists/rocky8/Dockerfile
similarity index 90%
rename from bootstrap/generated-dists/centos8s/Dockerfile
rename to bootstrap/generated-dists/rocky8/Dockerfile
index 3b5a681118f..146a6977d87 100644
--- a/bootstrap/generated-dists/centos8s/Dockerfile
+++ b/bootstrap/generated-dists/rocky8/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM quay.io/centos/centos:stream8
+FROM docker.io/library/rockylinux:8
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/rocky8/bootstrap.sh
similarity index 92%
rename from bootstrap/generated-dists/centos8s/bootstrap.sh
rename to bootstrap/generated-dists/rocky8/bootstrap.sh
index 9e0aabbac28..4b2c62c66d9 100755
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/rocky8/bootstrap.sh
@@ -7,9 +7,6 @@
set -xueo pipefail
-sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-sed -i '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
diff --git a/bootstrap/generated-dists/centos8s/locale.sh b/bootstrap/generated-dists/rocky8/locale.sh
similarity index 100%
rename from bootstrap/generated-dists/centos8s/locale.sh
rename to bootstrap/generated-dists/rocky8/locale.sh
diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/rocky8/packages.yml
similarity index 100%
rename from bootstrap/generated-dists/centos8s/packages.yml
rename to bootstrap/generated-dists/rocky8/packages.yml
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index bb0632e540d..e71a040595b 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-d7e721bceae90834dfe04e8a9ba864a55d1c49e1
+d1ce7e10953d16253a34b8e58077fd32c1dbd59c
--
Samba Shared Repository
More information about the samba-cvs
mailing list