From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 10 Oct 2022 00:54:08 +0000 (+1300)
Subject: bootstrap: Remove duplicate line from CentOS 8 powertools install
X-Git-Tag: talloc-2.4.0~490
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dcd8369fe7e6c7664f5e18324e85e0c4eebb2d5;p=thirdparty%2Fsamba.git

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 40a1ce08795..44ab4d1345d 100644
--- 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 7f29670f091..79e19308fdb 100644
--- 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 cc3d92eaeb4..0dc04a843dd 100755
--- 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 fb988930857..7a78c020f24 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-9750e28fd7d913d3f1dd9a9cc0b49b712735b713
+a5335bb5004bdcba5ab7e064164d5e70b76bea0f