From: Samuel Cabrero Date: Tue, 17 Nov 2020 12:32:19 +0000 (+0100) Subject: bootstrap: Add OpenSUSE 15.2 X-Git-Tag: samba-4.14.0rc1~598 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41b2beeffb94dac3679abc7b5c1187c1494f4970;p=thirdparty%2Fsamba.git bootstrap: Add OpenSUSE 15.2 Signed-off-by: Samuel Cabrero Autobuild-User(master): Samuel Cabrero Autobuild-Date(master): Tue Nov 17 18:50:05 UTC 2020 on sn-devel-184 --- 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/opensuse152/Dockerfile similarity index 97% rename from bootstrap/generated-dists/opensuse150/Dockerfile rename to bootstrap/generated-dists/opensuse152/Dockerfile index fc8740b534d..3d79adcb07d 100644 --- a/bootstrap/generated-dists/opensuse150/Dockerfile +++ b/bootstrap/generated-dists/opensuse152/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM opensuse/leap:15.0 +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 98% 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 97% 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