ci-images: install diffutils prior to building images

Ensure the podman image used for generating Samba CI images includes
'diff' utility

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Jun  9 23:48:42 UTC 2022 on sn-devel-184

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 4bfa2f2ea04eff62db14bfbc05a2023d0d26d90e..ff8780128bda770613bd404a67cc05855bb72e54 100644 (file)
--- 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 053dd17f9e27ef7e147cc5fe94d4aa2e360e04ef..626e0103410dd444c187952daf575f497368d595 100644 (file)
--- 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 e862191aa72a44e9df56b1e232f59866603cc8d1..0a3797326be551fc78966d2e2308bb96f2d0ed84 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a9f12c7712cfccf1bf957d6976dc87917524b55e
+34eff4df0b3dbbfabcd74d5c50c357a6faa280d5