[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Wed Nov 6 13:36:02 UTC 2019
The branch, master has been updated
via 35bb734d638 bootstrap: Fix centos7 image creation
via 6a3b19fb170 bootstrap: Add Fedora 31
via 1ba0a32e707 bootstrap: Remove Fedora 28 which is already EOL
from bf99f820778 ctdb-tests: Make process exists test more resilient
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 35bb734d638e273f2fd1a19220db5f200d3e7489
Author: Andreas Schneider <asn at samba.org>
Date: Wed Nov 6 08:43:05 2019 +0100
bootstrap: Fix centos7 image creation
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Wed Nov 6 13:35:17 UTC 2019 on sn-devel-184
commit 6a3b19fb170d13aaed92645866af75cc508d0991
Author: Andreas Schneider <asn at samba.org>
Date: Tue Nov 5 10:39:16 2019 +0100
bootstrap: Add Fedora 31
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
commit 1ba0a32e707618012dcf9f06ff48bb15783cf106
Author: Andreas Schneider <asn at samba.org>
Date: Tue Nov 5 10:38:48 2019 +0100
bootstrap: Remove Fedora 28 which is already EOL
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 7 +++++-
bootstrap/.gitlab-ci.yml | 6 ++---
bootstrap/config.py | 19 ++++++++-------
bootstrap/generated-dists/Vagrantfile | 14 +++++------
bootstrap/generated-dists/centos7/bootstrap.sh | 2 +-
bootstrap/generated-dists/centos7/packages.yml | 2 +-
bootstrap/generated-dists/fedora28/Dockerfile | 27 ----------------------
.../{centos8 => fedora31}/Dockerfile | 2 +-
.../{fedora28 => fedora31}/bootstrap.sh | 4 ++--
.../{fedora28 => fedora31}/locale.sh | 0
.../{fedora28 => fedora31}/packages.yml | 4 ++--
bootstrap/sha1sum.txt | 2 +-
12 files changed, 35 insertions(+), 54 deletions(-)
delete mode 100644 bootstrap/generated-dists/fedora28/Dockerfile
copy bootstrap/generated-dists/{centos8 => fedora31}/Dockerfile (92%)
rename bootstrap/generated-dists/{fedora28 => fedora31}/bootstrap.sh (96%)
rename bootstrap/generated-dists/{fedora28 => fedora31}/locale.sh (100%)
rename bootstrap/generated-dists/{fedora28 => fedora31}/packages.yml (95%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d26c956fde..e12f9ebf903 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: 4a498d9dd6c861b85bf4a749f3feb0805ea7298e
+ SAMBA_CI_CONTAINER_TAG: 539cd9023fee0703a42dc82e8778a01149fcb679
#
# 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_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_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}
@@ -298,6 +299,10 @@ 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
+
#
# Keep the samba-o3 sections at the end ...
#
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index e474b4b500f..865d93485a8 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -101,15 +101,15 @@ debian8:
debian7:
extends: .build_image_template_force_broken
+fedora31:
+ extends: .build_image_template
+
fedora30:
extends: .build_image_template
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 7eca3a372ef..eb1d2b4a9a0 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -487,6 +487,7 @@ RPM_DISTS = {
'glusterfs-api-devel': '',
'glusterfs-devel': '',
'libcephfs-devel': '',
+ 'nettle-devel': 'compat-nettle32-devel',
'gnutls-devel': 'compat-gnutls34-devel',
}
},
@@ -506,14 +507,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',
@@ -530,6 +523,16 @@ RPM_DISTS = {
'lsb-release': 'redhat-lsb',
}
},
+ 'fedora31': {
+ 'docker_image': 'fedora:31',
+ 'vagrant_box': 'fedora/31-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 1e984d20122..4381dca6496 100644
--- 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"
@@ -73,6 +66,13 @@ Vagrant.configure("2") do |config|
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"
+ v.vm.provision :shell, path: "fedora31/bootstrap.sh"
+ v.vm.provision :shell, path: "fedora31/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/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 629a88018bb..6e3bbd288b1 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -23,6 +23,7 @@ yum install -y \
binutils \
bison \
compat-gnutls34-devel \
+ compat-nettle32-devel \
cups-devel \
curl \
dbus-devel \
@@ -66,7 +67,6 @@ yum install -y \
make \
mingw64-gcc \
ncurses-devel \
- nettle-devel \
openldap-devel \
pam-devel \
patch \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 57464db7bb0..3c095961b2a 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -9,6 +9,7 @@ packages:
- binutils
- bison
- compat-gnutls34-devel
+ - compat-nettle32-devel
- cups-devel
- curl
- dbus-devel
@@ -52,7 +53,6 @@ packages:
- make
- mingw64-gcc
- ncurses-devel
- - nettle-devel
- openldap-devel
- pam-devel
- patch
diff --git a/bootstrap/generated-dists/fedora28/Dockerfile b/bootstrap/generated-dists/fedora28/Dockerfile
deleted file mode 100644
index 4d25691e1b7..00000000000
--- 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/centos8/Dockerfile b/bootstrap/generated-dists/fedora31/Dockerfile
similarity index 92%
copy from bootstrap/generated-dists/centos8/Dockerfile
copy to bootstrap/generated-dists/fedora31/Dockerfile
index f6343e9d5a2..ff8d0b435c8 100644
--- a/bootstrap/generated-dists/centos8/Dockerfile
+++ b/bootstrap/generated-dists/fedora31/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM centos:8
+FROM fedora:31
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
similarity index 96%
rename from bootstrap/generated-dists/fedora28/bootstrap.sh
rename to bootstrap/generated-dists/fedora31/bootstrap.sh
index a46bb5f6fcf..548bba30f22 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -55,7 +55,6 @@ dnf install -y \
libicu-devel \
libnsl2-devel \
libpcap-devel \
- libsemanage-python \
libtasn1-devel \
libtasn1-tools \
libtirpc-devel \
@@ -80,7 +79,6 @@ dnf install -y \
perl-generators \
perl-interpreter \
pkgconfig \
- policycoreutils-python \
popt-devel \
procps-ng \
psmisc \
@@ -89,7 +87,9 @@ dnf install -y \
python3-devel \
python3-dns \
python3-gpg \
+ python3-libsemanage \
python3-markdown \
+ python3-policycoreutils \
quota-devel \
readline-devel \
redhat-lsb \
diff --git a/bootstrap/generated-dists/fedora28/locale.sh b/bootstrap/generated-dists/fedora31/locale.sh
similarity index 100%
rename from bootstrap/generated-dists/fedora28/locale.sh
rename to bootstrap/generated-dists/fedora31/locale.sh
diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
similarity index 95%
rename from bootstrap/generated-dists/fedora28/packages.yml
rename to bootstrap/generated-dists/fedora31/packages.yml
index 023889bcb4c..f6d71871938 100644
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -44,7 +44,6 @@ packages:
- libicu-devel
- libnsl2-devel
- libpcap-devel
- - libsemanage-python
- libtasn1-devel
- libtasn1-tools
- libtirpc-devel
@@ -69,7 +68,6 @@ packages:
- perl-generators
- perl-interpreter
- pkgconfig
- - policycoreutils-python
- popt-devel
- procps-ng
- psmisc
@@ -78,7 +76,9 @@ packages:
- python3-devel
- python3-dns
- python3-gpg
+ - python3-libsemanage
- python3-markdown
+ - python3-policycoreutils
- quota-devel
- readline-devel
- redhat-lsb
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 7f16e8f2dde..02df7bd88ea 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-4a498d9dd6c861b85bf4a749f3feb0805ea7298e
+539cd9023fee0703a42dc82e8778a01149fcb679
--
Samba Shared Repository
More information about the samba-cvs
mailing list