bootstrap: use runners with 'docker' and 'gce' tags for the image creation

As we currently have the 'shared' tag on our private runners, they
maybe selected for image creation, but it fails there.

A lot of shared runners provide 'docker' and 'gce' and they are able to
generate the images.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bd083cb63efff0cc1f9b7e7177c1209894cf651..bbc2aa8e4867b0c82b908aef50bc413645db6f6d 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: 187702e2a9c65f874aa13e5eb1c8b68703e72299
+  SAMBA_CI_CONTAINER_TAG: 8a3bbedea9514a337ed39d8c4e88abb17c43f975
   #
   # 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 865d93485a88bd164782199d0b4df636698c2544..3a012ed8cec4b83b872b6f8d21ef1c75ad5216bf 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -6,7 +6,7 @@ services:
   stage: images
   tags:
     - docker
-    - shared
+    - gce
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
   before_script:

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b220ebdde0c904bb2f8d100a85f2afb0abf8a85f..cb06770697456d4282ed299c2515a770a57b406f 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-187702e2a9c65f874aa13e5eb1c8b68703e72299
+8a3bbedea9514a337ed39d8c4e88abb17c43f975