diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 80d30425d15..8220840d741 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: 38de01039fd443a1392050bdd4eab6cdc83f2e53 + SAMBA_CI_CONTAINER_TAG: 936722ecb26bedf6ea0acd9228963ce45ed419d4 # # We use the ubuntu2204 image as default as # it matches what we have on atb-devel-224 diff --git a/bootstrap/config.py b/bootstrap/config.py index d25fbfd6a36..8b2672f9ddd 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -248,6 +248,11 @@ set -xueo pipefail yum update -y yum install -y dnf-plugins-core yum install -y epel-release +yum install -y centos-release-ceph-pacific + +sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Ceph-* +sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Ceph-* +sed -i 's/$contentdir/centos/g' /etc/yum.repos.d/CentOS-Ceph-* yum -v repolist all yum config-manager --set-enabled powertools -y @@ -256,6 +261,7 @@ yum update -y yum install -y \ --setopt=install_weak_deps=False \ + --setopt=centos-ceph-pacific.module_hotfixes=true \ {pkgs} yum clean all @@ -528,7 +534,6 @@ RPM_DISTS = { 'ShellCheck': '', 'shfmt': '', 'codespell': '', - 'utf8proc-devel': '', } }, 'centos9s': { diff --git a/bootstrap/generated-dists/rocky8/bootstrap.sh b/bootstrap/generated-dists/rocky8/bootstrap.sh index 94219d81091..e8f632581d7 100755 --- a/bootstrap/generated-dists/rocky8/bootstrap.sh +++ b/bootstrap/generated-dists/rocky8/bootstrap.sh @@ -10,6 +10,11 @@ set -xueo pipefail yum update -y yum install -y dnf-plugins-core yum install -y epel-release +yum install -y centos-release-ceph-pacific + +sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Ceph-* +sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Ceph-* +sed -i 's/$contentdir/centos/g' /etc/yum.repos.d/CentOS-Ceph-* yum -v repolist all yum config-manager --set-enabled powertools -y @@ -18,6 +23,7 @@ yum update -y yum install -y \ --setopt=install_weak_deps=False \ + --setopt=centos-ceph-pacific.module_hotfixes=true \ "@Development Tools" \ acl \ attr \ @@ -118,6 +124,7 @@ yum install -y \ tar \ tracker-devel \ tree \ + utf8proc-devel \ wget \ which \ xfsprogs-devel \ diff --git a/bootstrap/generated-dists/rocky8/packages.yml b/bootstrap/generated-dists/rocky8/packages.yml index eba6d0df51c..cd91a67f11a 100644 --- a/bootstrap/generated-dists/rocky8/packages.yml +++ b/bootstrap/generated-dists/rocky8/packages.yml @@ -100,6 +100,7 @@ packages: - tar - tracker-devel - tree + - utf8proc-devel - wget - which - xfsprogs-devel diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 5c42c3950cd..25a8e482d2c 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -38de01039fd443a1392050bdd4eab6cdc83f2e53 +936722ecb26bedf6ea0acd9228963ce45ed419d4