summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2020-03-19 10:32:17 +0100
committerAndreas Schneider <asn@cryptomilk.org>2020-03-20 15:19:50 +0000
commitbce99f59332ffd4d817be457ff4b39743e724319 (patch)
tree151afd958ae78fc1b2dd8711aecbb43f0e231288
parentef08b30380093726297529d20b087e64caa58572 (diff)
downloadsamba-bce99f59332ffd4d817be457ff4b39743e724319.tar.gz
gitlab-ci: Add Fedora 32 (Beta)
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Fri Mar 20 15:19:50 UTC 2020 on sn-devel-184
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--bootstrap/.gitlab-ci.yml3
-rw-r--r--bootstrap/config.py10
-rw-r--r--bootstrap/generated-dists/Vagrantfile7
-rw-r--r--bootstrap/generated-dists/fedora32/Dockerfile27
-rwxr-xr-xbootstrap/generated-dists/fedora32/bootstrap.sh109
-rwxr-xr-xbootstrap/generated-dists/fedora32/locale.sh55
-rw-r--r--bootstrap/generated-dists/fedora32/packages.yml96
-rw-r--r--bootstrap/sha1sum.txt2
9 files changed, 314 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28c6b70066c..f8275959118 100644
--- 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: 9f95136e88779ec8eed6c18614b1e0779ef2bfec
+ SAMBA_CI_CONTAINER_TAG: 9061307e79ad13733c69352a965eeb4f44bef4b7
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -40,6 +40,7 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_opensuse151: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse151:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_fedora31: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora31:${SAMBA_CI_CONTAINER_TAG}
+ SAMBA_CI_CONTAINER_IMAGE_fedora32: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora32:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_centos8: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos8:${SAMBA_CI_CONTAINER_TAG}
@@ -301,6 +302,10 @@ fedora31-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_fedora31
+fedora32-samba-o3:
+ extends: .samba-o3-template
+ image: $SAMBA_CI_CONTAINER_IMAGE_fedora32
+
#
# Keep the samba-o3 sections at the end ...
#
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 89c1453a34c..8427dbdc314 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -99,6 +99,9 @@ debian10:
fedora31:
extends: .build_image_template
+fedora32:
+ extends: .build_image_template
+
centos8:
extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 6d4d662d563..093b84676f0 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -463,6 +463,16 @@ RPM_DISTS = {
'policycoreutils-python': 'python3-policycoreutils',
}
},
+ 'fedora32': {
+ 'docker_image': 'fedora:32',
+ 'vagrant_box': 'fedora/32-cloud-base',
+ 'bootstrap': DNF_BOOTSTRAP,
+ 'replace': {
+ 'lsb-release': 'redhat-lsb',
+ 'libsemanage-python': 'python3-libsemanage',
+ 'policycoreutils-python': 'python3-policycoreutils',
+ }
+ },
'opensuse150': {
'docker_image': 'opensuse/leap:15.0',
'vagrant_box': 'opensuse/openSUSE-15.0-x86_64',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 770e364c70b..15fc686f584 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -38,6 +38,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "fedora31/locale.sh"
end
+ config.vm.define "fedora32" do |v|
+ v.vm.box = "fedora/32-cloud-base"
+ v.vm.hostname = "fedora32"
+ v.vm.provision :shell, path: "fedora32/bootstrap.sh"
+ v.vm.provision :shell, path: "fedora32/locale.sh"
+ end
+
config.vm.define "opensuse150" do |v|
v.vm.box = "opensuse/openSUSE-15.0-x86_64"
v.vm.hostname = "opensuse150"
diff --git a/bootstrap/generated-dists/fedora32/Dockerfile b/bootstrap/generated-dists/fedora32/Dockerfile
new file mode 100644
index 00000000000..d8a75cf8445
--- /dev/null
+++ b/bootstrap/generated-dists/fedora32/Dockerfile
@@ -0,0 +1,27 @@
+#
+# This file is generated by 'bootstrap/template.py --render'
+# See also bootstrap/config.py
+#
+
+FROM fedora:32
+
+# 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/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora32/bootstrap.sh
new file mode 100755
index 00000000000..18c58092eff
--- /dev/null
+++ b/bootstrap/generated-dists/fedora32/bootstrap.sh
@@ -0,0 +1,109 @@
+#!/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 \
+ 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 \
+ lcov \
+ libacl-devel \
+ libarchive-devel \
+ libattr-devel \
+ libblkid-devel \
+ libbsd-devel \
+ libcap-devel \
+ libcephfs-devel \
+ libicu-devel \
+ libnsl2-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-Parse \
+ perl-Parse-Yapp \
+ perl-Test-Base \
+ perl-generators \
+ perl-interpreter \
+ pkgconfig \
+ popt-devel \
+ procps-ng \
+ psmisc \
+ python3 \
+ python3-devel \
+ python3-dns \
+ python3-gpg \
+ python3-libsemanage \
+ python3-markdown \
+ python3-policycoreutils \
+ 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/fedora32/locale.sh b/bootstrap/generated-dists/fedora32/locale.sh
new file mode 100755
index 00000000000..cc64e180483
--- /dev/null
+++ b/bootstrap/generated-dists/fedora32/locale.sh
@@ -0,0 +1,55 @@
+#!/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/fedora32/packages.yml b/bootstrap/generated-dists/fedora32/packages.yml
new file mode 100644
index 00000000000..3165af8dd82
--- /dev/null
+++ b/bootstrap/generated-dists/fedora32/packages.yml
@@ -0,0 +1,96 @@
+---
+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
+ - 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
+ - libarchive-devel
+ - libattr-devel
+ - libblkid-devel
+ - libbsd-devel
+ - libcap-devel
+ - libcephfs-devel
+ - libicu-devel
+ - libnsl2-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-Parse
+ - perl-Parse-Yapp
+ - perl-Test-Base
+ - perl-generators
+ - perl-interpreter
+ - pkgconfig
+ - popt-devel
+ - procps-ng
+ - psmisc
+ - python3
+ - python3-devel
+ - python3-dns
+ - python3-gpg
+ - python3-libsemanage
+ - python3-markdown
+ - python3-policycoreutils
+ - 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 ef012315ce1..df1b85b9f21 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-9f95136e88779ec8eed6c18614b1e0779ef2bfec
+9061307e79ad13733c69352a965eeb4f44bef4b7