bootstrap: Add back quota-devel on CentOS8

https://bugs.centos.org/view.php?id=16549

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68e1a52bf1eddb776ed72fca433e0204648363d1..07288ae97939cb021df21c1a0532461950792c5c 100644 (file)
--- 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: c6ee634a9467e84ee8dd858b0b363f7a75973a66
+  SAMBA_CI_CONTAINER_TAG: 1275dc52ac8c1de5981f267df88b85b6f87e299a
   #
   # 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 62a59b5cc57121e01d236dc3e2aeb597f4c1feb7..24f21a3c7490b1b6e4d698a96256050acf568bdb 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -230,7 +230,10 @@ set -xueo pipefail
 yum update -y
 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 update -y
 
 yum install -y \
@@ -460,7 +463,6 @@ RPM_DISTS = {
             'perl-JSON-Parse': '', # does not exist?
             'perl-Test-Base': 'perl-Test-Simple',
             'policycoreutils-python': 'python3-policycoreutils',
-            'quota-devel': '', # FIXME: Add me back, once available!
             'liburing-devel': '', # not available yet, Add me back, once available!
         }
     },

diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index a211daf2162bb55ebb97b9fdf5cae65afbe3cf1b..b494d0040dd6dd4e379c7c008b53935dcf1c7fc0 100755 (executable)
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -10,7 +10,10 @@ set -xueo pipefail
 yum update -y
 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 update -y
 
 yum install -y \
@@ -93,6 +96,7 @@ yum install -y \
     python3-markdown \
     python3-policycoreutils \
     python3-pyasn1 \
+    quota-devel \
     readline-devel \
     redhat-lsb \
     rng-tools \

diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 4d87303bcc244a069ae8e72dc51f8c585c48cb15..f3ba7a9088a5335ee0dc86642a8707f9969becef 100644 (file)
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -78,6 +78,7 @@ packages:
   - python3-markdown
   - python3-policycoreutils
   - python3-pyasn1
+  - quota-devel
   - readline-devel
   - redhat-lsb
   - rng-tools

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 97c1408594b2d9600813b67dc0c177b8e5012139..345d4a95e983c879056623367c706761b330ca09 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-c6ee634a9467e84ee8dd858b0b363f7a75973a66
+1275dc52ac8c1de5981f267df88b85b6f87e299a