Skip to content

Commit

Permalink
bootstrap: Cope with case changes in CentOS 8 repo names
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
  • Loading branch information
@martin-schwenke
martin-schwenke authored and Martin Schwenke committed Dec 15, 2020
1 parent 4925692 commit 1c59f49
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 4 additions & 2 deletions bootstrap/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,10 @@
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 \
Expand Down
6 changes: 4 additions & 2 deletions bootstrap/generated-dists/centos8/bootstrap.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/sha1sum.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
42ecbfbf716fa85ce251a955de72a92af26fc7b2
c4c00eb35cae36d8d6e752ee01fd943432993721

0 comments on commit 1c59f49

Please sign in to comment.