diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-12-09 00:03:47 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2020-12-15 11:02:34 +0000 |
| commit | 1c59f49aaede8ec1662d4e49aef84fcd902a8a76 (patch) | |
| tree | 693f3ad0b54e73ccbb1cadc89c9cb78c64710b52 | |
| parent | 49256925996ff5db509364c1c47d0ecd8d79d757 (diff) | |
| download | samba-1c59f49aaede8ec1662d4e49aef84fcd902a8a76.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>
| -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 accaced66a0..7a7582cb6db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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. diff --git a/bootstrap/config.py b/bootstrap/config.py index 982ebae1cd1..8383aeb392d 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -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 \ diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh index e5167a2b561..b9f2df67645 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 46493c16eb0..3e87c2ed1b0 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -42ecbfbf716fa85ce251a955de72a92af26fc7b2 +c4c00eb35cae36d8d6e752ee01fd943432993721 |