summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci-main.yml9
-rw-r--r--bootstrap/.gitlab-ci.yml3
-rw-r--r--bootstrap/config.py8
-rw-r--r--bootstrap/generated-dists/Vagrantfile7
-rw-r--r--bootstrap/generated-dists/debian10/Dockerfile29
-rwxr-xr-xbootstrap/generated-dists/debian10/bootstrap.sh111
-rwxr-xr-xbootstrap/generated-dists/debian10/locale.sh55
-rw-r--r--bootstrap/generated-dists/debian10/packages.yml96
-rw-r--r--bootstrap/sha1sum.txt2
9 files changed, 2 insertions, 318 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index ec356f0fd55..fa73fbd05e5 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -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: d849801e805f8772b78251d07a28eb332c24660
+ SAMBA_CI_CONTAINER_TAG: 70150480b61ebdec7ec9b4c1214461c88d6de6d6
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -55,8 +55,6 @@ variables:
#
SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ubuntu1804
SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
- SAMBA_CI_CONTAINER_IMAGE_debian9: debian9
- SAMBA_CI_CONTAINER_IMAGE_debian10: debian10
SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153
SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
@@ -592,11 +590,6 @@ ubuntu2004-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004}
-debian10-samba-o3:
- extends: .samba-o3-template
- variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian10}
-
debian11-samba-o3:
extends: .samba-o3-template
variables:
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 815c6853d46..0d2ec182576 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -94,9 +94,6 @@ ubuntu1804:
ubuntu2004:
extends: .build_image_template
-debian10:
- extends: .build_image_template
-
debian11:
extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 9e424cb137b..8bf3cadcc4b 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -410,14 +410,6 @@ end
DEB_DISTS = {
- 'debian10': {
- 'docker_image': 'debian:10',
- 'vagrant_box': 'debian/buster64',
- 'replace': {
- 'language-pack-en': '', # included in locales
- 'liburing-dev': '', # not available
- }
- },
'debian11': {
'docker_image': 'debian:11',
'vagrant_box': 'debian/bullseye64',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index f4345676995..88afbaafb01 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -24,13 +24,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "centos8s/locale.sh"
end
- config.vm.define "debian10" do |v|
- v.vm.box = "debian/buster64"
- v.vm.hostname = "debian10"
- v.vm.provision :shell, path: "debian10/bootstrap.sh"
- v.vm.provision :shell, path: "debian10/locale.sh"
- end
-
config.vm.define "debian11" do |v|
v.vm.box = "debian/bullseye64"
v.vm.hostname = "debian11"
diff --git a/bootstrap/generated-dists/debian10/Dockerfile b/bootstrap/generated-dists/debian10/Dockerfile
deleted file mode 100644
index c3ef8cef539..00000000000
--- a/bootstrap/generated-dists/debian10/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM debian:10
-
-# 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 \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
deleted file mode 100755
index 84f5f6855b7..00000000000
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ /dev/null
@@ -1,111 +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 \
- 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 \
- libtracker-sparql-2.0-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-gpg \
- 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 \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/locale.sh b/bootstrap/generated-dists/debian10/locale.sh
deleted file mode 100755
index cc64e180483..00000000000
--- a/bootstrap/generated-dists/debian10/locale.sh
+++ /dev/null
@@ -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 \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
deleted file mode 100644
index 32f37eeb013..00000000000
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ /dev/null
@@ -1,96 +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
- - 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
- - libtracker-sparql-2.0-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-gpg
- - 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 \ No newline at end of file
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index ad980c8dbb6..e6b93ec32be 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-d849801e805f8772b78251d07a28eb332c246606
+70150480b61ebdec7ec9b4c1214461c88d6de6d6
View Lorry Controller Status