summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2019-04-25 08:05:56 +0200
committerAndreas Schneider <asn@cryptomilk.org>2019-04-25 16:52:57 +0000
commitb50ca162733b097cd16d346525dde2e1fef2d656 (patch)
tree5c5ca93862991716924d4f07064d158d10842cfb /.gitlab-ci.yml
parentb1426d0657c1c550d368fb35406e57f7bc58995d (diff)
downloadsamba-b50ca162733b097cd16d346525dde2e1fef2d656.tar.gz
gitlab-ci: Remove Ubuntu 14.04
Ubuntu 14.04 a compiler which complains about valid C99 code and also it doesn't offer GnuTLS >= 3.2 which we require to move to GnuTLS. Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Thu Apr 25 16:52:57 UTC 2019 on sn-devel-184
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82d8859e30d..fbb1e173c06 100644
--- 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: 735b9b509e6928bc71fe4442798e4fe110a98788
+ SAMBA_CI_CONTAINER_TAG: 14f5cb79a0fbeef9378506ecdc6881d8042736c9
#
# The following images are available
# Please see the samba-o3 sections at the end of this file!
@@ -27,7 +27,6 @@ variables:
#
SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1804:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_ubuntu1604: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG}
- SAMBA_CI_CONTAINER_IMAGE_ubuntu1404: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1404:${SAMBA_CI_CONTAINER_TAG}
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}
@@ -194,10 +193,6 @@ ubuntu1604-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1604
-ubuntu1404-samba-o3:
- extends: .samba-o3-template
- image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1404
-
debian9-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_debian9