gitlab-ci: Install compat-gnutls34 on CentOS7

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 313ae01fa690f674ec756288a589d8d5cc795cd0..734d5152c00004ddba2372d101637e859af23873 100644 (file)
--- 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: 339a70ba1881feec94109c5c4eafacf4ff6c43bc
+  SAMBA_CI_CONTAINER_TAG: e4c3da88c459ae1a97c1c5e41f52b17d688d295f
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -268,6 +268,8 @@ centos7-samba-o3:
   variables:
     # Git on CentOS doesn't support shallow git cloning
     GIT_DEPTH: ""
+    # We need a newer GnuTLS version on CentOS7
+    PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
 
 fedora29-samba-o3:
   extends: .samba-o3-template

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 8bec8cc4e2035a50e4bb3d1eb7cc0d80a6c6484a..8254986d2dcc21552c5d79942158abb4829cd80a 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -41,7 +41,7 @@ services:
     diff -u bootstrap/sha1sum.txt /tmp/sha1sum-template.txt
     # run smoke test with samba-o3
     docker run --volume $(pwd):${samba_repo_root} --workdir ${samba_repo_root} ${ci_image_name} \
-        /bin/bash -c "sudo chown -R samba:samba ./** && script/autobuild.py samba-o3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
+        /bin/bash -c "sudo chown -R samba:samba ./** && export PKG_CONFIG_PATH=/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig && script/autobuild.py samba-o3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
     docker tag ${ci_image_name} ${ci_image_path}:${SAMBA_CI_CONTAINER_TAG}
     docker tag ${ci_image_name} ${ci_image_path}:${timestamp_tag}
     # We build all images, but only upload is it's not marked as broken
@@ -114,6 +114,8 @@ centos7:
   variables:
     # Shallow copies are not supported by git on CentOS7
     GIT_DEPTH: ""
+    # 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

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 9126961fc9354c6e82736c9c672dac4b30dddb77..f4acdf5d92550496cfda3199230eb12b53f2956d 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -214,6 +214,8 @@ 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 \
@@ -478,6 +480,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'glusterfs-devel': '',
             'libcephfs-devel': '',
+            'gnutls-devel': 'compat-gnutls34-devel',
         }
     },
     'fedora28': {

diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 6d60bd2cdc9afb3ea3c9b9cae59108d8ba59672f..441eba7918e4c8d523401f1fa8880d248e3bf1c7 100755 (executable)
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -9,6 +9,8 @@ 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 \

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index b59ef6a5dcf2ac986db65d80f57bd338038c46e2..c74cdd470d094eaea11cfa0d261973517253ca6d 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -9,6 +9,8 @@ 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 \
@@ -20,6 +22,7 @@ yum install -y \
     bind-utils \
     binutils \
     bison \
+    compat-gnutls34-devel \
     cups-devel \
     curl \
     dbus-devel \
@@ -32,7 +35,6 @@ yum install -y \
     git \
     glib2-devel \
     glibc-common \
-    gnutls-devel \
     gpgme-devel \
     gzip \
     hostname \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 7a106d8dfd591d22ce714199ff6e9f154bacf680..9623698b9ffe61dac6cd42bf14aa63031cbc9bd7 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -8,6 +8,7 @@ packages:
   - bind-utils
   - binutils
   - bison
+  - compat-gnutls34-devel
   - cups-devel
   - curl
   - dbus-devel
@@ -20,7 +21,6 @@ packages:
   - git
   - glib2-devel
   - glibc-common
-  - gnutls-devel
   - gpgme-devel
   - gzip
   - hostname

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 52cf7350bc0dd7df46d456e2d0d484f738bcd875..f4d7219402e639d5bb83b4f9594c3062e7681d97 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-339a70ba1881feec94109c5c4eafacf4ff6c43bc
+e4c3da88c459ae1a97c1c5e41f52b17d688d295f