sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +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>
This commit is contained in:
Martin Schwenke 2020-12-09 00:03:47 +11:00 committed by Martin Schwenke
parent 4925692599
commit 1c59f49aae
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -32,7 +32,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
SAMBA_CI_CONTAINER_TAG: 42ecbfbf716fa85ce251a955de72a92af26fc7b2
SAMBA_CI_CONTAINER_TAG: c4c00eb35cae36d8d6e752ee01fd943432993721
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.

6
bootstrap/config.py
View File

@ -235,8 +235,10 @@ yum install -y dnf-plugins-core
yum install -y epel-release
yum -v repolist all
yum config-manager --set-enabled PowerTools -y
yum config-manager --set-enabled Devel -y
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
yum update -y
yum install -y \

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

@ -12,8 +12,10 @@ yum install -y dnf-plugins-core
yum install -y epel-release
yum -v repolist all
yum config-manager --set-enabled PowerTools -y
yum config-manager --set-enabled Devel -y
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
yum update -y
yum install -y \

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
42ecbfbf716fa85ce251a955de72a92af26fc7b2
c4c00eb35cae36d8d6e752ee01fd943432993721