gitlab-ci: Remove CentOS7 which is EOL

See
https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/

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

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index c56c84c89d46f3d4cde06dfe7e108d19723f8264..30838f44bd261b336cafa8acd25649b273fab00a 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: b078783e082ead539940faaa644567bf4ed67f67
+  SAMBA_CI_CONTAINER_TAG: 0698e9cba84190b97adb8313ff63bd36922fb7bc
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
@@ -65,7 +65,6 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_debian12: debian12
   SAMBA_CI_CONTAINER_IMAGE_opensuse155: opensuse155
   SAMBA_CI_CONTAINER_IMAGE_fedora39: fedora39
-  SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
   SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s
 
 include:
@@ -663,15 +662,6 @@ opensuse155-samba-o3:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse155}
 
-centos7-samba-o3:
-  extends: .samba-o3-template
-  variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos7}
-    # Git on CentOS doesn't support shallow git cloning
-    GIT_DEPTH: ""
-    # We need a newer GnuTLS version on CentOS7
-    PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls37/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
-
 centos8s-samba-o3:
   extends: .samba-o3-template
   variables:

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 77b4e4fe290e7b15b6e4d5a068a248bbce06a79e..697e95a6029c4b36bac72d4fe5aabf07a8424617 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -109,13 +109,5 @@ debian11-32bit:
 centos8s:
   extends: .build_image_template
 
-centos7:
-  extends: .build_image_template
-  variables:
-    # Shallow copies are not supported by git on CentOS7
-    GIT_DEPTH: ""
-    # We install a compat-gnutls34 package for GnuTLS >= 3.4.7
-    PKG_CONFIG_PATH: /usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig
-
 opensuse155:
   extends: .build_image_template

diff --git a/bootstrap/config.py b/bootstrap/config.py
index a5a7366c7fa4b1c93eb347c7f14b2adf9dc7b33f..f6340fb8266f4e2d1d7e7c1f03bdfc7dcc77e3bf 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -485,47 +485,6 @@ DEB_DISTS = {
 
 
 RPM_DISTS = {
-    'centos7': {
-        'docker_image': 'centos:7',
-        'vagrant_box': 'centos/7',
-        'bootstrap': YUM_BOOTSTRAP,
-        'replace': {
-            'lsb-release': 'redhat-lsb',
-            'python3': 'python36',
-            'python3-cryptography': 'python36-cryptography',
-            'python3-devel': 'python36-devel',
-            'python3-dns': 'python36-dns',
-            'python3-pyasn1': 'python36-pyasn1',
-            'python3-gpg': 'python36-gpg',
-            'python3-iso8601' : 'python36-iso8601',
-            'python3-markdown': 'python36-markdown',
-            'python3-requests': 'python36-requests',
-            # although python36-devel is available
-            # after epel-release installed
-            # however, all other python3 pkgs are still python36-ish
-            'python2-gpg': 'pygpgme',
-            '@development-tools': '"@Development Tools"',  # add quotes
-            'glibc-langpack-en': '',  # included in glibc-common
-            'glibc-locale-source': '',  # included in glibc-common
-            # update perl core modules on centos
-            # fix: Can't locate Archive/Tar.pm in @INC
-            'perl': 'perl-core',
-            'perl-FindBin': '',
-            'rpcsvc-proto-devel': '',
-            'glusterfs-api-devel': '',
-            'glusterfs-devel': '',
-            'libcephfs-devel': '',
-            'gnutls-devel': 'compat-gnutls37-devel',
-            'gnutls-utils': 'compat-gnutls37-utils',
-            'liburing-devel': '',   # not available
-            'python3-setproctitle': 'python36-setproctitle',
-            'tracker-devel': '', # do not install
-            'mold': '',
-            'ShellCheck': '',
-            'shfmt': '',
-            'codespell': '',
-        }
-    },
     'centos8s': {
         'docker_image': 'quay.io/centos/centos:stream8',
         'vagrant_box': 'centos/stream8',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 2c6468d768beed806d0fec693810925b1dbda87f..980bd79bb8919f9c85c28bba53866ac2954c7d26 100644 (file)
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -10,13 +10,6 @@ Vagrant.configure("2") do |config|
     config.ssh.insert_key = false
 
 
-    config.vm.define "centos7" do |v|
-        v.vm.box = "centos/7"
-        v.vm.hostname = "centos7"
-        v.vm.provision :shell, path: "centos7/bootstrap.sh"
-        v.vm.provision :shell, path: "centos7/locale.sh"
-    end
-
     config.vm.define "centos8s" do |v|
         v.vm.box = "centos/stream8"
         v.vm.hostname = "centos8s"

diff --git a/bootstrap/generated-dists/centos7/Dockerfile b/bootstrap/generated-dists/centos7/Dockerfile
deleted file mode 100644 (file)
index a11c4db..0000000
--- a/bootstrap/generated-dists/centos7/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM centos:7
-
-# 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/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
deleted file mode 100755 (executable)
index fd86761..0000000
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-set -xueo pipefail
-
-yum update -y
-yum install -y epel-release
-yum install -y yum-plugin-copr
-yum copr enable -y sergiomb/SambaAD
-yum update -y
-
-yum install -y \
-    "@Development Tools" \
-    acl \
-    attr \
-    autoconf \
-    avahi-devel \
-    bind-utils \
-    binutils \
-    bison \
-    ccache \
-    chrpath \
-    compat-gnutls37-devel \
-    compat-gnutls37-utils \
-    crypto-policies-scripts \
-    cups-devel \
-    curl \
-    dbus-devel \
-    docbook-dtds \
-    docbook-style-xsl \
-    flex \
-    gawk \
-    gcc \
-    gdb \
-    git \
-    glib2-devel \
-    glibc-common \
-    gpgme-devel \
-    gzip \
-    hostname \
-    htop \
-    jansson-devel \
-    jq \
-    keyutils-libs-devel \
-    krb5-devel \
-    krb5-server \
-    krb5-workstation \
-    lcov \
-    libacl-devel \
-    libarchive-devel \
-    libattr-devel \
-    libblkid-devel \
-    libbsd-devel \
-    libcap-devel \
-    libicu-devel \
-    libpcap-devel \
-    libtasn1-devel \
-    libtasn1-tools \
-    libtirpc-devel \
-    libunwind-devel \
-    libuuid-devel \
-    libxslt \
-    lmdb \
-    lmdb-devel \
-    make \
-    mingw64-gcc \
-    ncurses-devel \
-    openldap-devel \
-    pam-devel \
-    patch \
-    perl-Archive-Tar \
-    perl-ExtUtils-MakeMaker \
-    perl-Parse-Yapp \
-    perl-Test-Base \
-    perl-core \
-    perl-generators \
-    perl-interpreter \
-    pkgconfig \
-    popt-devel \
-    procps-ng \
-    psmisc \
-    python3-libsemanage \
-    python3-policycoreutils \
-    python36 \
-    python36-cryptography \
-    python36-devel \
-    python36-dns \
-    python36-gpg \
-    python36-iso8601 \
-    python36-markdown \
-    python36-pyasn1 \
-    python36-requests \
-    python36-setproctitle \
-    quota-devel \
-    readline-devel \
-    redhat-lsb \
-    rng-tools \
-    rpcgen \
-    rsync \
-    sed \
-    sudo \
-    systemd-devel \
-    tar \
-    tree \
-    wget \
-    which \
-    xfsprogs-devel \
-    xz \
-    yum-utils \
-    zlib-devel
-
-yum clean all
-
-if [ ! -f /usr/bin/python3 ]; then
-    ln -sf /usr/bin/python3.6 /usr/bin/python3
-fi
\ No newline at end of file

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

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 1bb5e922d9b460e9ce0a274edfcd5614032f1541..6cb838fcdff23e3be986aa49df9cf91d0c3d9d31 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-b078783e082ead539940faaa644567bf4ed67f67
+0698e9cba84190b97adb8313ff63bd36922fb7bc