]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
bootstrap: Remove unused ubuntu1804 images
authorAndreas Schneider <asn@samba.org>
Fri, 8 Aug 2025 08:05:10 +0000 (10:05 +0200)
committerMartin Schwenke <martins@samba.org>
Wed, 10 Sep 2025 02:12:29 +0000 (02:12 +0000)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
12 files changed:
bootstrap/README.md
bootstrap/config.py
bootstrap/generated-dists/Vagrantfile
bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile [deleted file]
bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh [deleted file]
bootstrap/generated-dists/ubuntu1804-32bit/locale.sh [deleted file]
bootstrap/generated-dists/ubuntu1804-32bit/packages.yml [deleted file]
bootstrap/generated-dists/ubuntu1804/Dockerfile [deleted file]
bootstrap/generated-dists/ubuntu1804/bootstrap.sh [deleted file]
bootstrap/generated-dists/ubuntu1804/locale.sh [deleted file]
bootstrap/generated-dists/ubuntu1804/packages.yml [deleted file]
bootstrap/sha1sum.txt

index 6b3de983728d19f54ef351d10fdb7c0a8fd46001..c5192d373327d2099446e09c7b1ea582ecac5284 100644 (file)
@@ -84,12 +84,12 @@ With Docker:
  cd ~/samba
  git clean -xdf
  docker login
- docker pull registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu1804:${sha1sum}
- docker run -it -v $(pwd):/home/samba/samba samba-ci-ubuntu1804:${sha1sum} bash
+ docker pull registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu2404:${sha1sum}
+ docker run -it -v $(pwd):/home/samba/samba samba-ci-ubuntu2404:${sha1sum} bash
 
 With podman:
 
-  podman run -ti --cap-add=SYS_PTRACE --security-opt seccomp=unconfined registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu1804:${sha1sum} bash
+  podman run -ti --cap-add=SYS_PTRACE --security-opt seccomp=unconfined registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu2404:${sha1sum} bash
 
 With Vagrant:
 
index 08c12dd17937a4005247dcd7bf362d876578bf6b..6e3855a09c355db2d6bee71f1b9f1692a00cb3b6 100644 (file)
@@ -494,26 +494,6 @@ DEB_DISTS = {
             'landscape-common': '',
         }
     },
-    'ubuntu1804': {
-        'docker_image': 'ubuntu:18.04',
-        'vagrant_box': 'ubuntu/bionic64',
-        'replace': {
-            'liburing-dev': '',   # not available
-            'shfmt': '',
-            'landscape-common': '',
-            'mold': '',
-        }
-    },
-    'ubuntu1804-32bit': {
-        'docker_image': 'registry-1.docker.io/i386/ubuntu:18.04',
-        'vagrant_box': 'ubuntu/bionic32',
-        'replace': {
-            'liburing-dev': '',   # not available
-            'shfmt': '',
-            'landscape-common': '',
-            'mold': '',
-        }
-    },
     'ubuntu2004': {
         'docker_image': 'ubuntu:20.04',
         'vagrant_box': 'ubuntu/focal64',
@@ -707,7 +687,7 @@ def render_vagrantfile(dists):
     This make it easier to manage the fleet, e.g:
 
     start all: vagrant up
-    start one: vagrant up ubuntu1804
+    start one: vagrant up ubuntu2404
 
     All other commands apply to above syntax, e.g.: status, destroy, provision
     """
index 74993c9c58ac1ddae3978877111e82e3c21fcbbe..511c670a7987649db0f08eb376a909219d58ede5 100644 (file)
@@ -66,20 +66,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "rocky8/locale.sh"
     end
 
-    config.vm.define "ubuntu1804" do |v|
-        v.vm.box = "ubuntu/bionic64"
-        v.vm.hostname = "ubuntu1804"
-        v.vm.provision :shell, path: "ubuntu1804/bootstrap.sh"
-        v.vm.provision :shell, path: "ubuntu1804/locale.sh"
-    end
-
-    config.vm.define "ubuntu1804-32bit" do |v|
-        v.vm.box = "ubuntu/bionic32"
-        v.vm.hostname = "ubuntu1804-32bit"
-        v.vm.provision :shell, path: "ubuntu1804-32bit/bootstrap.sh"
-        v.vm.provision :shell, path: "ubuntu1804-32bit/locale.sh"
-    end
-
     config.vm.define "ubuntu2004" do |v|
         v.vm.box = "ubuntu/focal64"
         v.vm.hostname = "ubuntu2004"
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile b/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
deleted file mode 100644 (file)
index 4feffbd..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM registry-1.docker.io/i386/ubuntu:18.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_GOLD=$(which ld.gold) || { LD=$(which ld) && 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_MOLD=$(which ld.mold) || { LD=$(which ld) && 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 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
deleted file mode 100755 (executable)
index ac716b3..0000000
+++ /dev/null
@@ -1,121 +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 \
-    cargo \
-    ccache \
-    chrpath \
-    codespell \
-    curl \
-    debhelper \
-    dnsutils \
-    docbook-xml \
-    docbook-xsl \
-    flex \
-    gcc \
-    gdb \
-    git \
-    glusterfs-common \
-    gnutls-bin \
-    gzip \
-    heimdal-multidev \
-    hostname \
-    htop \
-    jq \
-    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 \
-    libclang-dev \
-    libcups2-dev \
-    libdbus-1-dev \
-    libevent-dev \
-    libglib2.0-dev \
-    libgnutls28-dev \
-    libgpgme11-dev \
-    libicu-dev \
-    libjansson-dev \
-    libjs-jquery \
-    libkeyutils-dev \
-    libkrb5-dev \
-    libldap2-dev \
-    liblmdb-dev \
-    libncurses5-dev \
-    libpam0g-dev \
-    libparse-yapp-perl \
-    libpcap-dev \
-    libpopt-dev \
-    libreadline-dev \
-    libssl-dev \
-    libsystemd-dev \
-    libtasn1-bin \
-    libtasn1-dev \
-    libtracker-sparql-2.0-dev \
-    libunwind-dev \
-    libutf8proc-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-pyasn1 \
-    python3-requests \
-    python3-setproctitle \
-    rng-tools \
-    rsync \
-    sed \
-    shellcheck \
-    sudo \
-    tar \
-    tree \
-    uuid-dev \
-    wget \
-    xfslibs-dev \
-    xsltproc \
-    xz-utils \
-    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/ubuntu1804-32bit/locale.sh b/bootstrap/generated-dists/ubuntu1804-32bit/locale.sh
deleted file mode 100755 (executable)
index cc64e18..0000000
+++ /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/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
deleted file mode 100644 (file)
index eb8e7ad..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
----
-packages:
-  - acl
-  - apt-utils
-  - attr
-  - autoconf
-  - bind9utils
-  - binutils
-  - bison
-  - build-essential
-  - cargo
-  - ccache
-  - chrpath
-  - codespell
-  - curl
-  - debhelper
-  - dnsutils
-  - docbook-xml
-  - docbook-xsl
-  - flex
-  - gcc
-  - gdb
-  - git
-  - glusterfs-common
-  - gnutls-bin
-  - gzip
-  - heimdal-multidev
-  - hostname
-  - htop
-  - jq
-  - 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
-  - libclang-dev
-  - libcups2-dev
-  - libdbus-1-dev
-  - libevent-dev
-  - libglib2.0-dev
-  - libgnutls28-dev
-  - libgpgme11-dev
-  - libicu-dev
-  - libjansson-dev
-  - libjs-jquery
-  - libkeyutils-dev
-  - libkrb5-dev
-  - libldap2-dev
-  - liblmdb-dev
-  - libncurses5-dev
-  - libpam0g-dev
-  - libparse-yapp-perl
-  - libpcap-dev
-  - libpopt-dev
-  - libreadline-dev
-  - libssl-dev
-  - libsystemd-dev
-  - libtasn1-bin
-  - libtasn1-dev
-  - libtracker-sparql-2.0-dev
-  - libunwind-dev
-  - libutf8proc-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-pyasn1
-  - python3-requests
-  - python3-setproctitle
-  - rng-tools
-  - rsync
-  - sed
-  - shellcheck
-  - sudo
-  - tar
-  - tree
-  - uuid-dev
-  - wget
-  - xfslibs-dev
-  - xsltproc
-  - xz-utils
-  - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804/Dockerfile b/bootstrap/generated-dists/ubuntu1804/Dockerfile
deleted file mode 100644 (file)
index f389e0b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM ubuntu:18.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_GOLD=$(which ld.gold) || { LD=$(which ld) && 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_MOLD=$(which ld.mold) || { LD=$(which ld) && 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 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
deleted file mode 100755 (executable)
index ac716b3..0000000
+++ /dev/null
@@ -1,121 +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 \
-    cargo \
-    ccache \
-    chrpath \
-    codespell \
-    curl \
-    debhelper \
-    dnsutils \
-    docbook-xml \
-    docbook-xsl \
-    flex \
-    gcc \
-    gdb \
-    git \
-    glusterfs-common \
-    gnutls-bin \
-    gzip \
-    heimdal-multidev \
-    hostname \
-    htop \
-    jq \
-    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 \
-    libclang-dev \
-    libcups2-dev \
-    libdbus-1-dev \
-    libevent-dev \
-    libglib2.0-dev \
-    libgnutls28-dev \
-    libgpgme11-dev \
-    libicu-dev \
-    libjansson-dev \
-    libjs-jquery \
-    libkeyutils-dev \
-    libkrb5-dev \
-    libldap2-dev \
-    liblmdb-dev \
-    libncurses5-dev \
-    libpam0g-dev \
-    libparse-yapp-perl \
-    libpcap-dev \
-    libpopt-dev \
-    libreadline-dev \
-    libssl-dev \
-    libsystemd-dev \
-    libtasn1-bin \
-    libtasn1-dev \
-    libtracker-sparql-2.0-dev \
-    libunwind-dev \
-    libutf8proc-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-pyasn1 \
-    python3-requests \
-    python3-setproctitle \
-    rng-tools \
-    rsync \
-    sed \
-    shellcheck \
-    sudo \
-    tar \
-    tree \
-    uuid-dev \
-    wget \
-    xfslibs-dev \
-    xsltproc \
-    xz-utils \
-    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/ubuntu1804/locale.sh b/bootstrap/generated-dists/ubuntu1804/locale.sh
deleted file mode 100755 (executable)
index cc64e18..0000000
+++ /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/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
deleted file mode 100644 (file)
index eb8e7ad..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
----
-packages:
-  - acl
-  - apt-utils
-  - attr
-  - autoconf
-  - bind9utils
-  - binutils
-  - bison
-  - build-essential
-  - cargo
-  - ccache
-  - chrpath
-  - codespell
-  - curl
-  - debhelper
-  - dnsutils
-  - docbook-xml
-  - docbook-xsl
-  - flex
-  - gcc
-  - gdb
-  - git
-  - glusterfs-common
-  - gnutls-bin
-  - gzip
-  - heimdal-multidev
-  - hostname
-  - htop
-  - jq
-  - 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
-  - libclang-dev
-  - libcups2-dev
-  - libdbus-1-dev
-  - libevent-dev
-  - libglib2.0-dev
-  - libgnutls28-dev
-  - libgpgme11-dev
-  - libicu-dev
-  - libjansson-dev
-  - libjs-jquery
-  - libkeyutils-dev
-  - libkrb5-dev
-  - libldap2-dev
-  - liblmdb-dev
-  - libncurses5-dev
-  - libpam0g-dev
-  - libparse-yapp-perl
-  - libpcap-dev
-  - libpopt-dev
-  - libreadline-dev
-  - libssl-dev
-  - libsystemd-dev
-  - libtasn1-bin
-  - libtasn1-dev
-  - libtracker-sparql-2.0-dev
-  - libunwind-dev
-  - libutf8proc-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-pyasn1
-  - python3-requests
-  - python3-setproctitle
-  - rng-tools
-  - rsync
-  - sed
-  - shellcheck
-  - sudo
-  - tar
-  - tree
-  - uuid-dev
-  - wget
-  - xfslibs-dev
-  - xsltproc
-  - xz-utils
-  - zlib1g-dev
\ No newline at end of file
index 7a8d58b5aaee41ddf40c4e5ba995c37c71f40e14..32279dcca818b5abf71c88fa5a5a771b868a8338 100644 (file)
@@ -1 +1 @@
-3dc161f073e0f8ab1c8d5d59fef9e5e33630b51e
+a25f801824051b5bff2ad9c13befd465906e34cf