[ci-images] remove use of sudo in image building smoke test

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Uri Simchoni <uri@samba.org>
Autobuild-Date(master): Wed May 25 20:50:25 UTC 2022 on sn-devel-184

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 847e5f87837139e6e176c541bf47d1c6cea63ae4..4bfa2f2ea04eff62db14bfbc05a2023d0d26d90e 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: eab8114276d8a3062f1f1b19e6906173b4eeeb7a
+  SAMBA_CI_CONTAINER_TAG: a9f12c7712cfccf1bf957d6976dc87917524b55e
   #
   # 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 46b0969e1ce18c68e673f8803de8f8bd6c6d028d..053dd17f9e27ef7e147cc5fe94d4aa2e360e04ef 100644 (file)
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -44,8 +44,8 @@
         bootstrap/template.py --sha1sum > /tmp/sha1sum-template.txt
     diff -u bootstrap/sha1sum.txt /tmp/sha1sum-template.txt
     # run smoke test with samba-o3 or samba-fuzz
-    podman run --volume $(pwd):${samba_repo_root} --workdir ${samba_repo_root} ${ci_image_name} \
-        /bin/bash -c "sudo chown -R samba:samba ${samba_repo_root} && export PKG_CONFIG_PATH=/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig && script/autobuild.py ${SAMBA_CI_TEST_JOB} --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
+    podman run --volume $(pwd):/src:ro ${ci_image_name} \
+        /bin/bash -c "git clone /src samba && cd samba && export PKG_CONFIG_PATH=/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig && script/autobuild.py ${SAMBA_CI_TEST_JOB} --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
     podman tag ${ci_image_name} ${ci_image_path}:${SAMBA_CI_CONTAINER_TAG}
     podman tag ${ci_image_name} ${ci_image_path}:${timestamp_tag}
     # We build all images, but only upload is it's not marked as broken

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 0bf21dce1e6f7f2f1aa16ffdb15223b288f0ca39..e862191aa72a44e9df56b1e232f59866603cc8d1 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-eab8114276d8a3062f1f1b19e6906173b4eeeb7a
+a9f12c7712cfccf1bf957d6976dc87917524b55e