autobuild: Run the none env in the samba-o3 build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00ffff202d922315aef2e06c13e86377d9b037e9..6114ccced99ce70871ee9a71a30aa0cc0a910b91 100644 (file)
--- 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: cd4cebb9c611fb98f3a21171dd4832df930add28
+  SAMBA_CI_CONTAINER_TAG: 2b0275df23424240774afcd61fae8abed8663996
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -119,9 +119,6 @@ samba:
 samba-mitkrb5:
   extends: .shared_template
 
-samba-none-env:
-  extends: .shared_template
-
 samba-nopython:
   extends: .shared_template
 
@@ -221,7 +218,6 @@ pages:
     - others
     - samba
     - samba-mitkrb5
-    - samba-none-env
     - samba-nopython
     - samba-nopython-py2
     - samba-xc
@@ -277,14 +273,6 @@ ubuntu1804-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804
 
-ubuntu1604-samba-o3:
-  extends: .samba-o3-template
-  image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1604
-
-debian9-samba-o3:
-  extends: .samba-o3-template
-  image: $SAMBA_CI_CONTAINER_IMAGE_debian9
-
 debian10-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_debian10