The Samba-Bugzilla – Attachment 16369 Details for
Bug 14594
Samba test environment bootstrapping no longer works on CentOS 8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for 4.12
BZ14594-v4-12.patch (text/plain), 2.51 KB, created by
Martin Schwenke
on 2020-12-16 07:01:25 UTC
(
hide
)
Description:
Patch for 4.12
Filename:
MIME Type:
Creator:
Martin Schwenke
Created:
2020-12-16 07:01:25 UTC
Size:
2.51 KB
patch
obsolete
>From 95b5c376cd27666db5c9847c35b3e0153ce8504e Mon Sep 17 00:00:00 2001 >From: Martin Schwenke <martin@meltin.net> >Date: Wed, 9 Dec 2020 00:03:47 +1100 >Subject: [PATCH] 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@meltin.net> >Reviewed-by: Andrew Bartlett <abartlet@samba.org> >(backported from commit 1c59f49aaede8ec1662d4e49aef84fcd902a8a76) >--- > .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(-) > >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 >-- >2.29.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
abartlet
:
review+
martins
:
ci-passed+
Actions:
View
Attachments on
bug 14594
:
16368
| 16369