gitlab-ci: Enable building on CentOS7

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue May  7 01:45:37 UTC 2019 on sn-devel-184

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b9d0cb69bebb8aa2fcf76dd971fb91f79342da0..3d01f8fc376f4a899c77a76b8d127669dd01431b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 2be76362af215af6842e884abd5246dd9b50c283
+  SAMBA_CI_CONTAINER_TAG: 93278680b4e7086c0bec11a58bc3533f9971c08e
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
   SAMBA_CI_CONTAINER_IMAGE: ubuntu1804
@@ -33,6 +33,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG}
 
 include:
   # The image creation details are specified in a separate file
@@ -200,6 +201,13 @@ opensuse150-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150
 
+centos7-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_centos7
+  variables:
+    # Git on CentOS doesn't support shallow git cloning
+    GIT_DEPTH: ""
+
 fedora29-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_fedora29

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index ac2557719538ad762c348c6f3d6c6073ad7e4772..1b07c54afd2d537387fc106768f0ea26c2306ed2 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -107,7 +107,10 @@ fedora28:
   extends: .build_image_template_force_broken
 
 centos7:
-  extends: .build_image_template_force_broken
+  extends: .build_image_template
+  variables:
+    # Shallow copies are not supported by git on CentOS7
+    GIT_DEPTH: ""
 
 centos6:
   extends: .build_image_template_force_broken

diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 521d571d1f6978a87b646051a96b1b09fb6c7b89..203386bf4473cbe61e82330883ebd63e4b68c0ec 100755 (executable)
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -7,11 +7,11 @@
 
 set -xueo pipefail
 
-yum -y -q update
-yum -y -q install epel-release
-yum -y -q update
+yum update -y
+yum install -y epel-release
+yum update -y
 
-yum -y -q --verbose install \
+yum install -y \
     "@Development Tools" \
     acl \
     attr \
@@ -87,7 +87,8 @@ yum -y -q --verbose install \
     python3-crypto \
     python3-dns \
     python3-markdown \
-    python34-devel \
+    python36 \
+    python36-devel \
     quota-devel \
     readline-devel \
     redhat-lsb \
@@ -104,4 +105,8 @@ yum -y -q --verbose install \
     yum-utils \
     zlib-devel
 
-yum clean all
\ No newline at end of file
+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/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index c9aef4d64ee3b49e07d46679c91d251a9f1807fa..98a89a844f940c9e971d8b3dde5effa3fbaa52c2 100644 (file)
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -75,7 +75,8 @@ packages:
   - python3-crypto
   - python3-dns
   - python3-markdown
-  - python34-devel
+  - python36
+  - python36-devel
   - quota-devel
   - readline-devel
   - redhat-lsb

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index fa1e49836f3b3cef54e850c44f85586008f31680..c3ccc4bb0b9a18cb0c5f8ade1d28abd7fbc849c1 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -7,11 +7,11 @@
 
 set -xueo pipefail
 
-yum -y -q update
-yum -y -q install epel-release
-yum -y -q update
+yum update -y
+yum install -y epel-release
+yum update -y
 
-yum -y -q --verbose install \
+yum install -y \
     "@Development Tools" \
     acl \
     attr \
@@ -84,10 +84,11 @@ yum -y -q --verbose install \
     python-devel \
     python-dns \
     python-markdown \
-    python3-crypto \
-    python3-dns \
-    python3-markdown \
-    python34-devel \
+    python36 \
+    python36-crypto \
+    python36-devel \
+    python36-dns \
+    python36-markdown \
     quota-devel \
     readline-devel \
     redhat-lsb \
@@ -104,4 +105,8 @@ yum -y -q --verbose install \
     yum-utils \
     zlib-devel
 
-yum clean all
\ No newline at end of file
+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/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 2dd4fb682657291febee9465e0c42385b6052be1..40c5513d72c9d99f5864f213a05673236522bca1 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -72,10 +72,11 @@ packages:
   - python-devel
   - python-dns
   - python-markdown
-  - python3-crypto
-  - python3-dns
-  - python3-markdown
-  - python34-devel
+  - python36
+  - python36-crypto
+  - python36-devel
+  - python36-dns
+  - python36-markdown
   - quota-devel
   - readline-devel
   - redhat-lsb

diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index 6141efc3a2b548c717619c7a5b821a5ab39a6e54..f506af4c616041d5b1cd0c0e0dd742e8c2409b26 100755 (executable)
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -84,6 +84,7 @@ apt-get -y install \
     python-iso8601 \
     python-markdown \
     python-pexpect \
+    python3 \
     python3-crypto \
     python3-dbg \
     python3-dev \

diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 9cb9b2df5b906a2f4503375e33dcdfdeeb566563..645df5a06920f5db9f6740fe0765d0b7c61acf4b 100644 (file)
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -73,6 +73,7 @@ packages:
   - python-iso8601
   - python-markdown
   - python-pexpect
+  - python3
   - python3-crypto
   - python3-dbg
   - python3-dev

diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 0388a1134d4bf3b4e866f589efc646c019b88794..214574fed08abd678152d473a650ddb1de0dbac0 100755 (executable)
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -87,6 +87,7 @@ apt-get -y install \
     python-iso8601 \
     python-markdown \
     python-pexpect \
+    python3 \
     python3-crypto \
     python3-dbg \
     python3-dev \

diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index f7e9ec61fe30366606f55e560574cbccd2853852..f5574edb1b99c8b69d62df9acac928e21108d8af 100644 (file)
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -76,6 +76,7 @@ packages:
   - python-iso8601
   - python-markdown
   - python-pexpect
+  - python3
   - python3-crypto
   - python3-dbg
   - python3-dev

diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index 5576c455ce75e27476c5780b4d3d7336260bcd46..9349fd2fa5b21029d20df042a62774aeaa50be91 100755 (executable)
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -87,6 +87,7 @@ apt-get -y install \
     python-iso8601 \
     python-markdown \
     python-pexpect \
+    python3 \
     python3-crypto \
     python3-dbg \
     python3-dev \

diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 03d9f4759a55e01a97bead2690fdcbfed6c2a816..d46d33f1e572baf30698eb4fb51fa9f06a5c5de8 100644 (file)
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -76,6 +76,7 @@ packages:
   - python-iso8601
   - python-markdown
   - python-pexpect
+  - python3
   - python3-crypto
   - python3-dbg
   - python3-dev

diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index e2e4ee99803246c0015a2443fc8a10c5b44995ca..2c365247e6a0d1c24973caa66f27f527c039e8ce 100755 (executable)
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -87,6 +87,7 @@ dnf install -y \
     python-dns \
     python-markdown \
     python2-gpg \
+    python3 \
     python3-crypto \
     python3-devel \
     python3-dns \

diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index e20a8764a6bd2ec472eaab6059af869f1160e64a..2961e4c0a509d75ccde6d434b612b8720ef6aed3 100644 (file)
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -76,6 +76,7 @@ packages:
   - python-dns
   - python-markdown
   - python2-gpg
+  - python3
   - python3-crypto
   - python3-devel
   - python3-dns

diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index e2e4ee99803246c0015a2443fc8a10c5b44995ca..2c365247e6a0d1c24973caa66f27f527c039e8ce 100755 (executable)
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -87,6 +87,7 @@ dnf install -y \
     python-dns \
     python-markdown \
     python2-gpg \
+    python3 \
     python3-crypto \
     python3-devel \
     python3-dns \

diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index e20a8764a6bd2ec472eaab6059af869f1160e64a..2961e4c0a509d75ccde6d434b612b8720ef6aed3 100644 (file)
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -76,6 +76,7 @@ packages:
   - python-dns
   - python-markdown
   - python2-gpg
+  - python3
   - python3-crypto
   - python3-devel
   - python3-dns

diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 41506f9c67e8cfbf9ed85c58e9b7d52223659cc9..4bf205e5ffb42535d3d608bf6752acf2a96542ae 100755 (executable)
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -84,6 +84,7 @@ zypper --non-interactive install \
     python2-dnspython \
     python2-gpg \
     python2-semanage \
+    python3 \
     python3-Markdown \
     python3-devel \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 66c59e4ee2a04b81ce8762da4b776d66c09750c3..8183e89804ef357bdb3a4e542ea525df2dff2775 100644 (file)
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -72,6 +72,7 @@ packages:
   - python2-dnspython
   - python2-gpg
   - python2-semanage
+  - python3
   - python3-Markdown
   - python3-devel
   - python3-dnspython

diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index b391f6ae225bf83c23c9dd8105cd389877a15145..ba193207c441f5a445a5f2f6e8015d0c704cd2d7 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -85,6 +85,7 @@ apt-get -y install \
     python-iso8601 \
     python-markdown \
     python-pexpect \
+    python3 \
     python3-crypto \
     python3-dbg \
     python3-dev \

diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index 1a69db83823356e8fa1b2f6442674e5975e1f3fc..477fc4fb090671f071431a576f2ff3e2b168a3dd 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -74,6 +74,7 @@ packages:
   - python-iso8601
   - python-markdown
   - python-pexpect
+  - python3
   - python3-crypto
   - python3-dbg
   - python3-dev

diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 71d284a3d545e72214c21498b7c0c8f51931d49f..6a3e43f3dab944819b6b087a48275577d855d36c 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -86,6 +86,7 @@ apt-get -y install \
     python-iso8601 \
     python-markdown \
     python-pexpect \
+    python3 \
     python3-crypto \
     python3-dbg \
     python3-dev \

diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index 2b0011c2c1f2eb507c151bd0298f9fb5d3593c5d..653add38bfb498bc60fc765cb1502edda49204a9 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -75,6 +75,7 @@ packages:
   - python-iso8601
   - python-markdown
   - python-pexpect
+  - python3
   - python3-crypto
   - python3-dbg
   - python3-dev

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index b019db6db7a71ca8ef462feb5b747773ff04897c..6149a2b27eac717070ace876a77a43db59619df8 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -88,6 +88,7 @@ apt-get -y install \
     python-iso8601 \
     python-markdown \
     python-pexpect \
+    python3 \
     python3-crypto \
     python3-dbg \
     python3-dev \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 7d02be88ff748d719943c79bf849b9414000121e..07e0ab9c217bd919fca54773f843529e09169035 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -77,6 +77,7 @@ packages:
   - python-iso8601
   - python-markdown
   - python-pexpect
+  - python3
   - python3-crypto
   - python3-dbg
   - python3-dev

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index f4e6322c5b67b056d0b1a3916dcb166a6e9dc1fa..a5d74e48a7efb6b72325e0138ba6c318f04fc5c9 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-2be76362af215af6842e884abd5246dd9b50c283
+93278680b4e7086c0bec11a58bc3533f9971c08e