.gitlab-ci.yml: add docker tag back for private jobs

[samba.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82d8859e30da6a9513eaa7d5646b381d553bd0d1..8b9d0cb69bebb8aa2fcf76dd971fb91f79342da0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,10 @@ 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: 2be76362af215af6842e884abd5246dd9b50c283
+  # We use the ubuntu1804 image as default as
+  # it matches what we have on sn-devel-184.
+  SAMBA_CI_CONTAINER_IMAGE: ubuntu1804
   #
   # The following images are available
   # Please see the samba-o3 sections at the end of this file!
@@ -27,7 +30,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}
@@ -40,9 +42,7 @@ include:
 .shared_template:
   variables:
     AUTOBUILD_JOB_NAME: $CI_JOB_NAME
-  # We use the ubuntu1804 image as default as
-  # it matches what we have on sn-devel-184.
-  image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804
+  image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-${SAMBA_CI_CONTAINER_IMAGE}:${SAMBA_CI_CONTAINER_TAG}
   stage: build
   tags:
     - docker
@@ -75,7 +75,6 @@ include:
       - "*.stdout"
       - "*.stderr"
       - system-info.txt
-      - /tmp/samba-testbase/*/*/bin/config.log
   retry:
     max: 2
     when:
@@ -155,7 +154,6 @@ samba-ad-dc-ntvfs:
   extends: .shared_template
   tags:
     - docker
-    - private
     - samba-ci-private
   only:
     variables:
@@ -194,10 +192,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