sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

bootstrap: Cope with case changes in CentOS 8 repo names

Browse Source 
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)

Autobuild-User(v4-12-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-12-test): Wed Jan  6 12:19:21 UTC 2021 on sn-devel-184
This commit is contained in:
Martin Schwenke 2020-12-09 00:03:47 +11:00 committed by Karolin Seeger
parent d24a1173c9
commit 9b5dd48059
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -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.

3
bootstrap/config.py
View File

@ -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 \

3
bootstrap/generated-dists/centos8/bootstrap.sh
View File

@ -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 \

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
41319f2580c026f66b2750604a0eb15d6b6f7b50
8bec130a6b741608616302662edee02fd39f3baf