[SCM] Samba Shared Repository - branch master updated

Samuel Cabrero scabrero at samba.org
Tue Nov 17 18:51:02 UTC 2020 

The branch, master has been updated
       via  41b2beeffb9 bootstrap: Add OpenSUSE 15.2
      from  6ac16232de7 autobuild: Encode text/plain into base64 to wrap long-lines

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 41b2beeffb94dac3679abc7b5c1187c1494f4970
Author: Samuel Cabrero <scabrero at samba.org>
Date:   Tue Nov 17 13:32:19 2020 +0100

    bootstrap: Add OpenSUSE 15.2
    
    Signed-off-by: Samuel Cabrero <scabrero at samba.org>
    
    Autobuild-User(master): Samuel Cabrero <scabrero at samba.org>
    Autobuild-Date(master): Tue Nov 17 18:50:05 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci.yml                                     | 12 +++++-----
 bootstrap/.gitlab-ci.yml                           |  4 ++--
 bootstrap/config.py                                | 14 +++++------
 bootstrap/generated-dists/Vagrantfile              | 14 +++++------
 bootstrap/generated-dists/opensuse150/Dockerfile   | 27 ----------------------
 .../{debian10 => opensuse152}/Dockerfile           |  2 +-
 .../{opensuse150 => opensuse152}/bootstrap.sh      |  2 ++
 .../{opensuse150 => opensuse152}/locale.sh         |  0
 .../{opensuse150 => opensuse152}/packages.yml      |  2 ++
 bootstrap/sha1sum.txt                              |  2 +-
 10 files changed, 27 insertions(+), 52 deletions(-)
 delete mode 100644 bootstrap/generated-dists/opensuse150/Dockerfile
 copy bootstrap/generated-dists/{debian10 => opensuse152}/Dockerfile (91%)
 rename bootstrap/generated-dists/{opensuse150 => opensuse152}/bootstrap.sh (97%)
 rename bootstrap/generated-dists/{opensuse150 => opensuse152}/locale.sh (100%)
 rename bootstrap/generated-dists/{opensuse150 => opensuse152}/packages.yml (96%)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77c57135b86..d65f4d2b769 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 446341a5c66a0cd04cac694991e4522385389e0f
+  SAMBA_CI_CONTAINER_TAG: d4867986881a9601c4620baf9a3bf28f5d1d1343
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -48,8 +48,8 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu2004:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_debian10: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian10:${SAMBA_CI_CONTAINER_TAG}
-  SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_opensuse151: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse151:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_opensuse152: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse152:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_fedora32: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora32:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_fedora33: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora33:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG}
@@ -330,14 +330,14 @@ debian10-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_debian10
 
-opensuse150-samba-o3:
-  extends: .samba-o3-template
-  image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150
-
 opensuse151-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_opensuse151
 
+opensuse152-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_opensuse152
+
 centos7-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_centos7
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index e9249f151a6..5f79ac1fbf2 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -116,8 +116,8 @@ 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
 
-opensuse150:
+opensuse151:
   extends: .build_image_template
 
-opensuse151:
+opensuse152:
   extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index fa313728f55..ecbc614f056 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -490,9 +490,9 @@ RPM_DISTS = {
             'policycoreutils-python': 'python3-policycoreutils',
         }
     },
-    'opensuse150': {
-        'docker_image': 'opensuse/leap:15.0',
-        'vagrant_box': 'opensuse/openSUSE-15.0-x86_64',
+    'opensuse151': {
+        'docker_image': 'opensuse/leap:15.1',
+        'vagrant_box': 'opensuse/openSUSE-15.1-x86_64',
         'bootstrap': ZYPPER_BOOTSTRAP,
         'replace': {
             '@development-tools': '',
@@ -522,9 +522,9 @@ RPM_DISTS = {
             'liburing-devel': '',   # not available
         }
     },
-    'opensuse151': {
-        'docker_image': 'opensuse/leap:15.1',
-        'vagrant_box': 'opensuse/openSUSE-15.1-x86_64',
+    'opensuse152': {
+        'docker_image': 'opensuse/leap:15.2',
+        'vagrant_box': 'opensuse/openSUSE-15.2-x86_64',
         'bootstrap': ZYPPER_BOOTSTRAP,
         'replace': {
             '@development-tools': '',
@@ -550,8 +550,6 @@ RPM_DISTS = {
             'quota-devel': '',
             'glusterfs-api-devel': '',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
-            'mingw64-gcc': '', # doesn't exist
-            'liburing-devel': '',   # not available, will be added in 15.2
         }
     }
 }
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index c6f59667f50..042e45238d3 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -45,13 +45,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "fedora33/locale.sh"
     end
 
-    config.vm.define "opensuse150" do |v|
-        v.vm.box = "opensuse/openSUSE-15.0-x86_64"
-        v.vm.hostname = "opensuse150"
-        v.vm.provision :shell, path: "opensuse150/bootstrap.sh"
-        v.vm.provision :shell, path: "opensuse150/locale.sh"
-    end
-
     config.vm.define "opensuse151" do |v|
         v.vm.box = "opensuse/openSUSE-15.1-x86_64"
         v.vm.hostname = "opensuse151"
@@ -59,6 +52,13 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "opensuse151/locale.sh"
     end
 
+    config.vm.define "opensuse152" do |v|
+        v.vm.box = "opensuse/openSUSE-15.2-x86_64"
+        v.vm.hostname = "opensuse152"
+        v.vm.provision :shell, path: "opensuse152/bootstrap.sh"
+        v.vm.provision :shell, path: "opensuse152/locale.sh"
+    end
+
     config.vm.define "ubuntu1604" do |v|
         v.vm.box = "ubuntu/xenial64"
         v.vm.hostname = "ubuntu1604"
diff --git a/bootstrap/generated-dists/opensuse150/Dockerfile b/bootstrap/generated-dists/opensuse150/Dockerfile
deleted file mode 100644
index fc8740b534d..00000000000
--- a/bootstrap/generated-dists/opensuse150/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM opensuse/leap:15.0
-
-# pass in with --build-arg while build
-ARG SHA1SUM
-RUN [ -n $SHA1SUM ] && echo $SHA1SUM > /sha1sum.txt
-
-ADD *.sh /tmp/
-# need root permission, do it before USER samba
-RUN /tmp/bootstrap.sh && /tmp/locale.sh
-
-# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
-
-# make test can not work with root, so we have to create a new user
-RUN useradd -m -U -s /bin/bash samba && \
-    mkdir -p /etc/sudoers.d && \
-    echo "samba ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/samba
-
-USER samba
-WORKDIR /home/samba
-# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/Dockerfile b/bootstrap/generated-dists/opensuse152/Dockerfile
similarity index 91%
copy from bootstrap/generated-dists/debian10/Dockerfile
copy to bootstrap/generated-dists/opensuse152/Dockerfile
index a7141db7e17..3d79adcb07d 100644
--- a/bootstrap/generated-dists/debian10/Dockerfile
+++ b/bootstrap/generated-dists/opensuse152/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM debian:10
+FROM opensuse/leap:15.2
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse152/bootstrap.sh
similarity index 97%
rename from bootstrap/generated-dists/opensuse150/bootstrap.sh
rename to bootstrap/generated-dists/opensuse152/bootstrap.sh
index 33c8aeb4021..e2d23c7b216 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse152/bootstrap.sh
@@ -57,12 +57,14 @@ zypper --non-interactive install \
     libtasn1-devel \
     libtirpc-devel \
     libunwind-devel \
+    liburing-devel \
     libuuid-devel \
     libxslt \
     lmdb \
     lmdb-devel \
     lsb-release \
     make \
+    mingw64-gcc \
     ncurses-devel \
     openldap2-devel \
     pam-devel \
diff --git a/bootstrap/generated-dists/opensuse150/locale.sh b/bootstrap/generated-dists/opensuse152/locale.sh
similarity index 100%
rename from bootstrap/generated-dists/opensuse150/locale.sh
rename to bootstrap/generated-dists/opensuse152/locale.sh
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse152/packages.yml
similarity index 96%
rename from bootstrap/generated-dists/opensuse150/packages.yml
rename to bootstrap/generated-dists/opensuse152/packages.yml
index 5e7b1a11d7a..f68b06394a9 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse152/packages.yml
@@ -45,12 +45,14 @@ packages:
   - libtasn1-devel
   - libtirpc-devel
   - libunwind-devel
+  - liburing-devel
   - libuuid-devel
   - libxslt
   - lmdb
   - lmdb-devel
   - lsb-release
   - make
+  - mingw64-gcc
   - ncurses-devel
   - openldap2-devel
   - pam-devel
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 72d059015c4..816528d3b0e 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-446341a5c66a0cd04cac694991e4522385389e0f
+d4867986881a9601c4620baf9a3bf28f5d1d1343


-- 
Samba Shared Repository

More information about the samba-cvs mailing list