mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
gitlab-ci: Update to openSUSE 15.3
This drops openSUSE 15.1 and 15.2 to save some CI resources. Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider
Andreas Schneider
parent
4993faea2d
commit
0b10962d63
@ -42,7 +42,7 @@ variables:
|
||||
# Set this to the contents of bootstrap/sha1sum.txt
|
||||
# which is generated by bootstrap/template.py --render
|
||||
#
|
||||
SAMBA_CI_CONTAINER_TAG: 101efe433173bdb306063c6d91d5c991a858a9c9
|
||||
SAMBA_CI_CONTAINER_TAG: d849801e805f8772b78251d07a28eb332c24660
|
||||
#
|
||||
# We use the ubuntu1804 image as default as
|
||||
# it matches what we have on sn-devel-184.
|
||||
@ -58,8 +58,7 @@ variables:
|
||||
SAMBA_CI_CONTAINER_IMAGE_debian9: debian9
|
||||
SAMBA_CI_CONTAINER_IMAGE_debian10: debian10
|
||||
SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
|
||||
SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151
|
||||
SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152
|
||||
SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153
|
||||
SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
|
||||
SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120
|
||||
SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
|
||||
@ -603,15 +602,10 @@ debian11-samba-o3:
|
||||
variables:
|
||||
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11}
|
||||
|
||||
opensuse151-samba-o3:
|
||||
opensuse153-samba-o3:
|
||||
extends: .samba-o3-template
|
||||
variables:
|
||||
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse151}
|
||||
|
||||
opensuse152-samba-o3:
|
||||
extends: .samba-o3-template
|
||||
variables:
|
||||
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse152}
|
||||
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse153}
|
||||
|
||||
centos7-samba-o3:
|
||||
extends: .samba-o3-template
|
||||
|
||||
@ -117,8 +117,5 @@ 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
|
||||
|
||||
opensuse151:
|
||||
extends: .build_image_template
|
||||
|
||||
opensuse152:
|
||||
opensuse153:
|
||||
extends: .build_image_template
|
||||
|
||||
@ -517,41 +517,9 @@ RPM_DISTS = {
|
||||
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
|
||||
}
|
||||
},
|
||||
'opensuse151': {
|
||||
'docker_image': 'opensuse/leap:15.1',
|
||||
'vagrant_box': 'opensuse/openSUSE-15.1-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',
|
||||
'python3-libsemanage': '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
|
||||
'mold': '',
|
||||
}
|
||||
},
|
||||
'opensuse152': {
|
||||
'docker_image': 'opensuse/leap:15.2',
|
||||
'vagrant_box': 'opensuse/openSUSE-15.2-x86_64',
|
||||
'opensuse153': {
|
||||
'docker_image': 'opensuse/leap:15.3',
|
||||
'vagrant_box': 'opensuse/openSUSE-15.3-x86_64',
|
||||
'bootstrap': ZYPPER_BOOTSTRAP,
|
||||
'replace': {
|
||||
'@development-tools': '',
|
||||
|
||||
17
bootstrap/generated-dists/Vagrantfile
vendored
17
bootstrap/generated-dists/Vagrantfile
vendored
@ -52,18 +52,11 @@ Vagrant.configure("2") do |config|
|
||||
v.vm.provision :shell, path: "fedora35/locale.sh"
|
||||
end
|
||||
|
||||
config.vm.define "opensuse151" do |v|
|
||||
v.vm.box = "opensuse/openSUSE-15.1-x86_64"
|
||||
v.vm.hostname = "opensuse151"
|
||||
v.vm.provision :shell, path: "opensuse151/bootstrap.sh"
|
||||
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"
|
||||
config.vm.define "opensuse153" do |v|
|
||||
v.vm.box = "opensuse/openSUSE-15.3-x86_64"
|
||||
v.vm.hostname = "opensuse153"
|
||||
v.vm.provision :shell, path: "opensuse153/bootstrap.sh"
|
||||
v.vm.provision :shell, path: "opensuse153/locale.sh"
|
||||
end
|
||||
|
||||
config.vm.define "ubuntu1804" do |v|
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
#
|
||||
# This file is generated by 'bootstrap/template.py --render'
|
||||
# See also bootstrap/config.py
|
||||
#
|
||||
|
||||
set -xueo pipefail
|
||||
|
||||
zypper --non-interactive refresh
|
||||
zypper --non-interactive update
|
||||
zypper --non-interactive install \
|
||||
--no-recommends \
|
||||
system-user-nobody \
|
||||
acl \
|
||||
attr \
|
||||
autoconf \
|
||||
avahi-devel \
|
||||
bind-utils \
|
||||
binutils \
|
||||
bison \
|
||||
ccache \
|
||||
chrpath \
|
||||
cups-devel \
|
||||
curl \
|
||||
dbus-1-devel \
|
||||
docbook-dtds \
|
||||
docbook-xsl-stylesheets \
|
||||
flex \
|
||||
gawk \
|
||||
gcc \
|
||||
gdb \
|
||||
git \
|
||||
glib2-devel \
|
||||
glibc-locale \
|
||||
glusterfs-devel \
|
||||
gnutls-devel \
|
||||
gpgme-devel \
|
||||
gzip \
|
||||
hostname \
|
||||
htop \
|
||||
keyutils-devel \
|
||||
krb5-client \
|
||||
krb5-devel \
|
||||
krb5-server \
|
||||
lcov \
|
||||
libacl-devel \
|
||||
libarchive-devel \
|
||||
libattr-devel \
|
||||
libblkid-devel \
|
||||
libbsd-devel \
|
||||
libcap-devel \
|
||||
libcephfs-devel \
|
||||
libicu-devel \
|
||||
libjansson-devel \
|
||||
libpcap-devel \
|
||||
libtasn1-devel \
|
||||
libtirpc-devel \
|
||||
libunwind-devel \
|
||||
libuuid-devel \
|
||||
libxslt \
|
||||
lmdb \
|
||||
lmdb-devel \
|
||||
lsb-release \
|
||||
make \
|
||||
ncurses-devel \
|
||||
openldap2-devel \
|
||||
pam-devel \
|
||||
patch \
|
||||
perl \
|
||||
perl-Archive-Tar-Wrapper \
|
||||
perl-ExtUtils-MakeMaker \
|
||||
perl-JSON \
|
||||
perl-JSON-XS \
|
||||
perl-Parse-Yapp \
|
||||
perl-Test-Base \
|
||||
pkgconfig \
|
||||
popt-devel \
|
||||
procps \
|
||||
psmisc \
|
||||
python2-semanage \
|
||||
python3 \
|
||||
python3-Markdown \
|
||||
python3-cryptography \
|
||||
python3-devel \
|
||||
python3-dnspython \
|
||||
python3-gpg \
|
||||
python3-iso8601 \
|
||||
python3-policycoreutils \
|
||||
python3-pyasn1 \
|
||||
python3-setproctitle \
|
||||
readline-devel \
|
||||
rng-tools \
|
||||
rpcgen \
|
||||
rpcsvc-proto-devel \
|
||||
rsync \
|
||||
sed \
|
||||
sudo \
|
||||
systemd-devel \
|
||||
tar \
|
||||
tracker-devel \
|
||||
tree \
|
||||
wget \
|
||||
which \
|
||||
xfsprogs-devel \
|
||||
yum-utils \
|
||||
zlib-devel
|
||||
|
||||
zypper --non-interactive clean
|
||||
|
||||
if [ -f /usr/lib/mit/bin/krb5-config ]; then
|
||||
ln -sf /usr/lib/mit/bin/krb5-config /usr/bin/krb5-config
|
||||
fi
|
||||
@ -1,95 +0,0 @@
|
||||
---
|
||||
packages:
|
||||
- acl
|
||||
- attr
|
||||
- autoconf
|
||||
- avahi-devel
|
||||
- bind-utils
|
||||
- binutils
|
||||
- bison
|
||||
- ccache
|
||||
- chrpath
|
||||
- cups-devel
|
||||
- curl
|
||||
- dbus-1-devel
|
||||
- docbook-dtds
|
||||
- docbook-xsl-stylesheets
|
||||
- flex
|
||||
- gawk
|
||||
- gcc
|
||||
- gdb
|
||||
- git
|
||||
- glib2-devel
|
||||
- glibc-locale
|
||||
- glusterfs-devel
|
||||
- gnutls-devel
|
||||
- gpgme-devel
|
||||
- gzip
|
||||
- hostname
|
||||
- htop
|
||||
- keyutils-devel
|
||||
- krb5-client
|
||||
- krb5-devel
|
||||
- krb5-server
|
||||
- lcov
|
||||
- libacl-devel
|
||||
- libarchive-devel
|
||||
- libattr-devel
|
||||
- libblkid-devel
|
||||
- libbsd-devel
|
||||
- libcap-devel
|
||||
- libcephfs-devel
|
||||
- libicu-devel
|
||||
- libjansson-devel
|
||||
- libpcap-devel
|
||||
- libtasn1-devel
|
||||
- libtirpc-devel
|
||||
- libunwind-devel
|
||||
- libuuid-devel
|
||||
- libxslt
|
||||
- lmdb
|
||||
- lmdb-devel
|
||||
- lsb-release
|
||||
- make
|
||||
- ncurses-devel
|
||||
- openldap2-devel
|
||||
- pam-devel
|
||||
- patch
|
||||
- perl
|
||||
- perl-Archive-Tar-Wrapper
|
||||
- perl-ExtUtils-MakeMaker
|
||||
- perl-JSON
|
||||
- perl-JSON-XS
|
||||
- perl-Parse-Yapp
|
||||
- perl-Test-Base
|
||||
- pkgconfig
|
||||
- popt-devel
|
||||
- procps
|
||||
- psmisc
|
||||
- python2-semanage
|
||||
- python3
|
||||
- python3-Markdown
|
||||
- python3-cryptography
|
||||
- python3-devel
|
||||
- python3-dnspython
|
||||
- python3-gpg
|
||||
- python3-iso8601
|
||||
- python3-policycoreutils
|
||||
- python3-pyasn1
|
||||
- python3-setproctitle
|
||||
- readline-devel
|
||||
- rng-tools
|
||||
- rpcgen
|
||||
- rpcsvc-proto-devel
|
||||
- rsync
|
||||
- sed
|
||||
- sudo
|
||||
- systemd-devel
|
||||
- tar
|
||||
- tracker-devel
|
||||
- tree
|
||||
- wget
|
||||
- which
|
||||
- xfsprogs-devel
|
||||
- yum-utils
|
||||
- zlib-devel
|
||||
@ -1,29 +0,0 @@
|
||||
#
|
||||
# This file is generated by 'bootstrap/template.py --render'
|
||||
# See also bootstrap/config.py
|
||||
#
|
||||
|
||||
FROM opensuse/leap:15.2
|
||||
|
||||
# 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"
|
||||
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
|
||||
RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
|
||||
|
||||
# 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
|
||||
@ -1,55 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
#
|
||||
# This file is generated by 'bootstrap/template.py --render'
|
||||
# See also bootstrap/config.py
|
||||
#
|
||||
|
||||
set -xueo pipefail
|
||||
|
||||
# refer to /usr/share/i18n/locales
|
||||
INPUTFILE=en_US
|
||||
# refer to /usr/share/i18n/charmaps
|
||||
CHARMAP=UTF-8
|
||||
# locale to generate in /usr/lib/locale
|
||||
# glibc/localedef will normalize UTF-8 to utf8, follow the naming style
|
||||
LOCALE=$INPUTFILE.utf8
|
||||
|
||||
# if locale is already correct, exit
|
||||
( locale | grep LC_ALL | grep -i $LOCALE ) && exit 0
|
||||
|
||||
# if locale not available, generate locale into /usr/lib/locale
|
||||
if ! ( locale --all-locales | grep -i $LOCALE )
|
||||
then
|
||||
# no-archive means create its own dir
|
||||
localedef --inputfile $INPUTFILE --charmap $CHARMAP --no-archive $LOCALE
|
||||
fi
|
||||
|
||||
# update locale conf and global env file
|
||||
# set both LC_ALL and LANG for safe
|
||||
|
||||
# update conf for Debian family
|
||||
FILE=/etc/default/locale
|
||||
if [ -f $FILE ]
|
||||
then
|
||||
echo LC_ALL="$LOCALE" > $FILE
|
||||
echo LANG="$LOCALE" >> $FILE
|
||||
fi
|
||||
|
||||
# update conf for RedHat family
|
||||
FILE=/etc/locale.conf
|
||||
if [ -f $FILE ]
|
||||
then
|
||||
# LC_ALL is not valid in this file, set LANG only
|
||||
echo LANG="$LOCALE" > $FILE
|
||||
fi
|
||||
|
||||
# update global env file
|
||||
FILE=/etc/environment
|
||||
if [ -f $FILE ]
|
||||
then
|
||||
# append LC_ALL if not exist
|
||||
grep LC_ALL $FILE || echo LC_ALL="$LOCALE" >> $FILE
|
||||
# append LANG if not exist
|
||||
grep LANG $FILE || echo LANG="$LOCALE" >> $FILE
|
||||
fi
|
||||
@ -3,7 +3,7 @@
|
||||
# See also bootstrap/config.py
|
||||
#
|
||||
|
||||
FROM opensuse/leap:15.1
|
||||
FROM opensuse/leap:15.3
|
||||
|
||||
# pass in with --build-arg while build
|
||||
ARG SHA1SUM
|
||||
@ -1 +1 @@
|
||||
101efe433173bdb306063c6d91d5c991a858a9c9
|
||||
d849801e805f8772b78251d07a28eb332c246606
|
||||
|
||||
Loading…
Reference in New Issue
Block a user