summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci-main.yml2
-rw-r--r--bootstrap/.gitlab-ci.yml2
-rw-r--r--bootstrap/sha1sum.txt2
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 4bfa2f2ea04..ff8780128bd 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: a9f12c7712cfccf1bf957d6976dc87917524b55e
+ SAMBA_CI_CONTAINER_TAG: 34eff4df0b3dbbfabcd74d5c50c357a6faa280d5
#
# 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 053dd17f9e2..626e0103410 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -13,6 +13,8 @@
SAMBA_CI_IS_BROKEN_IMAGE: "no"
SAMBA_CI_TEST_JOB: "samba-o3"
before_script:
+ # install prerequisites
+ - dnf install -qy diffutils
# Ensure we are generating correct the container
- uname -a
- cat /etc/os-release
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index e862191aa72..0a3797326be 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a9f12c7712cfccf1bf957d6976dc87917524b55e
+34eff4df0b3dbbfabcd74d5c50c357a6faa280d5