bootstrap: We can only build docker images on gitlab shared runners

Our rackspace runners don't provide a running docker.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77b7406f4a6c23f213ee0fac1400cc2288bcc02e..101c509a5ae6dc2844496cf43fa0d3a3b966808a 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: 8cfc53988524dd9a32ed64bfdfcd623631cc8398
+  SAMBA_CI_CONTAINER_TAG: b2e8ad4e8057ddc87386ef5ac7cd8599f04d7a57
   #
   # 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 8254986d2dcc21552c5d79942158abb4829cd80a..9f29e7f69db2cdfd9e598d4941458970bd9acf56 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -6,6 +6,7 @@ services:
   stage: images
   tags:
     - docker
+    - shared
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
   before_script:

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 09b0d25ece3a982ba0c7378263f68c358f89f761..39995d695d3b73b4119958c4670ec149a4a16761 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-8cfc53988524dd9a32ed64bfdfcd623631cc8398
+b2e8ad4e8057ddc87386ef5ac7cd8599f04d7a57