diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | bootstrap/config.py | 4 | ||||
| -rwxr-xr-x | bootstrap/generated-dists/centos8/bootstrap.sh | 4 | ||||
| -rw-r--r-- | bootstrap/generated-dists/centos8/packages.yml | 1 | ||||
| -rw-r--r-- | bootstrap/sha1sum.txt | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68e1a52bf1e..07288ae9793 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: 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 62a59b5cc57..24f21a3c749 100644 --- 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 a211daf2162..b494d0040dd 100755 --- 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 4d87303bcc2..f3ba7a9088a 100644 --- 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 97c1408594b..345d4a95e98 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -c6ee634a9467e84ee8dd858b0b363f7a75973a66 +1275dc52ac8c1de5981f267df88b85b6f87e299a |