gitlab-ci: Drop Fedora 34

It should be enough to run on the latest Fedora version. This should save us
some CI minutes. We have CentOS runners and I would prefer to add CentOS9
Stream.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index be01328c138e075f1379c5bfcd8ce0f2812fed1f..11b46ceb6f1e774652508498e8e4c810e71715bf 100644 (file)
--- 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: 24c7cabf5c7c515ffac905cddc533a26d70abd09
+  SAMBA_CI_CONTAINER_TAG: 101efe433173bdb306063c6d91d5c991a858a9c9
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -60,7 +60,6 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
   SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151
   SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152
-  SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34
   SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
   SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120
   SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
@@ -628,11 +627,6 @@ centos8s-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
 
-fedora34-samba-o3:
-  extends: .samba-o3-template
-  variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
-
 fedora35-samba-o3:
   extends: .samba-o3-template
   variables:

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 8e221a2b8efb82af77a726e592dc4eaeb02c8649..1cf27b0c48687624757017226356b6ba403bba2c 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -100,9 +100,6 @@ debian10:
 debian11:
   extends: .build_image_template
 
-fedora34:
-  extends: .build_image_template
-
 fedora35:
   extends: .build_image_template
 

diff --git a/bootstrap/config.py b/bootstrap/config.py
index c853c4f0434db4cd4ed59609667ad086026c7973..9196a5b0f6ea8d0320e4f573afc370908cf0b3c8 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -495,18 +495,6 @@ RPM_DISTS = {
             'mold': '',
         }
     },
-    'fedora34': {
-        'docker_image': 'fedora:34',
-        'vagrant_box': 'fedora/34-cloud-base',
-        'bootstrap': DNF_BOOTSTRAP,
-        'replace': {
-            'lsb-release': 'redhat-lsb',
-            'perl-FindBin': '',
-            'python3-iso8601': 'python3-dateutil',
-            'libtracker-sparql-2.0-dev': '',  # only tracker 3.x is available
-            'mold': '',
-        }
-    },
     'fedora35': {
         'docker_image': 'fedora:35',
         'vagrant_box': 'fedora/35-cloud-base',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 518535f3a616055c1b4d598bd50ea9d3b9514831..832918d700716e04ee1c0e826677da14a2d4b62a 100644 (file)
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -45,13 +45,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "f35mit120/locale.sh"
     end
 
-    config.vm.define "fedora34" do |v|
-        v.vm.box = "fedora/34-cloud-base"
-        v.vm.hostname = "fedora34"
-        v.vm.provision :shell, path: "fedora34/bootstrap.sh"
-        v.vm.provision :shell, path: "fedora34/locale.sh"
-    end
-
     config.vm.define "fedora35" do |v|
         v.vm.box = "fedora/35-cloud-base"
         v.vm.hostname = "fedora35"

diff --git a/bootstrap/generated-dists/fedora34/Dockerfile b/bootstrap/generated-dists/fedora34/Dockerfile
deleted file mode 100644 (file)
index 6e28a74..0000000
--- a/bootstrap/generated-dists/fedora34/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM fedora:34
-
-# 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/fedora34/bootstrap.sh b/bootstrap/generated-dists/fedora34/bootstrap.sh
deleted file mode 100755 (executable)
index de5a967..0000000
--- a/bootstrap/generated-dists/fedora34/bootstrap.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-set -xueo pipefail
-
-dnf update -y
-
-dnf install -y \
-    --setopt=install_weak_deps=False \
-    @development-tools \
-    acl \
-    attr \
-    autoconf \
-    avahi-devel \
-    bind-utils \
-    binutils \
-    bison \
-    ccache \
-    chrpath \
-    cups-devel \
-    curl \
-    dbus-devel \
-    docbook-dtds \
-    docbook-style-xsl \
-    flex \
-    gawk \
-    gcc \
-    gdb \
-    git \
-    glib2-devel \
-    glibc-common \
-    glibc-langpack-en \
-    glusterfs-api-devel \
-    glusterfs-devel \
-    gnutls-devel \
-    gpgme-devel \
-    gzip \
-    hostname \
-    htop \
-    jansson-devel \
-    keyutils-libs-devel \
-    krb5-devel \
-    krb5-server \
-    krb5-workstation \
-    lcov \
-    libacl-devel \
-    libarchive-devel \
-    libattr-devel \
-    libblkid-devel \
-    libbsd-devel \
-    libcap-devel \
-    libcephfs-devel \
-    libicu-devel \
-    libpcap-devel \
-    libtasn1-devel \
-    libtasn1-tools \
-    libtirpc-devel \
-    libunwind-devel \
-    liburing-devel \
-    libuuid-devel \
-    libxslt \
-    lmdb \
-    lmdb-devel \
-    make \
-    mingw64-gcc \
-    ncurses-devel \
-    openldap-devel \
-    pam-devel \
-    patch \
-    perl \
-    perl-Archive-Tar \
-    perl-ExtUtils-MakeMaker \
-    perl-JSON \
-    perl-JSON-Parse \
-    perl-Parse-Yapp \
-    perl-Test-Base \
-    perl-generators \
-    perl-interpreter \
-    pkgconfig \
-    popt-devel \
-    procps-ng \
-    psmisc \
-    python3 \
-    python3-cryptography \
-    python3-dateutil \
-    python3-devel \
-    python3-dns \
-    python3-gpg \
-    python3-libsemanage \
-    python3-markdown \
-    python3-policycoreutils \
-    python3-pyasn1 \
-    python3-setproctitle \
-    quota-devel \
-    readline-devel \
-    redhat-lsb \
-    rng-tools \
-    rpcgen \
-    rpcsvc-proto-devel \
-    rsync \
-    sed \
-    sudo \
-    systemd-devel \
-    tar \
-    tracker-devel \
-    tree \
-    wget \
-    which \
-    xfsprogs-devel \
-    yum-utils \
-    zlib-devel
-
-dnf clean all
\ No newline at end of file

diff --git a/bootstrap/generated-dists/fedora34/locale.sh b/bootstrap/generated-dists/fedora34/locale.sh
deleted file mode 100755 (executable)
index cc64e18..0000000
--- a/bootstrap/generated-dists/fedora34/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/fedora34/packages.yml b/bootstrap/generated-dists/fedora34/packages.yml
deleted file mode 100644 (file)
index 749f30d..0000000
--- a/bootstrap/generated-dists/fedora34/packages.yml
+++ /dev/null
@@ -1,104 +0,0 @@
----
-packages:
-  - @development-tools
-  - acl
-  - attr
-  - autoconf
-  - avahi-devel
-  - bind-utils
-  - binutils
-  - bison
-  - ccache
-  - chrpath
-  - cups-devel
-  - curl
-  - dbus-devel
-  - docbook-dtds
-  - docbook-style-xsl
-  - flex
-  - gawk
-  - gcc
-  - gdb
-  - git
-  - glib2-devel
-  - glibc-common
-  - glibc-langpack-en
-  - glusterfs-api-devel
-  - glusterfs-devel
-  - gnutls-devel
-  - gpgme-devel
-  - gzip
-  - hostname
-  - htop
-  - jansson-devel
-  - keyutils-libs-devel
-  - krb5-devel
-  - krb5-server
-  - krb5-workstation
-  - lcov
-  - libacl-devel
-  - libarchive-devel
-  - libattr-devel
-  - libblkid-devel
-  - libbsd-devel
-  - libcap-devel
-  - libcephfs-devel
-  - libicu-devel
-  - libpcap-devel
-  - libtasn1-devel
-  - libtasn1-tools
-  - libtirpc-devel
-  - libunwind-devel
-  - liburing-devel
-  - libuuid-devel
-  - libxslt
-  - lmdb
-  - lmdb-devel
-  - make
-  - mingw64-gcc
-  - ncurses-devel
-  - openldap-devel
-  - pam-devel
-  - patch
-  - perl
-  - perl-Archive-Tar
-  - perl-ExtUtils-MakeMaker
-  - perl-JSON
-  - perl-JSON-Parse
-  - perl-Parse-Yapp
-  - perl-Test-Base
-  - perl-generators
-  - perl-interpreter
-  - pkgconfig
-  - popt-devel
-  - procps-ng
-  - psmisc
-  - python3
-  - python3-cryptography
-  - python3-dateutil
-  - python3-devel
-  - python3-dns
-  - python3-gpg
-  - python3-libsemanage
-  - python3-markdown
-  - python3-policycoreutils
-  - python3-pyasn1
-  - python3-setproctitle
-  - quota-devel
-  - readline-devel
-  - redhat-lsb
-  - rng-tools
-  - rpcgen
-  - rpcsvc-proto-devel
-  - rsync
-  - sed
-  - sudo
-  - systemd-devel
-  - tar
-  - tracker-devel
-  - tree
-  - wget
-  - which
-  - xfsprogs-devel
-  - yum-utils
-  - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index bd250e98d99d244d937837124b3e45d1e6923dff..99fbf10f03e81df2f063003d3212f8ca3c0fc4b0 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-24c7cabf5c7c515ffac905cddc533a26d70abd09
+101efe433173bdb306063c6d91d5c991a858a9c9