From: Andreas Schneider <asn@samba.org>
Date: Thu, 6 Jun 2024 12:41:02 +0000 (+0200)
Subject: bootstrap: Fix runner tags
X-Git-Tag: samba-4.19.8~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=179168442a4690090e8de87907337eb371a345be;p=thirdparty%2Fsamba.git

bootstrap: Fix runner tags

See https://docs.gitlab.com/ee/ci/runners/hosted_runners/linux.html

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15660

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 84fb5cc8451c0af354850f39ae6debf388849ebb)
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 525a29a368b..b2ed3ff3e52 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 190a74ee9628f298961d890ba37fcc7d213daae2
+  SAMBA_CI_CONTAINER_TAG: 1aff21a9f4400ec247a5ad8b9fcaf1c6c7067fff
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 71c68d9ee14..0650a6452a2 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -6,9 +6,7 @@
     # 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
+    - saas-linux-small-amd64
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
     SAMBA_CI_TEST_JOB: "samba-o3"
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 11ab035f572..d76150f879a 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-190a74ee9628f298961d890ba37fcc7d213daae2
+1aff21a9f4400ec247a5ad8b9fcaf1c6c7067fff