bootstrap: Remove long-unsupported OS versions
authorAndrew Bartlett <abartlet@samba.org>
Wed, 4 Mar 2020 00:58:48 +0000 (13:58 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 9 Mar 2020 22:03:26 +0000 (22:03 +0000)
Samba has not built on these versions for quite some time due to
the need for Python 3.5 and GnuTLS 3.4.7

These were always marked as broken, but given the requirements
these are never likely to come back.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
21 files changed:
.gitlab-ci.yml
bootstrap/.gitlab-ci.yml
bootstrap/config.py
bootstrap/generated-dists/Vagrantfile
bootstrap/generated-dists/centos6/Dockerfile [deleted file]
bootstrap/generated-dists/centos6/bootstrap.sh [deleted file]
bootstrap/generated-dists/centos6/locale.sh [deleted file]
bootstrap/generated-dists/centos6/packages.yml [deleted file]
bootstrap/generated-dists/debian7/Dockerfile [deleted file]
bootstrap/generated-dists/debian7/bootstrap.sh [deleted file]
bootstrap/generated-dists/debian7/locale.sh [deleted file]
bootstrap/generated-dists/debian7/packages.yml [deleted file]
bootstrap/generated-dists/debian8/Dockerfile [deleted file]
bootstrap/generated-dists/debian8/bootstrap.sh [deleted file]
bootstrap/generated-dists/debian8/locale.sh [deleted file]
bootstrap/generated-dists/debian8/packages.yml [deleted file]
bootstrap/generated-dists/ubuntu1404/Dockerfile [deleted file]
bootstrap/generated-dists/ubuntu1404/bootstrap.sh [deleted file]
bootstrap/generated-dists/ubuntu1404/locale.sh [deleted file]
bootstrap/generated-dists/ubuntu1404/packages.yml [deleted file]
bootstrap/sha1sum.txt

index 56adf10c7be6d5d92bf4ae933041c8222a8019ac..00ffff202d922315aef2e06c13e86377d9b037e9 100644 (file)
@@ -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: 41319f2580c026f66b2750604a0eb15d6b6f7b50
+  SAMBA_CI_CONTAINER_TAG: cd4cebb9c611fb98f3a21171dd4832df930add28
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
index aa0b6448d74f8e7ac9c21e7635113e50f1d1bf0e..cbf1cb9b58a5da05c3464a6156746e7554c8ee3a 100644 (file)
@@ -89,21 +89,12 @@ ubuntu1804:
 ubuntu1604:
   extends: .build_image_template
 
-ubuntu1404:
-  extends: .build_image_template_force_broken
-
 debian10:
   extends: .build_image_template
 
 debian9:
   extends: .build_image_template
 
-debian8:
-  extends: .build_image_template_force_broken
-
-debian7:
-  extends: .build_image_template_force_broken
-
 fedora31:
   extends: .build_image_template
 
@@ -124,9 +115,6 @@ centos7:
     # We install a compat-gnutls34 package for GnuTLS >= 3.4.7
     PKG_CONFIG_PATH: /usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig
 
-centos6:
-  extends: .build_image_template_force_broken
-
 opensuse150:
   extends: .build_image_template
 
index bcada1dc6286fed4c22533ab82aca88c112b5473..552524ae759339a56117ef6de778d12de9ab26e1 100644 (file)
@@ -374,30 +374,6 @@ end
 
 
 DEB_DISTS = {
-    'debian7': {
-        'docker_image': 'debian:7',
-        'vagrant_box': 'debian/wheezy64',
-        'replace': {
-            'libgnutls28-dev': 'libgnutls-dev',
-            'libsystemd-dev': '',  # not available, remove
-            'lmdb-utils': '',  # not available, remove
-            'liblmdb-dev': '',  # not available, remove
-            'python-gpg': 'python-gpgme',
-            'python3-gpg': '',  # no python3 gpg pkg available, remove
-            'language-pack-en': '',   # included in locales
-            'liburing-dev': '',   # not available
-        }
-    },
-    'debian8': {
-        'docker_image': 'debian:8',
-        'vagrant_box': 'debian/jessie64',
-        'replace': {
-            'python-gpg': 'python-gpgme',
-            'python3-gpg': 'python3-gpgme',
-            'language-pack-en': '',   # included in locales
-            'liburing-dev': '',   # not available
-        }
-    },
     'debian9': {
         'docker_image': 'debian:9',
         'vagrant_box': 'debian/stretch64',
@@ -414,22 +390,6 @@ DEB_DISTS = {
             'liburing-dev': '',   # not available
         }
     },
-    'ubuntu1404': {
-        'docker_image': 'ubuntu:14.04',
-        'vagrant_box': 'ubuntu/trusty64',
-        'replace': {
-            'libsystemd-dev': '',  # remove
-            'libgnutls28-dev': 'libgnutls-dev',
-            'python-gpg': 'python-gpgme',
-            'python3-gpg': 'python3-gpgme',
-            'lmdb-utils': 'lmdb-utils/trusty-backports',
-            'liblmdb-dev': 'liblmdb-dev/trusty-backports',
-            'libunwind-dev': 'libunwind8-dev',
-            'glusterfs-common': '',
-            'libcephfs-dev': '',
-            'liburing-dev': '',   # not available
-        }
-    },
     'ubuntu1604': {
         'docker_image': 'ubuntu:16.04',
         'vagrant_box': 'ubuntu/xenial64',
@@ -452,30 +412,6 @@ DEB_DISTS = {
 
 
 RPM_DISTS = {
-    'centos6': {
-        'docker_image': 'centos:6',
-        'vagrant_box': 'centos/6',
-        'bootstrap': YUM_BOOTSTRAP,
-        'replace': {
-            'lsb-release': 'redhat-lsb',
-            'python3': 'python36',
-            'python3-devel': 'python36-devel',
-            'python2-gpg': 'pygpgme',
-            'python3-gpg': '',  # no python3-gpg yet
-            '@development-tools': '"@Development Tools"',  # add quotes
-            'glibc-langpack-en': '',  # included in glibc-common
-            'glibc-locale-source': '',  # included in glibc-common
-            'procps-ng': 'procps',  # centos6 still use old name
-            # update perl core modules on centos
-            # fix: Can't locate Archive/Tar.pm in @INC
-            'perl': 'perl-core',
-            'rpcsvc-proto-devel': '',
-            'glusterfs-api-devel': '',
-            'glusterfs-devel': '',
-            'libcephfs-devel': '',
-            'liburing-devel': '',   # not available
-        }
-    },
     'centos7': {
         'docker_image': 'centos:7',
         'vagrant_box': 'centos/7',
index b3cb6bea48567440b91b5d4a19517eff461a25f8..983e66aa57fdbb0235d71667bca7b776dbe464e7 100644 (file)
@@ -10,13 +10,6 @@ Vagrant.configure("2") do |config|
     config.ssh.insert_key = false
 
 
-    config.vm.define "centos6" do |v|
-        v.vm.box = "centos/6"
-        v.vm.hostname = "centos6"
-        v.vm.provision :shell, path: "centos6/bootstrap.sh"
-        v.vm.provision :shell, path: "centos6/locale.sh"
-    end
-
     config.vm.define "centos7" do |v|
         v.vm.box = "centos/7"
         v.vm.hostname = "centos7"
@@ -38,20 +31,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "debian10/locale.sh"
     end
 
-    config.vm.define "debian7" do |v|
-        v.vm.box = "debian/wheezy64"
-        v.vm.hostname = "debian7"
-        v.vm.provision :shell, path: "debian7/bootstrap.sh"
-        v.vm.provision :shell, path: "debian7/locale.sh"
-    end
-
-    config.vm.define "debian8" do |v|
-        v.vm.box = "debian/jessie64"
-        v.vm.hostname = "debian8"
-        v.vm.provision :shell, path: "debian8/bootstrap.sh"
-        v.vm.provision :shell, path: "debian8/locale.sh"
-    end
-
     config.vm.define "debian9" do |v|
         v.vm.box = "debian/stretch64"
         v.vm.hostname = "debian9"
@@ -94,13 +73,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "opensuse151/locale.sh"
     end
 
-    config.vm.define "ubuntu1404" do |v|
-        v.vm.box = "ubuntu/trusty64"
-        v.vm.hostname = "ubuntu1404"
-        v.vm.provision :shell, path: "ubuntu1404/bootstrap.sh"
-        v.vm.provision :shell, path: "ubuntu1404/locale.sh"
-    end
-
     config.vm.define "ubuntu1604" do |v|
         v.vm.box = "ubuntu/xenial64"
         v.vm.hostname = "ubuntu1604"
diff --git a/bootstrap/generated-dists/centos6/Dockerfile b/bootstrap/generated-dists/centos6/Dockerfile
deleted file mode 100644 (file)
index 2716eeb..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM centos:6
-
-# 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/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
deleted file mode 100755 (executable)
index ee6fcc3..0000000
+++ /dev/null
@@ -1,109 +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 \
-    chrpath \
-    cups-devel \
-    curl \
-    dbus-devel \
-    docbook-dtds \
-    docbook-style-xsl \
-    flex \
-    gawk \
-    gcc \
-    gdb \
-    git \
-    glib2-devel \
-    glibc-common \
-    gnutls-devel \
-    gpgme-devel \
-    gzip \
-    hostname \
-    htop \
-    jansson-devel \
-    keyutils-libs-devel \
-    krb5-devel \
-    krb5-server \
-    lcov \
-    libacl-devel \
-    libarchive-devel \
-    libattr-devel \
-    libblkid-devel \
-    libbsd-devel \
-    libcap-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 \
-    openldap-devel \
-    pam-devel \
-    patch \
-    perl-Archive-Tar \
-    perl-ExtUtils-MakeMaker \
-    perl-JSON-Parse \
-    perl-Parse-Yapp \
-    perl-Test-Base \
-    perl-core \
-    perl-generators \
-    perl-interpreter \
-    pkgconfig \
-    policycoreutils-python \
-    popt-devel \
-    procps \
-    psmisc \
-    python3-dns \
-    python3-markdown \
-    python36 \
-    python36-devel \
-    quota-devel \
-    readline-devel \
-    redhat-lsb \
-    rng-tools \
-    rpcgen \
-    rsync \
-    sed \
-    sudo \
-    systemd-devel \
-    tar \
-    tree \
-    which \
-    xfsprogs-devel \
-    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/centos6/locale.sh b/bootstrap/generated-dists/centos6/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/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
deleted file mode 100644 (file)
index 1e2b5a9..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
----
-packages:
-  - "@Development Tools"
-  - acl
-  - attr
-  - autoconf
-  - avahi-devel
-  - bind-utils
-  - binutils
-  - bison
-  - chrpath
-  - cups-devel
-  - curl
-  - dbus-devel
-  - docbook-dtds
-  - docbook-style-xsl
-  - flex
-  - gawk
-  - gcc
-  - gdb
-  - git
-  - glib2-devel
-  - glibc-common
-  - gnutls-devel
-  - gpgme-devel
-  - gzip
-  - hostname
-  - htop
-  - jansson-devel
-  - keyutils-libs-devel
-  - krb5-devel
-  - krb5-server
-  - lcov
-  - libacl-devel
-  - libarchive-devel
-  - libattr-devel
-  - libblkid-devel
-  - libbsd-devel
-  - libcap-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
-  - openldap-devel
-  - pam-devel
-  - patch
-  - perl-Archive-Tar
-  - perl-ExtUtils-MakeMaker
-  - perl-JSON-Parse
-  - perl-Parse-Yapp
-  - perl-Test-Base
-  - perl-core
-  - perl-generators
-  - perl-interpreter
-  - pkgconfig
-  - policycoreutils-python
-  - popt-devel
-  - procps
-  - psmisc
-  - python3-dns
-  - python3-markdown
-  - python36
-  - python36-devel
-  - quota-devel
-  - readline-devel
-  - redhat-lsb
-  - rng-tools
-  - rpcgen
-  - rsync
-  - sed
-  - sudo
-  - systemd-devel
-  - tar
-  - tree
-  - which
-  - xfsprogs-devel
-  - yum-utils
-  - zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian7/Dockerfile b/bootstrap/generated-dists/debian7/Dockerfile
deleted file mode 100644 (file)
index dfe0e38..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM debian: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=$(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/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
deleted file mode 100755 (executable)
index daedce8..0000000
+++ /dev/null
@@ -1,101 +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 \
-    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 \
-    libgnutls-dev \
-    libgpgme11-dev \
-    libicu-dev \
-    libjansson-dev \
-    libjs-jquery \
-    libjson-perl \
-    libkrb5-dev \
-    libldap2-dev \
-    libncurses5-dev \
-    libpam0g-dev \
-    libparse-yapp-perl \
-    libpcap-dev \
-    libpopt-dev \
-    libreadline-dev \
-    libtasn1-bin \
-    libtasn1-dev \
-    libunwind-dev \
-    locales \
-    lsb-release \
-    make \
-    mawk \
-    mingw-w64 \
-    patch \
-    perl \
-    perl-modules \
-    pkg-config \
-    procps \
-    psmisc \
-    python3 \
-    python3-dbg \
-    python3-dev \
-    python3-dnspython \
-    python3-iso8601 \
-    python3-markdown \
-    python3-matplotlib \
-    python3-pexpect \
-    rng-tools \
-    rsync \
-    sed \
-    sudo \
-    tar \
-    tree \
-    uuid-dev \
-    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/debian7/locale.sh b/bootstrap/generated-dists/debian7/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/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
deleted file mode 100644 (file)
index 3cac687..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
----
-packages:
-  - acl
-  - apt-utils
-  - attr
-  - autoconf
-  - bind9utils
-  - binutils
-  - bison
-  - build-essential
-  - 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
-  - libgnutls-dev
-  - libgpgme11-dev
-  - libicu-dev
-  - libjansson-dev
-  - libjs-jquery
-  - libjson-perl
-  - libkrb5-dev
-  - libldap2-dev
-  - libncurses5-dev
-  - libpam0g-dev
-  - libparse-yapp-perl
-  - libpcap-dev
-  - libpopt-dev
-  - libreadline-dev
-  - libtasn1-bin
-  - libtasn1-dev
-  - libunwind-dev
-  - locales
-  - lsb-release
-  - make
-  - mawk
-  - mingw-w64
-  - patch
-  - perl
-  - perl-modules
-  - pkg-config
-  - procps
-  - psmisc
-  - python3
-  - python3-dbg
-  - python3-dev
-  - python3-dnspython
-  - python3-iso8601
-  - python3-markdown
-  - python3-matplotlib
-  - python3-pexpect
-  - rng-tools
-  - rsync
-  - sed
-  - sudo
-  - tar
-  - tree
-  - uuid-dev
-  - xfslibs-dev
-  - xsltproc
-  - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian8/Dockerfile b/bootstrap/generated-dists/debian8/Dockerfile
deleted file mode 100644 (file)
index a5a3565..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM debian:8
-
-# 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/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
deleted file mode 100755 (executable)
index 0105083..0000000
+++ /dev/null
@@ -1,105 +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 \
-    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 \
-    libunwind-dev \
-    lmdb-utils \
-    locales \
-    lsb-release \
-    make \
-    mawk \
-    mingw-w64 \
-    patch \
-    perl \
-    perl-modules \
-    pkg-config \
-    procps \
-    psmisc \
-    python3 \
-    python3-dbg \
-    python3-dev \
-    python3-dnspython \
-    python3-gpgme \
-    python3-iso8601 \
-    python3-markdown \
-    python3-matplotlib \
-    python3-pexpect \
-    rng-tools \
-    rsync \
-    sed \
-    sudo \
-    tar \
-    tree \
-    uuid-dev \
-    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/debian8/locale.sh b/bootstrap/generated-dists/debian8/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/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
deleted file mode 100644 (file)
index 1c9552b..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
----
-packages:
-  - acl
-  - apt-utils
-  - attr
-  - autoconf
-  - bind9utils
-  - binutils
-  - bison
-  - build-essential
-  - 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
-  - libunwind-dev
-  - lmdb-utils
-  - locales
-  - lsb-release
-  - make
-  - mawk
-  - mingw-w64
-  - patch
-  - perl
-  - perl-modules
-  - pkg-config
-  - procps
-  - psmisc
-  - python3
-  - python3-dbg
-  - python3-dev
-  - python3-dnspython
-  - python3-gpgme
-  - python3-iso8601
-  - python3-markdown
-  - python3-matplotlib
-  - python3-pexpect
-  - rng-tools
-  - rsync
-  - sed
-  - sudo
-  - tar
-  - tree
-  - uuid-dev
-  - xfslibs-dev
-  - xsltproc
-  - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1404/Dockerfile b/bootstrap/generated-dists/ubuntu1404/Dockerfile
deleted file mode 100644 (file)
index 4cbb2d3..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM ubuntu:14.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=$(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/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
deleted file mode 100755 (executable)
index 78c8969..0000000
+++ /dev/null
@@ -1,103 +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 \
-    chrpath \
-    curl \
-    debhelper \
-    dnsutils \
-    docbook-xml \
-    docbook-xsl \
-    flex \
-    gcc \
-    gdb \
-    git \
-    gzip \
-    heimdal-multidev \
-    hostname \
-    htop \
-    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 \
-    libcups2-dev \
-    libdbus-1-dev \
-    libglib2.0-dev \
-    libgnutls-dev \
-    libgpgme11-dev \
-    libicu-dev \
-    libjansson-dev \
-    libjs-jquery \
-    libjson-perl \
-    libkrb5-dev \
-    libldap2-dev \
-    liblmdb-dev/trusty-backports \
-    libncurses5-dev \
-    libpam0g-dev \
-    libparse-yapp-perl \
-    libpcap-dev \
-    libpopt-dev \
-    libreadline-dev \
-    libtasn1-bin \
-    libtasn1-dev \
-    libunwind8-dev \
-    lmdb-utils/trusty-backports \
-    locales \
-    lsb-release \
-    make \
-    mawk \
-    mingw-w64 \
-    patch \
-    perl \
-    perl-modules \
-    pkg-config \
-    procps \
-    psmisc \
-    python3 \
-    python3-dbg \
-    python3-dev \
-    python3-dnspython \
-    python3-gpgme \
-    python3-iso8601 \
-    python3-markdown \
-    python3-matplotlib \
-    python3-pexpect \
-    rng-tools \
-    rsync \
-    sed \
-    sudo \
-    tar \
-    tree \
-    uuid-dev \
-    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/ubuntu1404/locale.sh b/bootstrap/generated-dists/ubuntu1404/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/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
deleted file mode 100644 (file)
index f6c8a0a..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
----
-packages:
-  - acl
-  - apt-utils
-  - attr
-  - autoconf
-  - bind9utils
-  - binutils
-  - bison
-  - build-essential
-  - chrpath
-  - curl
-  - debhelper
-  - dnsutils
-  - docbook-xml
-  - docbook-xsl
-  - flex
-  - gcc
-  - gdb
-  - git
-  - gzip
-  - heimdal-multidev
-  - hostname
-  - htop
-  - 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
-  - libcups2-dev
-  - libdbus-1-dev
-  - libglib2.0-dev
-  - libgnutls-dev
-  - libgpgme11-dev
-  - libicu-dev
-  - libjansson-dev
-  - libjs-jquery
-  - libjson-perl
-  - libkrb5-dev
-  - libldap2-dev
-  - liblmdb-dev/trusty-backports
-  - libncurses5-dev
-  - libpam0g-dev
-  - libparse-yapp-perl
-  - libpcap-dev
-  - libpopt-dev
-  - libreadline-dev
-  - libtasn1-bin
-  - libtasn1-dev
-  - libunwind8-dev
-  - lmdb-utils/trusty-backports
-  - locales
-  - lsb-release
-  - make
-  - mawk
-  - mingw-w64
-  - patch
-  - perl
-  - perl-modules
-  - pkg-config
-  - procps
-  - psmisc
-  - python3
-  - python3-dbg
-  - python3-dev
-  - python3-dnspython
-  - python3-gpgme
-  - python3-iso8601
-  - python3-markdown
-  - python3-matplotlib
-  - python3-pexpect
-  - rng-tools
-  - rsync
-  - sed
-  - sudo
-  - tar
-  - tree
-  - uuid-dev
-  - xfslibs-dev
-  - xsltproc
-  - zlib1g-dev
\ No newline at end of file
index 62c2245564e66c984ebe201bf456cb480e0ed1a1..2378dd2d94f8f20921ccfe4b60edd6de93bc1a26 100644 (file)
@@ -1 +1 @@
-41319f2580c026f66b2750604a0eb15d6b6f7b50
+cd4cebb9c611fb98f3a21171dd4832df930add28