mirror of
https://github.com/samba-team/samba.git
synced 2025-01-10 01:18:15 +03:00
bootstrap: Remove last references to Ubuntu 16.04
The Ubuntu 16.04 build went away with4366c3bb71
as oss-fuzz moves to Ubuntu 20.04. We don't do a special build for the oss-fuzz, this restores the behaviour beforee10910f8de
andd048d7e17d
where oss-fuzz was only tested as part of the main build. (In the case of a failure the pipeline would fail, preventing a merge, just the same as for any other failing test). Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Uri Simchoni <uri@samba.org> Autobuild-User(master): Uri Simchoni <uri@samba.org> Autobuild-Date(master): Tue Sep 14 04:44:44 UTC 2021 on sn-devel-184
This commit is contained in:
parent
01378a52a1
commit
ce2bc74dce
@ -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: 733f8fa83c921e5a7ec8f5470b2ca7d52548f4b0
|
||||
SAMBA_CI_CONTAINER_TAG: 752c448d3186fe93a0c4039b8fbe897bb67a1f33
|
||||
#
|
||||
# We use the ubuntu1804 image as default as
|
||||
# it matches what we have on sn-devel-184.
|
||||
|
@ -88,12 +88,6 @@ services:
|
||||
#
|
||||
- $SAMBA_CI_REBUILD_BROKEN_IMAGES == "yes"
|
||||
|
||||
# This is ONLY for oss-fuzz, so we test a fuzz build not a real one
|
||||
ubuntu1604:
|
||||
extends: .build_image_template
|
||||
variables:
|
||||
SAMBA_CI_TEST_JOB: "samba-fuzz"
|
||||
|
||||
ubuntu1804:
|
||||
extends: .build_image_template
|
||||
|
||||
|
@ -399,17 +399,6 @@ DEB_DISTS = {
|
||||
'liburing-dev': '', # not available
|
||||
}
|
||||
},
|
||||
'ubuntu1604': {
|
||||
'docker_image': 'ubuntu:16.04',
|
||||
'vagrant_box': 'ubuntu/xenial64',
|
||||
'replace': {
|
||||
'python3-gpg': 'python3-gpgme',
|
||||
'glusterfs-common': '',
|
||||
'libcephfs-dev': '',
|
||||
'liburing-dev': '', # not available
|
||||
'libtracker-sparql-2.0-dev': '', # not available
|
||||
}
|
||||
},
|
||||
'ubuntu1804': {
|
||||
'docker_image': 'ubuntu:18.04',
|
||||
'vagrant_box': 'ubuntu/bionic64',
|
||||
|
7
bootstrap/generated-dists/Vagrantfile
vendored
7
bootstrap/generated-dists/Vagrantfile
vendored
@ -59,13 +59,6 @@ Vagrant.configure("2") do |config|
|
||||
v.vm.provision :shell, path: "opensuse152/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"
|
||||
|
@ -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
|
@ -1,109 +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 \
|
||||
ccache \
|
||||
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-cryptography \
|
||||
python3-dbg \
|
||||
python3-dev \
|
||||
python3-dnspython \
|
||||
python3-gpgme \
|
||||
python3-iso8601 \
|
||||
python3-markdown \
|
||||
python3-matplotlib \
|
||||
python3-pexpect \
|
||||
python3-pyasn1 \
|
||||
python3-setproctitle \
|
||||
rng-tools \
|
||||
rsync \
|
||||
sed \
|
||||
sudo \
|
||||
tar \
|
||||
tree \
|
||||
uuid-dev \
|
||||
wget \
|
||||
xfslibs-dev \
|
||||
xsltproc \
|
||||
zlib1g-dev
|
||||
|
||||
apt-get -y autoremove
|
||||
apt-get -y autoclean
|
||||
apt-get -y clean
|
@ -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
|
@ -1,94 +0,0 @@
|
||||
---
|
||||
packages:
|
||||
- acl
|
||||
- apt-utils
|
||||
- attr
|
||||
- autoconf
|
||||
- bind9utils
|
||||
- binutils
|
||||
- bison
|
||||
- build-essential
|
||||
- ccache
|
||||
- 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-cryptography
|
||||
- python3-dbg
|
||||
- python3-dev
|
||||
- python3-dnspython
|
||||
- python3-gpgme
|
||||
- python3-iso8601
|
||||
- python3-markdown
|
||||
- python3-matplotlib
|
||||
- python3-pexpect
|
||||
- python3-pyasn1
|
||||
- python3-setproctitle
|
||||
- rng-tools
|
||||
- rsync
|
||||
- sed
|
||||
- sudo
|
||||
- tar
|
||||
- tree
|
||||
- uuid-dev
|
||||
- wget
|
||||
- xfslibs-dev
|
||||
- xsltproc
|
||||
- zlib1g-dev
|
@ -1 +1 @@
|
||||
733f8fa83c921e5a7ec8f5470b2ca7d52548f4b0
|
||||
752c448d3186fe93a0c4039b8fbe897bb67a1f33
|
||||
|
Loading…
Reference in New Issue
Block a user