diff options
| author | Andreas Schneider <asn@samba.org> | 2019-08-08 08:18:55 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-08-10 19:24:29 +0000 |
| commit | 5eb4d705396faa5e5de90aaa86f7115b0f005589 (patch) | |
| tree | c4bd69516a497a19df5ab0e48e8d66486ef6dd52 /bootstrap/.gitlab-ci.yml | |
| parent | b81cb04d03d57b8175d862ba48ac476fedf23636 (diff) | |
| download | samba-5eb4d705396faa5e5de90aaa86f7115b0f005589.tar.gz | |
gitlab-ci: Install compat-gnutls34 on CentOS7
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'bootstrap/.gitlab-ci.yml')
| -rw-r--r-- | bootstrap/.gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 8bec8cc4e20..8254986d2dc 100644 --- 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 |