[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Tue Oct 8 08:28:03 UTC 2019 

The branch, master has been updated
       via  c9d302f20b0 gitlab-ci: Add CentOS 8 to CI
       via  9cd0d153701 bootstrap: We can only build docker images on gitlab shared runners
       via  42edab7bd76 bootstrap: Remove pyhton2 packages
      from  7bceafe8401 s3/passdb: clang: Fix 'Value stored during initialization is never read'

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


- Log -----------------------------------------------------------------
commit c9d302f20b066267a8fd2d7ce4dc171161c9c40c
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Oct 7 11:28:24 2019 +0200

    gitlab-ci: Add CentOS 8 to CI
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Oct  8 08:27:50 UTC 2019 on sn-devel-184

commit 9cd0d15370142b3694a51fa9b6cfffdb8e08e886
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Oct 7 13:28:07 2019 +0200

    bootstrap: We can only build docker images on gitlab shared runners
    
    Our rackspace runners don't provide a running docker.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

commit 42edab7bd76022dd4d5338012f29aed29a2a2d89
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Oct 7 11:50:58 2019 +0200

    bootstrap: Remove pyhton2 packages
    
    We dropped support for python2 in Samba already.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

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

Summary of changes:
 .gitlab-ci.yml                                     |  7 +++-
 bootstrap/.gitlab-ci.yml                           |  4 ++
 bootstrap/config.py                                | 43 +++++++++++++++++-----
 bootstrap/generated-dists/Vagrantfile              |  7 ++++
 bootstrap/generated-dists/centos6/bootstrap.sh     |  5 ---
 bootstrap/generated-dists/centos6/packages.yml     |  5 ---
 bootstrap/generated-dists/centos7/bootstrap.sh     |  5 ---
 bootstrap/generated-dists/centos7/packages.yml     |  5 ---
 .../{debian7 => centos8}/Dockerfile                |  2 +-
 .../{fedora29 => centos8}/bootstrap.sh             | 27 ++++++--------
 .../generated-dists/{centos6 => centos8}/locale.sh |  0
 .../{fedora30 => centos8}/packages.yml             | 17 ++-------
 bootstrap/generated-dists/debian7/bootstrap.sh     |  8 ----
 bootstrap/generated-dists/debian7/packages.yml     |  8 ----
 bootstrap/generated-dists/debian8/bootstrap.sh     |  8 ----
 bootstrap/generated-dists/debian8/packages.yml     |  8 ----
 bootstrap/generated-dists/debian9/bootstrap.sh     |  8 ----
 bootstrap/generated-dists/debian9/packages.yml     |  8 ----
 bootstrap/generated-dists/fedora28/bootstrap.sh    |  5 ---
 bootstrap/generated-dists/fedora28/packages.yml    |  5 ---
 bootstrap/generated-dists/fedora29/bootstrap.sh    |  5 ---
 bootstrap/generated-dists/fedora29/packages.yml    |  5 ---
 bootstrap/generated-dists/fedora30/bootstrap.sh    |  5 ---
 bootstrap/generated-dists/fedora30/packages.yml    |  5 ---
 bootstrap/generated-dists/opensuse150/bootstrap.sh |  5 ---
 bootstrap/generated-dists/opensuse150/packages.yml |  5 ---
 bootstrap/generated-dists/opensuse151/bootstrap.sh |  5 ---
 bootstrap/generated-dists/opensuse151/packages.yml |  5 ---
 bootstrap/generated-dists/ubuntu1404/bootstrap.sh  |  8 ----
 bootstrap/generated-dists/ubuntu1404/packages.yml  |  8 ----
 bootstrap/generated-dists/ubuntu1604/bootstrap.sh  |  8 ----
 bootstrap/generated-dists/ubuntu1604/packages.yml  |  8 ----
 bootstrap/generated-dists/ubuntu1804/bootstrap.sh  |  8 ----
 bootstrap/generated-dists/ubuntu1804/packages.yml  |  8 ----
 bootstrap/sha1sum.txt                              |  2 +-
 35 files changed, 67 insertions(+), 208 deletions(-)
 copy bootstrap/generated-dists/{debian7 => centos8}/Dockerfile (92%)
 copy bootstrap/generated-dists/{fedora29 => centos8}/bootstrap.sh (84%)
 copy bootstrap/generated-dists/{centos6 => centos8}/locale.sh (100%)
 copy bootstrap/generated-dists/{fedora30 => centos8}/packages.yml (83%)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 734d5152c00..01838b93d72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: e4c3da88c459ae1a97c1c5e41f52b17d688d295f
+  SAMBA_CI_CONTAINER_TAG: 4a498d9dd6c861b85bf4a749f3feb0805ea7298e
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -41,6 +41,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_fedora30: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora30:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_centos8: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos8:${SAMBA_CI_CONTAINER_TAG}
 
 include:
   # The image creation details are specified in a separate file
@@ -271,6 +272,10 @@ centos7-samba-o3:
     # We need a newer GnuTLS version on CentOS7
     PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
 
+centos8-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_centos8
+
 fedora29-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 8254986d2dc..e474b4b500f 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -6,6 +6,7 @@ services:
   stage: images
   tags:
     - docker
+    - shared
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
   before_script:
@@ -109,6 +110,9 @@ fedora29:
 fedora28:
   extends: .build_image_template_force_broken
 
+centos8:
+  extends: .build_image_template
+
 centos7:
   extends: .build_image_template
   variables:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index f4acdf5d925..7eca3a372ef 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -127,16 +127,6 @@ PKGS = [
     ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
     ('mawk', 'gawk'),
 
-    # python
-    ('python-dev', 'python-devel'),
-    ('python-dbg', ''),
-    ('python-iso8601', ''),
-    ('python-gpg', 'python2-gpg'),  # defaults to ubuntu/fedora latest
-    ('python-crypto', 'python-crypto'),
-    ('python-markdown', 'python-markdown'),
-    ('python-dnspython', 'python-dns'),
-    ('python-pexpect', ''),  # for wintest only
-
     ('python3', 'python3'),
     ('python3-dev', 'python3-devel'),
     ('python3-dbg', ''),
@@ -228,6 +218,23 @@ if [ ! -f /usr/bin/python3 ]; then
 fi
 """
 
+CENTOS8_YUM_BOOTSTRAP = r"""
+#!/bin/bash
+{GENERATED_MARKER}
+set -xueo pipefail
+
+yum update -y
+yum install -y dnf-plugins-core
+yum install -y epel-release
+yum config-manager --set-enabled PowerTools -y
+yum update -y
+
+yum install -y \
+    --setopt=install_weak_deps=False \
+    {pkgs}
+
+yum clean all
+"""
 
 DNF_BOOTSTRAP = r"""
 #!/bin/bash
@@ -483,6 +490,22 @@ RPM_DISTS = {
             'gnutls-devel': 'compat-gnutls34-devel',
         }
     },
+    'centos8': {
+        'docker_image': 'centos:8',
+        'vagrant_box': 'centos/8',
+        'bootstrap': CENTOS8_YUM_BOOTSTRAP,
+        'replace': {
+            'lsb-release': 'redhat-lsb',
+            '@development-tools': '"@Development Tools"',  # add quotes
+            'libsemanage-python': 'python3-libsemanage',
+            'lcov': '', # does not exist
+            'perl-JSON-Parse': '', # does not exist?
+            'perl-Test-Base': 'perl-Test-Simple',
+            'policycoreutils-python': 'python3-policycoreutils',
+            'python3-crypto': '',
+            'quota-devel': '', # FIXME: Add me back, once available!
+        }
+    },
     'fedora28': {
         'docker_image': 'fedora:28',
         'vagrant_box': 'fedora/28-cloud-base',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 941cc9a0735..1e984d20122 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -24,6 +24,13 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "centos7/locale.sh"
     end
 
+    config.vm.define "centos8" do |v|
+        v.vm.box = "centos/8"
+        v.vm.hostname = "centos8"
+        v.vm.provision :shell, path: "centos8/bootstrap.sh"
+        v.vm.provision :shell, path: "centos8/locale.sh"
+    end
+
     config.vm.define "debian7" do |v|
         v.vm.box = "debian/wheezy64"
         v.vm.hostname = "debian7"
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 441eba7918e..1082825e190 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -83,11 +83,6 @@ yum install -y \
     popt-devel \
     procps \
     psmisc \
-    pygpgme \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
     python3-crypto \
     python3-dns \
     python3-markdown \
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 168fbe9d334..76ad25de37c 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -69,11 +69,6 @@ packages:
   - popt-devel
   - procps
   - psmisc
-  - pygpgme
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
   - python3-crypto
   - python3-dns
   - python3-markdown
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index c74cdd470d0..629a88018bb 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -83,11 +83,6 @@ yum install -y \
     popt-devel \
     procps-ng \
     psmisc \
-    pygpgme \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
     python36 \
     python36-crypto \
     python36-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 9623698b9ff..57464db7bb0 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -69,11 +69,6 @@ packages:
   - popt-devel
   - procps-ng
   - psmisc
-  - pygpgme
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
   - python36
   - python36-crypto
   - python36-devel
diff --git a/bootstrap/generated-dists/debian7/Dockerfile b/bootstrap/generated-dists/centos8/Dockerfile
similarity index 92%
copy from bootstrap/generated-dists/debian7/Dockerfile
copy to bootstrap/generated-dists/centos8/Dockerfile
index dfe0e389653..f6343e9d5a2 100644
--- a/bootstrap/generated-dists/debian7/Dockerfile
+++ b/bootstrap/generated-dists/centos8/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM debian:7
+FROM centos:8
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
similarity index 84%
copy from bootstrap/generated-dists/fedora29/bootstrap.sh
copy to bootstrap/generated-dists/centos8/bootstrap.sh
index 048efa5f3a3..05972764d9b 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -7,11 +7,15 @@
 
 set -xueo pipefail
 
-dnf update -y
+yum update -y
+yum install -y dnf-plugins-core
+yum install -y epel-release
+yum config-manager --set-enabled PowerTools -y
+yum update -y
 
-dnf install -y \
+yum install -y \
     --setopt=install_weak_deps=False \
-    @development-tools \
+    "@Development Tools" \
     acl \
     attr \
     autoconf \
@@ -43,7 +47,6 @@ dnf install -y \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \
-    lcov \
     libacl-devel \
     libaio-devel \
     libarchive-devel \
@@ -55,7 +58,6 @@ dnf install -y \
     libicu-devel \
     libnsl2-devel \
     libpcap-devel \
-    libsemanage-python \
     libtasn1-devel \
     libtasn1-tools \
     libtirpc-devel \
@@ -74,28 +76,21 @@ dnf install -y \
     perl \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
-    perl-JSON-Parse \
     perl-Parse-Yapp \
-    perl-Test-Base \
+    perl-Test-Simple \
     perl-generators \
     perl-interpreter \
     pkgconfig \
-    policycoreutils-python \
     popt-devel \
     procps-ng \
     psmisc \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
-    python2-gpg \
     python3 \
-    python3-crypto \
     python3-devel \
     python3-dns \
     python3-gpg \
+    python3-libsemanage \
     python3-markdown \
-    quota-devel \
+    python3-policycoreutils \
     readline-devel \
     redhat-lsb \
     rng-tools \
@@ -112,4 +107,4 @@ dnf install -y \
     yum-utils \
     zlib-devel
 
-dnf clean all
\ No newline at end of file
+yum clean all
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos6/locale.sh b/bootstrap/generated-dists/centos8/locale.sh
similarity index 100%
copy from bootstrap/generated-dists/centos6/locale.sh
copy to bootstrap/generated-dists/centos8/locale.sh
diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
similarity index 83%
copy from bootstrap/generated-dists/fedora30/packages.yml
copy to bootstrap/generated-dists/centos8/packages.yml
index c96df0b96a1..5df66b5bd0f 100644
--- a/bootstrap/generated-dists/fedora30/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -1,6 +1,6 @@
 ---
 packages:
-  - @development-tools
+  - "@Development Tools"
   - acl
   - attr
   - autoconf
@@ -32,7 +32,6 @@ packages:
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server
-  - lcov
   - libacl-devel
   - libaio-devel
   - libarchive-devel
@@ -44,7 +43,6 @@ packages:
   - libicu-devel
   - libnsl2-devel
   - libpcap-devel
-  - libsemanage-python
   - libtasn1-devel
   - libtasn1-tools
   - libtirpc-devel
@@ -63,28 +61,21 @@ packages:
   - perl
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
-  - perl-JSON-Parse
   - perl-Parse-Yapp
-  - perl-Test-Base
+  - perl-Test-Simple
   - perl-generators
   - perl-interpreter
   - pkgconfig
-  - policycoreutils-python
   - popt-devel
   - procps-ng
   - psmisc
-  - python-crypto
-  - python-devel
-  - python-dns
-  - python-markdown
-  - python2-gpg
   - python3
-  - python3-crypto
   - python3-devel
   - python3-dns
   - python3-gpg
+  - python3-libsemanage
   - python3-markdown
-  - quota-devel
+  - python3-policycoreutils
   - readline-devel
   - redhat-lsb
   - rng-tools
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index 4e126cf5e8e..afbed5cf699 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -77,14 +77,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpgme \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 667825c283e..958130da942 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -66,14 +66,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpgme
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 4c8c65223f9..c28b8c75af1 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -80,14 +80,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpgme \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index a2d4bdb0638..ac02aaa98fe 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -69,14 +69,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpgme
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index fa7051a67e1..06943efaae0 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -80,14 +80,6 @@ apt-get -y install \
     pkg-config \
     procps \
     psmisc \
-    python-crypto \
-    python-dbg \
-    python-dev \
-    python-dnspython \
-    python-gpg \
-    python-iso8601 \
-    python-markdown \
-    python-pexpect \
     python3 \
     python3-crypto \
     python3-dbg \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 1e3bd0c380c..81b76bbf6f3 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -69,14 +69,6 @@ packages:
   - pkg-config
   - procps
   - psmisc
-  - python-crypto
-  - python-dbg
-  - python-dev
-  - python-dnspython
-  - python-gpg
-  - python-iso8601
-  - python-markdown
-  - python-pexpect
   - python3
   - python3-crypto
   - python3-dbg
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index 048efa5f3a3..a46bb5f6fcf 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -84,11 +84,6 @@ dnf install -y \
     popt-devel \
     procps-ng \
     psmisc \
-    python-crypto \
-    python-devel \
-    python-dns \
-    python-markdown \
-    python2-gpg \
     python3 \
     python3-crypto \
     python3-devel \
diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml


-- 
Samba Shared Repository

More information about the samba-cvs mailing list