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

bootstrap: add ubuntu2004 Ubuntu Focal Fossa (development branch)

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Isaac Boukris <iboukris@samba.org>
This commit is contained in:
Stefan Metzmacher 2020-03-25 22:17:46 +01:00
parent a85fadaefc
commit 53402b3530
9 changed files with 304 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.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: 9061307e79ad13733c69352a965eeb4f44bef4b7
SAMBA_CI_CONTAINER_TAG: f5212e7abcae3208b796c939432ab9bec319264a
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@ -33,8 +33,9 @@ variables:
# Please see the samba-o3 sections at the end of this file!
# We should run that for each available image
#
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_ubuntu1804: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1804:${SAMBA_CI_CONTAINER_TAG}
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}
@ -262,6 +263,10 @@ ubuntu1804-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804
.ubuntu2004-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu2004
debian10-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_debian10

3
bootstrap/.gitlab-ci.yml
View File

@ -93,6 +93,9 @@ ubuntu1604:
ubuntu1804:
extends: .build_image_template
ubuntu2004:
extends: .build_image_template
debian10:
extends: .build_image_template

7
bootstrap/config.py
View File

@ -400,6 +400,13 @@ DEB_DISTS = {
'liburing-dev': '', # not available
}
},
'ubuntu2004': {
'docker_image': 'ubuntu:20.04',
'vagrant_box': 'ubuntu/focal64',
'replace': {
'liburing-dev': '', # not available
}
},
}

7
bootstrap/generated-dists/Vagrantfile vendored
View File

@ -73,5 +73,12 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "ubuntu1804/locale.sh"
end
config.vm.define "ubuntu2004" do |v|
v.vm.box = "ubuntu/focal64"
v.vm.hostname = "ubuntu2004"
v.vm.provision :shell, path: "ubuntu2004/bootstrap.sh"
v.vm.provision :shell, path: "ubuntu2004/locale.sh"
end
end

27
bootstrap/generated-dists/ubuntu2004/Dockerfile Normal file
View File

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

106
bootstrap/generated-dists/ubuntu2004/bootstrap.sh Executable file
View File

@ -0,0 +1,106 @@
#!/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 \
language-pack-en \
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/ubuntu2004/locale.sh Executable file
View File

@ -0,0 +1,55 @@
#!/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

91
bootstrap/generated-dists/ubuntu2004/packages.yml Normal file
View File

@ -0,0 +1,91 @@
---
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
- language-pack-en
- 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

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
9061307e79ad13733c69352a965eeb4f44bef4b7
f5212e7abcae3208b796c939432ab9bec319264a