[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Mar 20 15:20:02 UTC 2020
The branch, master has been updated
via bce99f59332 gitlab-ci: Add Fedora 32 (Beta)
via ef08b303800 gitlab-ci: Remove Fedora 30
via 087566641e3 gitlab-ci: Remove Fedora 29 which is already EOL
from 639e64d30d5 third_party: Update nss_wrapper to version 1.1.10
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bce99f59332ffd4d817be457ff4b39743e724319
Author: Andreas Schneider <asn at samba.org>
Date: Thu Mar 19 10:32:17 2020 +0100
gitlab-ci: Add Fedora 32 (Beta)
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Mar 20 15:19:50 UTC 2020 on sn-devel-184
commit ef08b30380093726297529d20b087e64caa58572
Author: Andreas Schneider <asn at samba.org>
Date: Thu Mar 19 10:28:23 2020 +0100
gitlab-ci: Remove Fedora 30
It is pretty similar to Fedora 31, so remove it safe some CI resources.
We will add Fedora 32 next.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 087566641e32821ea3cae0d23bd70a5602581b53
Author: Andreas Schneider <asn at samba.org>
Date: Thu Mar 19 10:23:02 2020 +0100
gitlab-ci: Remove Fedora 29 which is already EOL
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 17 ++--
bootstrap/.gitlab-ci.yml | 5 +-
bootstrap/config.py | 24 ++---
bootstrap/generated-dists/Vagrantfile | 21 ++--
bootstrap/generated-dists/fedora29/bootstrap.sh | 108 ---------------------
bootstrap/generated-dists/fedora29/packages.yml | 95 ------------------
bootstrap/generated-dists/fedora30/Dockerfile | 27 ------
bootstrap/generated-dists/fedora30/bootstrap.sh | 108 ---------------------
bootstrap/generated-dists/fedora30/locale.sh | 55 -----------
bootstrap/generated-dists/fedora30/packages.yml | 95 ------------------
.../{fedora29 => fedora32}/Dockerfile | 2 +-
.../{fedora31 => fedora32}/bootstrap.sh | 0
.../{fedora29 => fedora32}/locale.sh | 0
.../{fedora31 => fedora32}/packages.yml | 0
bootstrap/sha1sum.txt | 2 +-
15 files changed, 24 insertions(+), 535 deletions(-)
delete mode 100755 bootstrap/generated-dists/fedora29/bootstrap.sh
delete mode 100644 bootstrap/generated-dists/fedora29/packages.yml
delete mode 100644 bootstrap/generated-dists/fedora30/Dockerfile
delete mode 100755 bootstrap/generated-dists/fedora30/bootstrap.sh
delete mode 100755 bootstrap/generated-dists/fedora30/locale.sh
delete mode 100644 bootstrap/generated-dists/fedora30/packages.yml
rename bootstrap/generated-dists/{fedora29 => fedora32}/Dockerfile (92%)
copy bootstrap/generated-dists/{fedora31 => fedora32}/bootstrap.sh (100%)
rename bootstrap/generated-dists/{fedora29 => fedora32}/locale.sh (100%)
copy bootstrap/generated-dists/{fedora31 => fedora32}/packages.yml (100%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05f410bde3d..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: 6bb2eeaf8203467d9a93a722071b0f081027410e
+ SAMBA_CI_CONTAINER_TAG: 9061307e79ad13733c69352a965eeb4f44bef4b7
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -39,9 +39,8 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_debian10: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian10:${SAMBA_CI_CONTAINER_TAG}
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_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
- SAMBA_CI_CONTAINER_IMAGE_fedora30: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora30:${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}
@@ -299,18 +298,14 @@ centos8-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_centos8
-fedora29-samba-o3:
- extends: .samba-o3-template
- image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
-
-fedora30-samba-o3:
- extends: .samba-o3-template
- image: $SAMBA_CI_CONTAINER_IMAGE_fedora30
-
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 ecd9f4d4223..8427dbdc314 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -99,10 +99,7 @@ debian10:
fedora31:
extends: .build_image_template
-fedora30:
- extends: .build_image_template
-
-fedora29:
+fedora32:
extends: .build_image_template
centos8:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index ff9bb150672..093b84676f0 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -453,27 +453,19 @@ RPM_DISTS = {
'liburing-devel': '', # not available yet, Add me back, once available!
}
},
- 'fedora29': {
- 'docker_image': 'fedora:29',
- 'vagrant_box': 'fedora/29-cloud-base',
- 'bootstrap': DNF_BOOTSTRAP,
- 'replace': {
- 'lsb-release': 'redhat-lsb',
- 'liburing-devel': '', # not available
- }
- },
- 'fedora30': {
- 'docker_image': 'fedora:30',
- 'vagrant_box': 'fedora/30-cloud-base',
+ 'fedora31': {
+ 'docker_image': 'fedora:31',
+ 'vagrant_box': 'fedora/31-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
'replace': {
'lsb-release': 'redhat-lsb',
- 'liburing-devel': '', # not available
+ 'libsemanage-python': 'python3-libsemanage',
+ 'policycoreutils-python': 'python3-policycoreutils',
}
},
- 'fedora31': {
- 'docker_image': 'fedora:31',
- 'vagrant_box': 'fedora/31-cloud-base',
+ 'fedora32': {
+ 'docker_image': 'fedora:32',
+ 'vagrant_box': 'fedora/32-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
'replace': {
'lsb-release': 'redhat-lsb',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 47c58d5a87b..15fc686f584 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -31,20 +31,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian10/locale.sh"
end
- config.vm.define "fedora29" do |v|
- v.vm.box = "fedora/29-cloud-base"
- v.vm.hostname = "fedora29"
- v.vm.provision :shell, path: "fedora29/bootstrap.sh"
- v.vm.provision :shell, path: "fedora29/locale.sh"
- end
-
- config.vm.define "fedora30" do |v|
- v.vm.box = "fedora/30-cloud-base"
- v.vm.hostname = "fedora30"
- v.vm.provision :shell, path: "fedora30/bootstrap.sh"
- v.vm.provision :shell, path: "fedora30/locale.sh"
- end
-
config.vm.define "fedora31" do |v|
v.vm.box = "fedora/31-cloud-base"
v.vm.hostname = "fedora31"
@@ -52,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/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
deleted file mode 100755
index effe2a9d214..00000000000
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ /dev/null
@@ -1,108 +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 \
- 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 \
- 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 \
- 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-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/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
deleted file mode 100644
index 3b767f8ba08..00000000000
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ /dev/null
@@ -1,95 +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
- - 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
- - 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
- - 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-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/generated-dists/fedora30/Dockerfile b/bootstrap/generated-dists/fedora30/Dockerfile
deleted file mode 100644
index f2a2c3546f0..00000000000
--- a/bootstrap/generated-dists/fedora30/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM fedora:30
-
-# 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/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
deleted file mode 100755
index effe2a9d214..00000000000
--- a/bootstrap/generated-dists/fedora30/bootstrap.sh
+++ /dev/null
@@ -1,108 +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 \
- 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 \
- 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 \
- 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-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 \
--
Samba Shared Repository
More information about the samba-cvs
mailing list