bootstrap: Remove duplicate line from CentOS 8 powertools install

This was missed in 136ec5bc01e2648bae34a1158f923fbf5a86d561 when
we moved to CentOS 8 stream.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 40a1ce087951d69a187f9d8ff0a4a04b55225afc..44ab4d1345db7a2752f366128024bf316755eda2 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 9750e28fd7d913d3f1dd9a9cc0b49b712735b713
+  SAMBA_CI_CONTAINER_TAG: a5335bb5004bdcba5ab7e064164d5e70b76bea0f
   #
   # 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 7f29670f091cf1f5e63b21c8b57a44068646a3be..79e19308fdba24a662132da4d89f2d82181f1703 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -245,8 +245,7 @@ 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 powertools -y
+yum config-manager --set-enabled powertools -y
 
 yum update -y
 

diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index cc3d92eaeb43fbe2a2bc93339fde4f7fd4bcc493..0dc04a843ddb99a2d2d49dd77c2c2a2e3432bb3e 100755 (executable)
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -12,8 +12,7 @@ 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 powertools -y
+yum config-manager --set-enabled powertools -y
 
 yum update -y
 

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index fb9889308571a8696b991d4b9aa5ea896a712178..7a78c020f24878349c73375594caaedd806f27ba 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-9750e28fd7d913d3f1dd9a9cc0b49b712735b713
+a5335bb5004bdcba5ab7e064164d5e70b76bea0f