diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-12-09 00:03:47 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2021-01-05 12:50:02 +0000 |
| commit | c5159bd6d7678b62461da785a2994f1cf97ca5db (patch) | |
| tree | 99d5f1c5ce08f50806498117a1bd1c971723e9e4 | |
| parent | 6e6a16d88050ee7930f74e12615c0e046c3f9f77 (diff) | |
| download | samba-c5159bd6d7678b62461da785a2994f1cf97ca5db.tar.gz | |
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)
Autobuild-User(v4-13-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-13-test): Tue Jan 5 12:50:02 UTC 2021 on sn-devel-184
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | bootstrap/config.py | 6 | ||||
| -rwxr-xr-x | bootstrap/generated-dists/centos8/bootstrap.sh | 6 | ||||
| -rw-r--r-- | bootstrap/sha1sum.txt | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c657b4a1d8f..0004820968a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 1275dc52ac8c1de5981f267df88b85b6f87e299a + SAMBA_CI_CONTAINER_TAG: b5b78cacae2fa6cec91925170bc6d4e3774cac9b # # 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 24f21a3c749..320a28e0f00 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -232,8 +232,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 \ diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh index b494d0040dd..eeea0e8f3b3 100755 --- a/bootstrap/generated-dists/centos8/bootstrap.sh +++ b/bootstrap/generated-dists/centos8/bootstrap.sh @@ -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 \ diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 345d4a95e98..9101ad627cc 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -1275dc52ac8c1de5981f267df88b85b6f87e299a +b5b78cacae2fa6cec91925170bc6d4e3774cac9b |