[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Thu Feb 3 14:32:01 UTC 2022


The branch, master has been updated
       via  0c6554aa0d6 bootstrap: Fix CentOS8 runner
      from  6509715c037 tevent: add missing `#include <sys/types.h>`

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0c6554aa0d6812343a8155fca3d7a7993cd5c703
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Feb 3 07:53:33 2022 +0100

    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 at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Feb  3 14:31:01 UTC 2022 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci-main.yml                            | 2 +-
 bootstrap/config.py                            | 9 +++++++++
 bootstrap/generated-dists/centos8/bootstrap.sh | 9 +++++++++
 bootstrap/sha1sum.txt                          | 2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index dc46d4beaeb..5235254889e 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: 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 621912a7d94..eeedd72f820 100644
--- 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 60cf3937cf7..db9d0bb8b6c 100755
--- 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 22c597c2361..b889fd18b1f 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-44771060ac5c91a1feb9a85a7b722893b6f8d843
+3179d5d22844628ed6b3f4236f90b859315770b4


-- 
Samba Shared Repository



More information about the samba-cvs mailing list