[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Fri Dec 6 00:17:02 UTC 2019 

The branch, master has been updated
       via  eefc8ee8e31 bootstrap: add debian10 support
       via  41f6248effa bootstrap: use runners with 'docker' and 'gce' tags for the image creation
      from  809247973d9 s3:locking: simplify code in get_share_mode_lock()

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


- Log -----------------------------------------------------------------
commit eefc8ee8e31c108114b6114df4ad006d33af1f4b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 4 12:10:27 2019 +0100

    bootstrap: add debian10 support
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Fri Dec  6 00:16:45 UTC 2019 on sn-devel-184

commit 41f6248effa5f5c0606a13da289c8a77abb30bce
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 4 19:52:56 2019 +0100

    bootstrap: use runners with 'docker' and 'gce' tags for the image creation
    
    As we currently have the 'shared' tag on our private runners, they
    maybe selected for image creation, but it fails there.
    
    A lot of shared runners provide 'docker' and 'gce' and they are able to
    generate the images.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 .gitlab-ci.yml                                               | 7 ++++++-
 bootstrap/.gitlab-ci.yml                                     | 5 ++++-
 bootstrap/READMD.md                                          | 2 +-
 bootstrap/config.py                                          | 7 +++++++
 bootstrap/generated-dists/Vagrantfile                        | 7 +++++++
 bootstrap/generated-dists/{centos8 => debian10}/Dockerfile   | 2 +-
 bootstrap/generated-dists/{debian9 => debian10}/bootstrap.sh | 0
 bootstrap/generated-dists/{centos6 => debian10}/locale.sh    | 0
 bootstrap/generated-dists/{debian9 => debian10}/packages.yml | 0
 bootstrap/sha1sum.txt                                        | 2 +-
 10 files changed, 27 insertions(+), 5 deletions(-)
 copy bootstrap/generated-dists/{centos8 => debian10}/Dockerfile (92%)
 copy bootstrap/generated-dists/{debian9 => debian10}/bootstrap.sh (100%)
 copy bootstrap/generated-dists/{centos6 => debian10}/locale.sh (100%)
 copy bootstrap/generated-dists/{debian9 => debian10}/packages.yml (100%)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bd083cb63e..435c10f33e7 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: 187702e2a9c65f874aa13e5eb1c8b68703e72299
+  SAMBA_CI_CONTAINER_TAG: f0cc64e22c612eb0599984cfc5dd20f36858db59
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -36,6 +36,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1804:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_ubuntu1604: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${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_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
@@ -273,6 +274,10 @@ debian9-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_debian9
 
+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
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 865d93485a8..aa0b6448d74 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -6,7 +6,7 @@ services:
   stage: images
   tags:
     - docker
-    - shared
+    - gce
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
   before_script:
@@ -92,6 +92,9 @@ ubuntu1604:
 ubuntu1404:
   extends: .build_image_template_force_broken
 
+debian10:
+  extends: .build_image_template
+
 debian9:
   extends: .build_image_template
 
diff --git a/bootstrap/READMD.md b/bootstrap/READMD.md
index d653d6d340b..b8a30098b67 100644
--- a/bootstrap/READMD.md
+++ b/bootstrap/READMD.md
@@ -12,7 +12,7 @@ A pure python3 module with CLI to bootstrap Samba envs for multiple distribution
 
 ## Supported Distributions
 
-deb: Debian 7|8|9, Ubuntu 1404|1604|1804
+deb: Debian 7|8|9|10, Ubuntu 1404|1604|1804
 rpm: CentOS 6|7, Fedora 28|29, openSUSE Leap 15.0|15.1
 
 Easy to add more.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 06fd1142f94..a135456866c 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -403,6 +403,13 @@ DEB_DISTS = {
             'language-pack-en': '',   # included in locales
         }
     },
+    'debian10': {
+        'docker_image': 'debian:10',
+        'vagrant_box': 'debian/buster64',
+        'replace': {
+            'language-pack-en': '',   # included in locales
+        }
+    },
     'ubuntu1404': {
         'docker_image': 'ubuntu:14.04',
         'vagrant_box': 'ubuntu/trusty64',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 4381dca6496..b3cb6bea485 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -31,6 +31,13 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "centos8/locale.sh"
     end
 
+    config.vm.define "debian10" do |v|
+        v.vm.box = "debian/buster64"
+        v.vm.hostname = "debian10"
+        v.vm.provision :shell, path: "debian10/bootstrap.sh"
+        v.vm.provision :shell, path: "debian10/locale.sh"
+    end
+
     config.vm.define "debian7" do |v|
         v.vm.box = "debian/wheezy64"
         v.vm.hostname = "debian7"
diff --git a/bootstrap/generated-dists/centos8/Dockerfile b/bootstrap/generated-dists/debian10/Dockerfile
similarity index 92%
copy from bootstrap/generated-dists/centos8/Dockerfile
copy to bootstrap/generated-dists/debian10/Dockerfile
index f6343e9d5a2..a7141db7e17 100644
--- a/bootstrap/generated-dists/centos8/Dockerfile
+++ b/bootstrap/generated-dists/debian10/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM centos:8
+FROM debian:10
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
similarity index 100%
copy from bootstrap/generated-dists/debian9/bootstrap.sh
copy to bootstrap/generated-dists/debian10/bootstrap.sh
diff --git a/bootstrap/generated-dists/centos6/locale.sh b/bootstrap/generated-dists/debian10/locale.sh
similarity index 100%
copy from bootstrap/generated-dists/centos6/locale.sh
copy to bootstrap/generated-dists/debian10/locale.sh
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
similarity index 100%
copy from bootstrap/generated-dists/debian9/packages.yml
copy to bootstrap/generated-dists/debian10/packages.yml
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b220ebdde0c..8117f01d9b4 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-187702e2a9c65f874aa13e5eb1c8b68703e72299
+f0cc64e22c612eb0599984cfc5dd20f36858db59


-- 
Samba Shared Repository

More information about the samba-cvs mailing list