From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 4 Dec 2019 18:52:56 +0000 (+0100)
Subject: bootstrap: use runners with 'docker' and 'gce' tags for the image creation
X-Git-Tag: ldb-2.1.0~437
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41f6248effa5f5c0606a13da289c8a77abb30bce;p=thirdparty%2Fsamba.git

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 9bd083cb63e..bbc2aa8e486 100644
--- 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 865d93485a8..3a012ed8cec 100644
--- 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 b220ebdde0c..cb067706974 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-187702e2a9c65f874aa13e5eb1c8b68703e72299
+8a3bbedea9514a337ed39d8c4e88abb17c43f975