bootstrap: Update to openSUSE 15.4

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index c3174f5f1b5e2e051150c9175681e76c34d7132a..314d5210ca6381f9eed5c2879603feaa9d291ece 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: 1e06877f1afbb3dbd4283e00310d63216a274333
+  SAMBA_CI_CONTAINER_TAG: afb5d32dfeebf0f100bdf9073f0c802d051ec15e
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -61,7 +61,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ubuntu1804
   SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
   SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
-  SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153
+  SAMBA_CI_CONTAINER_IMAGE_opensuse154: opensuse154
   SAMBA_CI_CONTAINER_IMAGE_fedora36: fedora36
   SAMBA_CI_CONTAINER_IMAGE_f36mit120: f36mit120
   SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
@@ -547,7 +547,7 @@ pages:
 coverity:
   extends: .shared_runner_build_image
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse153}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse154}
   stage: build
   script:
     - wget https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O /tmp/coverity_tool.tgz
@@ -629,10 +629,10 @@ debian11-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11}
 
-opensuse153-samba-o3:
+opensuse154-samba-o3:
   extends: .samba-o3-template
   variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse153}
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse154}
 
 centos7-samba-o3:
   extends: .samba-o3-template

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 626e0103410dd444c187952daf575f497368d595..a9777348334fc85e7d6e288120d7baa884e5dc20 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -114,5 +114,5 @@ centos7:
     # We install a compat-gnutls34 package for GnuTLS >= 3.4.7
     PKG_CONFIG_PATH: /usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig
 
-opensuse153:
+opensuse154:
   extends: .build_image_template

diff --git a/bootstrap/config.py b/bootstrap/config.py
index bf2ce5207bb29c04ba3c552e9f6b4ad2cdd7509f..9546db1fb28325cd29764bfbb253ff9273352e34 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -517,9 +517,9 @@ RPM_DISTS = {
             'libtracker-sparql-2.0-dev': '',  # only tracker 3.x is available
         }
     },
-    'opensuse153': {
-        'docker_image': 'opensuse/leap:15.3',
-        'vagrant_box': 'opensuse/openSUSE-15.3-x86_64',
+    'opensuse154': {
+        'docker_image': 'opensuse/leap:15.4',
+        'vagrant_box': 'opensuse/openSUSE-15.4-x86_64',
         'bootstrap': ZYPPER_BOOTSTRAP,
         'replace': {
             '@development-tools': '',
@@ -531,7 +531,7 @@ RPM_DISTS = {
             'jansson-devel': 'libjansson-devel',
             'keyutils-libs-devel': 'keyutils-devel',
             'krb5-workstation': 'krb5-client',
-            'python3-libsemanage': 'python2-semanage',
+            'python3-libsemanage': 'python3-semanage',
             'openldap-devel': 'openldap2-devel',
             'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
             'perl-JSON-Parse': 'perl-JSON-XS',
@@ -546,8 +546,8 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
             'mold': '',
-            'ShellCheck': '',
             'shfmt': '',
+            'yum-utils': '',
         }
     }
 }

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 9b1b3f154d78a1e753b2f48982752f951b196853..28f8f89b7d9f60917f107592df7ffa832066a7fc 100644 (file)
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -45,11 +45,11 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "fedora36/locale.sh"
     end
 
-    config.vm.define "opensuse153" do |v|
-        v.vm.box = "opensuse/openSUSE-15.3-x86_64"
-        v.vm.hostname = "opensuse153"
-        v.vm.provision :shell, path: "opensuse153/bootstrap.sh"
-        v.vm.provision :shell, path: "opensuse153/locale.sh"
+    config.vm.define "opensuse154" do |v|
+        v.vm.box = "opensuse/openSUSE-15.4-x86_64"
+        v.vm.hostname = "opensuse154"
+        v.vm.provision :shell, path: "opensuse154/bootstrap.sh"
+        v.vm.provision :shell, path: "opensuse154/locale.sh"
     end
 
     config.vm.define "ubuntu1804" do |v|

diff --git a/bootstrap/generated-dists/opensuse153/Dockerfile b/bootstrap/generated-dists/opensuse154/Dockerfile
similarity index 92%
rename from bootstrap/generated-dists/opensuse153/Dockerfile
rename to bootstrap/generated-dists/opensuse154/Dockerfile
index f252e8b28771b90160410f7a6697770a999dcccc..a6bdd6cb328ea2cd34613b9b14fb4e36faa30b1f 100644 (file)
--- a/bootstrap/generated-dists/opensuse153/Dockerfile
+++ b/bootstrap/generated-dists/opensuse154/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM opensuse/leap:15.3
+FROM opensuse/leap:15.4
 
 # pass in with --build-arg while build
 ARG SHA1SUM

diff --git a/bootstrap/generated-dists/opensuse153/bootstrap.sh b/bootstrap/generated-dists/opensuse154/bootstrap.sh
similarity index 98%
rename from bootstrap/generated-dists/opensuse153/bootstrap.sh
rename to bootstrap/generated-dists/opensuse154/bootstrap.sh
index fb155f18312481e57ae32624f5345a5373d07fff..33f46c412843ede17d9f02c0e36dbe674306c78b 100755 (executable)
--- a/bootstrap/generated-dists/opensuse153/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse154/bootstrap.sh
@@ -12,6 +12,7 @@ zypper --non-interactive update
 zypper --non-interactive install \
     --no-recommends \
     system-user-nobody \
+    ShellCheck \
     acl \
     attr \
     autoconf \
@@ -81,7 +82,6 @@ zypper --non-interactive install \
     popt-devel \
     procps \
     psmisc \
-    python2-semanage \
     python3 \
     python3-Markdown \
     python3-cryptography \
@@ -92,6 +92,7 @@ zypper --non-interactive install \
     python3-pyasn1 \
     python3-python-dateutil \
     python3-requests \
+    python3-semanage \
     python3-setproctitle \
     readline-devel \
     rng-tools \
@@ -108,7 +109,6 @@ zypper --non-interactive install \
     which \
     xfsprogs-devel \
     xz \
-    yum-utils \
     zlib-devel
 
 zypper --non-interactive clean

diff --git a/bootstrap/generated-dists/opensuse153/locale.sh b/bootstrap/generated-dists/opensuse154/locale.sh
similarity index 100%
rename from bootstrap/generated-dists/opensuse153/locale.sh
rename to bootstrap/generated-dists/opensuse154/locale.sh

diff --git a/bootstrap/generated-dists/opensuse153/packages.yml b/bootstrap/generated-dists/opensuse154/packages.yml
similarity index 96%
rename from bootstrap/generated-dists/opensuse153/packages.yml
rename to bootstrap/generated-dists/opensuse154/packages.yml
index d555584c630929257ab13cf1d471df99c1038994..ddb2d37c4b702a1b7ef1044fde0520879d927dd8 100644 (file)
--- a/bootstrap/generated-dists/opensuse153/packages.yml
+++ b/bootstrap/generated-dists/opensuse154/packages.yml
@@ -1,5 +1,6 @@
 ---
 packages:
+  - ShellCheck
   - acl
   - attr
   - autoconf
@@ -69,7 +70,6 @@ packages:
   - popt-devel
   - procps
   - psmisc
-  - python2-semanage
   - python3
   - python3-Markdown
   - python3-cryptography
@@ -80,6 +80,7 @@ packages:
   - python3-pyasn1
   - python3-python-dateutil
   - python3-requests
+  - python3-semanage
   - python3-setproctitle
   - readline-devel
   - rng-tools
@@ -96,5 +97,4 @@ packages:
   - which
   - xfsprogs-devel
   - xz
-  - yum-utils
   - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 0830eea5f84fa2662d8ed8a50e2e5bd8786ff1de..b87fad087bb422978a4bd36eaad3a4318ed114c5 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-1e06877f1afbb3dbd4283e00310d63216a274333
+afb5d32dfeebf0f100bdf9073f0c802d051ec15e