[SCM] Samba Shared Repository - branch v4-12-test updated

Karolin Seeger kseeger at samba.org
Wed Jan 6 12:20:01 UTC 2021


The branch, v4-12-test has been updated
       via  9b5dd480590 bootstrap: Cope with case changes in CentOS 8 repo names
      from  d24a1173c9a lib: Avoid declaring zero-length VLAs in various messaging functions

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-12-test


- Log -----------------------------------------------------------------
commit 9b5dd480590fb4693547e9a1e27452058c0f5da8
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Dec 9 00:03:47 2020 +1100

    bootstrap: Cope with case changes in CentOS 8 repo names
    
    RN: Be more flexible with repository names in CentOS 8 test environments
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14594
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (backported from commit 1c59f49aaede8ec1662d4e49aef84fcd902a8a76)
    
    Autobuild-User(v4-12-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-12-test): Wed Jan  6 12:19:21 UTC 2021 on sn-devel-184

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

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


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56adf10c7be..c706dac66bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 41319f2580c026f66b2750604a0eb15d6b6f7b50
+  SAMBA_CI_CONTAINER_TAG: 8bec130a6b741608616302662edee02fd39f3baf
   #
   # 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 bcada1dc628..5ead9f74501 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -226,7 +226,8 @@ set -xueo pipefail
 yum update -y
 yum install -y dnf-plugins-core
 yum install -y epel-release
-yum config-manager --set-enabled PowerTools -y
+yum config-manager --set-enabled PowerTools -y || \
+    yum config-manager --set-enabled powertools -y
 yum update -y
 
 yum install -y \
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 22484b3f6ad..e6fab86e446 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -10,7 +10,8 @@ set -xueo pipefail
 yum update -y
 yum install -y dnf-plugins-core
 yum install -y epel-release
-yum config-manager --set-enabled PowerTools -y
+yum config-manager --set-enabled PowerTools -y || \
+    yum config-manager --set-enabled powertools -y
 yum update -y
 
 yum install -y \
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 62c2245564e..5328cff1cd3 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-41319f2580c026f66b2750604a0eb15d6b6f7b50
+8bec130a6b741608616302662edee02fd39f3baf


-- 
Samba Shared Repository



More information about the samba-cvs mailing list