bootstrap/.gitlab-ci.yml: make sure we force gitlab.com runners for now

We've just added our own runners with 'docker' and 'gce'.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 731f8c6dc366fbf6e9077cc93b9fb46128677d70..ccda2077a4df99f1f1fc57f10a47d8e60f25f219 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -44,7 +44,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: c4c00eb35cae36d8d6e752ee01fd943432993721
+  SAMBA_CI_CONTAINER_TAG: f25e1fa0a828f428ade0e4f37d8a646ff1e207d4
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 5f79ac1fbf280fd8a4c79f569cdd31e3a5290f46..1a8376daa4c403726d9ebfc60efb4aa1a5f37bd7 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -5,8 +5,12 @@ services:
   image: docker:latest
   stage: images
   tags:
+    # We need to make sure we only use gitlab.com
+    # runners and not our own runners, as our current runners
+    # don't allow 'docker build ...' to run.
     - docker
     - gce
+    - shared
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
     SAMBA_CI_TEST_JOB: "samba-o3"

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 3e87c2ed1b0e29a34383e86b1a61d1f3026b93cb..af96c13b35e1efbb494b3efe269d2dc82b1e2995 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-c4c00eb35cae36d8d6e752ee01fd943432993721
+f25e1fa0a828f428ade0e4f37d8a646ff1e207d4