1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

bootstrap: Add OpenSUSE 15.2

Signed-off-by: Samuel Cabrero <scabrero@samba.org>

Autobuild-User(master): Samuel Cabrero <scabrero@samba.org>
Autobuild-Date(master): Tue Nov 17 18:50:05 UTC 2020 on sn-devel-184
This commit is contained in:
Samuel Cabrero 2020-11-17 13:32:19 +01:00 committed by Samuel Cabrero
parent 6ac16232de
commit 41b2beeffb
9 changed files with 53 additions and 51 deletions

View File

@ -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

View File

@ -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:
extends: .build_image_template
opensuse151:
extends: .build_image_template
opensuse152:
extends: .build_image_template

View File

@ -490,38 +490,6 @@ RPM_DISTS = {
'policycoreutils-python': 'python3-policycoreutils',
}
},
'opensuse150': {
'docker_image': 'opensuse/leap:15.0',
'vagrant_box': 'opensuse/openSUSE-15.0-x86_64',
'bootstrap': ZYPPER_BOOTSTRAP,
'replace': {
'@development-tools': '',
'dbus-devel': 'dbus-1-devel',
'docbook-style-xsl': 'docbook-xsl-stylesheets',
'glibc-common': 'glibc-locale',
'glibc-locale-source': 'glibc-i18ndata',
'glibc-langpack-en': '',
'jansson-devel': 'libjansson-devel',
'keyutils-libs-devel': 'keyutils-devel',
'krb5-workstation': 'krb5-client',
'libnsl2-devel': 'libnsl-devel',
'libsemanage-python': 'python2-semanage',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',
'perl-generators': '',
'perl-interpreter': '',
'perl-FindBin': '',
'procps-ng': 'procps',
'python3-dns': 'python3-dnspython',
'python3-markdown': 'python3-Markdown',
'quota-devel': '',
'glusterfs-api-devel': '',
'libtasn1-tools': '', # asn1Parser is part of libtasn1
'mingw64-gcc': '', # doesn't exist
'liburing-devel': '', # not available
}
},
'opensuse151': {
'docker_image': 'opensuse/leap:15.1',
'vagrant_box': 'opensuse/openSUSE-15.1-x86_64',
@ -551,7 +519,37 @@ RPM_DISTS = {
'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
'liburing-devel': '', # not available
}
},
'opensuse152': {
'docker_image': 'opensuse/leap:15.2',
'vagrant_box': 'opensuse/openSUSE-15.2-x86_64',
'bootstrap': ZYPPER_BOOTSTRAP,
'replace': {
'@development-tools': '',
'dbus-devel': 'dbus-1-devel',
'docbook-style-xsl': 'docbook-xsl-stylesheets',
'glibc-common': 'glibc-locale',
'glibc-locale-source': 'glibc-i18ndata',
'glibc-langpack-en': '',
'jansson-devel': 'libjansson-devel',
'keyutils-libs-devel': 'keyutils-devel',
'krb5-workstation': 'krb5-client',
'libnsl2-devel': 'libnsl-devel',
'libsemanage-python': 'python2-semanage',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',
'perl-generators': '',
'perl-interpreter': '',
'perl-FindBin': '',
'procps-ng': 'procps',
'python3-dns': 'python3-dnspython',
'python3-markdown': 'python3-Markdown',
'quota-devel': '',
'glusterfs-api-devel': '',
'libtasn1-tools': '', # asn1Parser is part of libtasn1
}
}
}

View File

@ -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"

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -1 +1 @@
446341a5c66a0cd04cac694991e4522385389e0f
d4867986881a9601c4620baf9a3bf28f5d1d1343