sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-25 14:50:24 +03:00
Code

.gitlab-ci.yml: Do not build Samba for Ubuntu 16.04 or Debian 9 any longer

Browse Source 
These only have Python 3.5 and we want to increase the minimum to Python 3.6.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2020-03-04 13:55:27 +13:00
parent d048d7e17d
commit e9ce0f13e6
13 changed files with 2 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -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: cd4cebb9c611fb98f3a21171dd4832df930add28
SAMBA_CI_CONTAINER_TAG: 2b0275df23424240774afcd61fae8abed8663996
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@ -277,14 +277,6 @@ ubuntu1804-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804
ubuntu1604-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1604
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

6
bootstrap/.gitlab-ci.yml
View File

@ -86,15 +86,9 @@ services:
ubuntu1804:
extends: .build_image_template
ubuntu1604:
extends: .build_image_template
debian10:
extends: .build_image_template
debian9:
extends: .build_image_template
fedora31:
extends: .build_image_template

19
bootstrap/config.py
View File

@ -374,14 +374,6 @@ end
DEB_DISTS = {
'debian9': {
'docker_image': 'debian:9',
'vagrant_box': 'debian/stretch64',
'replace': {
'language-pack-en': '', # included in locales
'liburing-dev': '', # not available
}
},
'debian10': {
'docker_image': 'debian:10',
'vagrant_box': 'debian/buster64',
@ -390,17 +382,6 @@ DEB_DISTS = {
'liburing-dev': '', # not available
}
},
'ubuntu1604': {
'docker_image': 'ubuntu:16.04',
'vagrant_box': 'ubuntu/xenial64',
'replace': {
'python-gpg': 'python-gpgme',
'python3-gpg': 'python3-gpgme',
'glusterfs-common': '',
'libcephfs-dev': '',
'liburing-dev': '', # not available
}
},
'ubuntu1804': {
'docker_image': 'ubuntu:18.04',
'vagrant_box': 'ubuntu/bionic64',

14
bootstrap/generated-dists/Vagrantfile vendored
View File

@ -31,13 +31,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian10/locale.sh"
end
config.vm.define "debian9" do |v|
v.vm.box = "debian/stretch64"
v.vm.hostname = "debian9"
v.vm.provision :shell, path: "debian9/bootstrap.sh"
v.vm.provision :shell, path: "debian9/locale.sh"
end
config.vm.define "fedora29" do |v|
v.vm.box = "fedora/29-cloud-base"
v.vm.hostname = "fedora29"
@ -73,13 +66,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "opensuse151/locale.sh"
end
config.vm.define "ubuntu1604" do |v|
v.vm.box = "ubuntu/xenial64"
v.vm.hostname = "ubuntu1604"
v.vm.provision :shell, path: "ubuntu1604/bootstrap.sh"
v.vm.provision :shell, path: "ubuntu1604/locale.sh"
end
config.vm.define "ubuntu1804" do |v|
v.vm.box = "ubuntu/bionic64"
v.vm.hostname = "ubuntu1804"

27
bootstrap/generated-dists/debian9/Dockerfile
View File

@ -1,27 +0,0 @@
#
# This file is generated by 'bootstrap/template.py --render'
# See also bootstrap/config.py
#
FROM debian:9
# 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"
# 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

105
bootstrap/generated-dists/debian9/bootstrap.sh
View File

@ -1,105 +0,0 @@
#!/bin/bash
#
# This file is generated by 'bootstrap/template.py --render'
# See also bootstrap/config.py
#
set -xueo pipefail
export DEBIAN_FRONTEND=noninteractive
apt-get -y update
apt-get -y install \
acl \
apt-utils \
attr \
autoconf \
bind9utils \
binutils \
bison \
build-essential \
chrpath \
curl \
debhelper \
dnsutils \
docbook-xml \
docbook-xsl \
flex \
gcc \
gdb \
git \
glusterfs-common \
gzip \
heimdal-multidev \
hostname \
htop \
krb5-config \
krb5-kdc \
krb5-user \
lcov \
libacl1-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
libblkid-dev \
libbsd-dev \
libcap-dev \
libcephfs-dev \
libcups2-dev \
libdbus-1-dev \
libglib2.0-dev \
libgnutls28-dev \
libgpgme11-dev \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkrb5-dev \
libldap2-dev \
liblmdb-dev \
libncurses5-dev \
libpam0g-dev \
libparse-yapp-perl \
libpcap-dev \
libpopt-dev \
libreadline-dev \
libsystemd-dev \
libtasn1-bin \
libtasn1-dev \
libunwind-dev \
lmdb-utils \
locales \
lsb-release \
make \
mawk \
mingw-w64 \
patch \
perl \
perl-modules \
pkg-config \
procps \
psmisc \
python3 \
python3-dbg \
python3-dev \
python3-dnspython \
python3-gpg \
python3-iso8601 \
python3-markdown \
python3-matplotlib \
python3-pexpect \
rng-tools \
rsync \
sed \
sudo \
tar \
tree \
uuid-dev \
xfslibs-dev \
xsltproc \
zlib1g-dev
apt-get -y autoremove
apt-get -y autoclean
apt-get -y clean

55
bootstrap/generated-dists/debian9/locale.sh
View File

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

90
bootstrap/generated-dists/debian9/packages.yml
View File

@ -1,90 +0,0 @@
---
packages:
- acl
- apt-utils
- attr
- autoconf
- bind9utils
- binutils
- bison
- build-essential
- chrpath
- curl
- debhelper
- dnsutils
- docbook-xml
- docbook-xsl
- flex
- gcc
- gdb
- git
- glusterfs-common
- gzip
- heimdal-multidev
- hostname
- htop
- krb5-config
- krb5-kdc
- krb5-user
- lcov
- libacl1-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
- libblkid-dev
- libbsd-dev
- libcap-dev
- libcephfs-dev
- libcups2-dev
- libdbus-1-dev
- libglib2.0-dev
- libgnutls28-dev
- libgpgme11-dev
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkrb5-dev
- libldap2-dev
- liblmdb-dev
- libncurses5-dev
- libpam0g-dev
- libparse-yapp-perl
- libpcap-dev
- libpopt-dev
- libreadline-dev
- libsystemd-dev
- libtasn1-bin
- libtasn1-dev
- libunwind-dev
- lmdb-utils
- locales
- lsb-release
- make
- mawk
- mingw-w64
- patch
- perl
- perl-modules
- pkg-config
- procps
- psmisc
- python3
- python3-dbg
- python3-dev
- python3-dnspython
- python3-gpg
- python3-iso8601
- python3-markdown
- python3-matplotlib
- python3-pexpect
- rng-tools
- rsync
- sed
- sudo
- tar
- tree
- uuid-dev
- xfslibs-dev
- xsltproc
- zlib1g-dev

27
bootstrap/generated-dists/ubuntu1604/Dockerfile
View File

@ -1,27 +0,0 @@
#
# This file is generated by 'bootstrap/template.py --render'
# See also bootstrap/config.py
#
FROM ubuntu:16.04
# 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"
# 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

104
bootstrap/generated-dists/ubuntu1604/bootstrap.sh
View File

@ -1,104 +0,0 @@
#!/bin/bash
#
# This file is generated by 'bootstrap/template.py --render'
# See also bootstrap/config.py
#
set -xueo pipefail
export DEBIAN_FRONTEND=noninteractive
apt-get -y update
apt-get -y install \
acl \
apt-utils \
attr \
autoconf \
bind9utils \
binutils \
bison \
build-essential \
chrpath \
curl \
debhelper \
dnsutils \
docbook-xml \
docbook-xsl \
flex \
gcc \
gdb \
git \
gzip \
heimdal-multidev \
hostname \
htop \
krb5-config \
krb5-kdc \
krb5-user \
language-pack-en \
lcov \
libacl1-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
libblkid-dev \
libbsd-dev \
libcap-dev \
libcups2-dev \
libdbus-1-dev \
libglib2.0-dev \
libgnutls28-dev \
libgpgme11-dev \
libicu-dev \
libjansson-dev \
libjs-jquery \
libjson-perl \
libkrb5-dev \
libldap2-dev \
liblmdb-dev \
libncurses5-dev \
libpam0g-dev \
libparse-yapp-perl \
libpcap-dev \
libpopt-dev \
libreadline-dev \
libsystemd-dev \
libtasn1-bin \
libtasn1-dev \
libunwind-dev \
lmdb-utils \
locales \
lsb-release \
make \
mawk \
mingw-w64 \
patch \
perl \
perl-modules \
pkg-config \
procps \
psmisc \
python3 \
python3-dbg \
python3-dev \
python3-dnspython \
python3-gpgme \
python3-iso8601 \
python3-markdown \
python3-matplotlib \
python3-pexpect \
rng-tools \
rsync \
sed \
sudo \
tar \
tree \
uuid-dev \
xfslibs-dev \
xsltproc \
zlib1g-dev
apt-get -y autoremove
apt-get -y autoclean
apt-get -y clean

55
bootstrap/generated-dists/ubuntu1604/locale.sh
View File

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

89
bootstrap/generated-dists/ubuntu1604/packages.yml
View File

@ -1,89 +0,0 @@
---
packages:
- acl
- apt-utils
- attr
- autoconf
- bind9utils
- binutils
- bison
- build-essential
- chrpath
- curl
- debhelper
- dnsutils
- docbook-xml
- docbook-xsl
- flex
- gcc
- gdb
- git
- gzip
- heimdal-multidev
- hostname
- htop
- krb5-config
- krb5-kdc
- krb5-user
- language-pack-en
- lcov
- libacl1-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
- libblkid-dev
- libbsd-dev
- libcap-dev
- libcups2-dev
- libdbus-1-dev
- libglib2.0-dev
- libgnutls28-dev
- libgpgme11-dev
- libicu-dev
- libjansson-dev
- libjs-jquery
- libjson-perl
- libkrb5-dev
- libldap2-dev
- liblmdb-dev
- libncurses5-dev
- libpam0g-dev
- libparse-yapp-perl
- libpcap-dev
- libpopt-dev
- libreadline-dev
- libsystemd-dev
- libtasn1-bin
- libtasn1-dev
- libunwind-dev
- lmdb-utils
- locales
- lsb-release
- make
- mawk
- mingw-w64
- patch
- perl
- perl-modules
- pkg-config
- procps
- psmisc
- python3
- python3-dbg
- python3-dev
- python3-dnspython
- python3-gpgme
- python3-iso8601
- python3-markdown
- python3-matplotlib
- python3-pexpect
- rng-tools
- rsync
- sed
- sudo
- tar
- tree
- uuid-dev
- xfslibs-dev
- xsltproc
- zlib1g-dev

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
cd4cebb9c611fb98f3a21171dd4832df930add28
2b0275df23424240774afcd61fae8abed8663996