diff options
| -rw-r--r-- | .gitlab-ci-main.yml | 2 | ||||
| -rw-r--r-- | bootstrap/.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | bootstrap/sha1sum.txt | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 731f8c6dc36..ccda2077a4d 100644 --- 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 5f79ac1fbf2..1a8376daa4c 100644 --- 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 3e87c2ed1b0..af96c13b35e 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -c4c00eb35cae36d8d6e752ee01fd943432993721 +f25e1fa0a828f428ade0e4f37d8a646ff1e207d4 |