sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

gitlab-ci: Install compat-gnutls34 on CentOS7

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2019-08-08 08:18:55 +02:00 committed by Andrew Bartlett
parent b81cb04d03
commit 5eb4d70539
7 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -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

4
bootstrap/.gitlab-ci.yml
View File

@ -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

3
bootstrap/config.py
View File

@ -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': {

2
bootstrap/generated-dists/centos6/bootstrap.sh
View File

@ -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 \

4
bootstrap/generated-dists/centos7/bootstrap.sh
View File

@ -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 \

2
bootstrap/generated-dists/centos7/packages.yml
View File

@ -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

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
339a70ba1881feec94109c5c4eafacf4ff6c43bc
e4c3da88c459ae1a97c1c5e41f52b17d688d295f