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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82d8859e30da6a9513eaa7d5646b381d553bd0d1..fbb1e173c06112ec8d785f7a68e9cc9597110d48 100644 (file)
--- 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

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 515b6ac66db822f74b22aaed129526d3adcf4344..ac2557719538ad762c348c6f3d6c6073ad7e4772 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -89,7 +89,7 @@ ubuntu1604:
   extends: .build_image_template
 
 ubuntu1404:
-  extends: .build_image_template
+  extends: .build_image_template_force_broken
 
 debian9:
   extends: .build_image_template

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 648f1cc97480fee4e485409322a4bee70e32c43c..aa874cf24eb658c0ed1b35ba92e6b84d4fd20fa5 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-735b9b509e6928bc71fe4442798e4fe110a98788
+14f5cb79a0fbeef9378506ecdc6881d8042736c9