summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2020-03-17 16:49:02 +1300
committerAndrew Bartlett <abartlet@samba.org>2020-03-19 20:46:42 +0000
commite10910f8de542b0be9b89942791bd37288b7a32a (patch)
treeab9cd5d9231bd9134d5d74c828b378dbd977054c /.gitlab-ci.yml
parentee5c07cb0f1c85a56a3f330a692b1b04553213cc (diff)
downloadsamba-e10910f8de542b0be9b89942791bd37288b7a32a.tar.gz
bootstrap: Bring back a Ubuntu 16.04 build but just for the samba-fuzz task
This is needed to restore oss-fuzz support, as this uses the Ubuntu 16.04 package list because all the docker images provided start with a Ubuntu 16.04 base. REF: https://github.com/google/oss-fuzz/issues/3505 REF: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=21189 Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6114ccced99..05f410bde3d 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: 2b0275df23424240774afcd61fae8abed8663996
+ SAMBA_CI_CONTAINER_TAG: 6bb2eeaf8203467d9a93a722071b0f081027410e
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -154,6 +154,7 @@ samba-static:
samba-fuzz:
extends: .shared_template
+ image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG}
ctdb:
extends: .shared_template