bootstrap: Remove Fedora 28 which is already EOL

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d26c956fded1b96d5f124ab1c980e3f5a98b178..bc4bf5326afdf17d090fce8fe6aee4c380813277 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 4a498d9dd6c861b85bf4a749f3feb0805ea7298e
+  SAMBA_CI_CONTAINER_TAG: 87b11cd0dd5a07464b7b2cf7c43c861451acad35
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index e474b4b500f308162f05c4a0ad3d51649c060383..8b31193bb12cc6d8a77b2d8704a0d2e14c32277e 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -107,9 +107,6 @@ fedora30:
 fedora29:
   extends: .build_image_template
 
-fedora28:
-  extends: .build_image_template_force_broken
-
 centos8:
   extends: .build_image_template
 

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 7eca3a372ef36d13f434bac846ae095e1aadbd52..e0eb311a0ef0873506247648064afb91318896c9 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -506,14 +506,6 @@ RPM_DISTS = {
             'quota-devel': '', # FIXME: Add me back, once available!
         }
     },
-    'fedora28': {
-        'docker_image': 'fedora:28',
-        'vagrant_box': 'fedora/28-cloud-base',
-        'bootstrap': DNF_BOOTSTRAP,
-        'replace': {
-            'lsb-release': 'redhat-lsb',
-        }
-    },
     'fedora29': {
         'docker_image': 'fedora:29',
         'vagrant_box': 'fedora/29-cloud-base',

diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 1e984d20122517b82c9ab62fd0f17b8b800e502d..e98d213b217d627d09b0adbd9f6e87411dd9b860 100644 (file)
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -52,13 +52,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "debian9/locale.sh"
     end
 
-    config.vm.define "fedora28" do |v|
-        v.vm.box = "fedora/28-cloud-base"
-        v.vm.hostname = "fedora28"
-        v.vm.provision :shell, path: "fedora28/bootstrap.sh"
-        v.vm.provision :shell, path: "fedora28/locale.sh"
-    end
-
     config.vm.define "fedora29" do |v|
         v.vm.box = "fedora/29-cloud-base"
         v.vm.hostname = "fedora29"

diff --git a/bootstrap/generated-dists/fedora28/Dockerfile b/bootstrap/generated-dists/fedora28/Dockerfile
deleted file mode 100644 (file)
index 4d25691..0000000
--- a/bootstrap/generated-dists/fedora28/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM fedora:28
-
-# 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
\ No newline at end of file

diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
deleted file mode 100755 (executable)
index a46bb5f..0000000
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ /dev/null
@@ -1,110 +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 \
-    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 \
-    lcov \
-    libacl-devel \
-    libaio-devel \
-    libarchive-devel \
-    libattr-devel \
-    libblkid-devel \
-    libbsd-devel \
-    libcap-devel \
-    libcephfs-devel \
-    libicu-devel \
-    libnsl2-devel \
-    libpcap-devel \
-    libsemanage-python \
-    libtasn1-devel \
-    libtasn1-tools \
-    libtirpc-devel \
-    libunwind-devel \
-    libuuid-devel \
-    libxslt \
-    lmdb \
-    lmdb-devel \
-    make \
-    mingw64-gcc \
-    ncurses-devel \
-    nettle-devel \
-    openldap-devel \
-    pam-devel \
-    patch \
-    perl \
-    perl-Archive-Tar \
-    perl-ExtUtils-MakeMaker \
-    perl-JSON-Parse \
-    perl-Parse-Yapp \
-    perl-Test-Base \
-    perl-generators \
-    perl-interpreter \
-    pkgconfig \
-    policycoreutils-python \
-    popt-devel \
-    procps-ng \
-    psmisc \
-    python3 \
-    python3-crypto \
-    python3-devel \
-    python3-dns \
-    python3-gpg \
-    python3-markdown \
-    quota-devel \
-    readline-devel \
-    redhat-lsb \
-    rng-tools \
-    rpcgen \
-    rpcsvc-proto-devel \
-    rsync \
-    sed \
-    sudo \
-    systemd-devel \
-    tar \
-    tree \
-    which \
-    xfsprogs-devel \
-    yum-utils \
-    zlib-devel
-
-dnf clean all
\ No newline at end of file

diff --git a/bootstrap/generated-dists/fedora28/locale.sh b/bootstrap/generated-dists/fedora28/locale.sh
deleted file mode 100755 (executable)
index cc64e18..0000000
--- a/bootstrap/generated-dists/fedora28/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/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
deleted file mode 100644 (file)
index 023889b..0000000
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ /dev/null
@@ -1,97 +0,0 @@
----
-packages:
-  - @development-tools
-  - acl
-  - attr
-  - autoconf
-  - avahi-devel
-  - bind-utils
-  - binutils
-  - bison
-  - 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
-  - lcov
-  - libacl-devel
-  - libaio-devel
-  - libarchive-devel
-  - libattr-devel
-  - libblkid-devel
-  - libbsd-devel
-  - libcap-devel
-  - libcephfs-devel
-  - libicu-devel
-  - libnsl2-devel
-  - libpcap-devel
-  - libsemanage-python
-  - libtasn1-devel
-  - libtasn1-tools
-  - libtirpc-devel
-  - libunwind-devel
-  - libuuid-devel
-  - libxslt
-  - lmdb
-  - lmdb-devel
-  - make
-  - mingw64-gcc
-  - ncurses-devel
-  - nettle-devel
-  - openldap-devel
-  - pam-devel
-  - patch
-  - perl
-  - perl-Archive-Tar
-  - perl-ExtUtils-MakeMaker
-  - perl-JSON-Parse
-  - perl-Parse-Yapp
-  - perl-Test-Base
-  - perl-generators
-  - perl-interpreter
-  - pkgconfig
-  - policycoreutils-python
-  - popt-devel
-  - procps-ng
-  - psmisc
-  - python3
-  - python3-crypto
-  - python3-devel
-  - python3-dns
-  - python3-gpg
-  - python3-markdown
-  - quota-devel
-  - readline-devel
-  - redhat-lsb
-  - rng-tools
-  - rpcgen
-  - rpcsvc-proto-devel
-  - rsync
-  - sed
-  - sudo
-  - systemd-devel
-  - tar
-  - tree
-  - which
-  - xfsprogs-devel
-  - yum-utils
-  - zlib-devel
\ No newline at end of file

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 7f16e8f2dde9d394f2770a646846bb3e20a8a82f..5218a73d48f836068e1383e072fada3aeb0d0581 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-4a498d9dd6c861b85bf4a749f3feb0805ea7298e
+87b11cd0dd5a07464b7b2cf7c43c861451acad35