From 7dc3a8ba9e6aabb3c981adf6b1c38340ca6d1e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Mon, 7 Oct 2024 15:30:06 +0200 Subject: [PATCH] Fixup missing fixes after the removal of git clone in 16474ebb08f37f43ea379ea2142f0c0a3a1f377f --- tests/test_kiwi.py | 7 +++---- tests/test_postfix.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/test_kiwi.py b/tests/test_kiwi.py index a029952a..e9f76b8c 100644 --- a/tests/test_kiwi.py +++ b/tests/test_kiwi.py @@ -18,8 +18,7 @@ KIWI_CONTAINER_EXTENDED = [] CONTAINERFILE_KIWI_EXTENDED = """ -RUN set -euo pipefail; \ - curl -Lsf -o - https://github.com/OSInside/kiwi/archive/refs/heads/master.tar.gz | tar xzf - +RUN curl -Lsf -o - https://github.com/OSInside/kiwi/archive/refs/heads/master.tar.gz | tar --no-same-permissions --no-same-owner -xzf - | true """ for kiwi_ctr in KIWI_CONTAINERS: @@ -72,9 +71,9 @@ def test_kiwi_create_image( in container_per_test.connection.check_output("kiwi-ng --version") ) - assert container_per_test.connection.file("kiwi/build-tests").exists + assert container_per_test.connection.file("kiwi-main/build-tests").exists - kiwi_cmd = "kiwi-ng system build --description kiwi/build-tests/x86/leap/test-image-disk --set-repo obs://openSUSE:Leap:15.5/standard --target-dir /tmp/myimage" + kiwi_cmd = "kiwi-ng system build --description kiwi-main/build-tests/x86/leap/test-image-disk --set-repo obs://openSUSE:Leap:15.5/standard --target-dir /tmp/myimage" res = container_per_test.connection.run_expect([0, 1], kiwi_cmd) if res.rc == 1 and selinux_status() == "enforcing": pytest.xfail( diff --git a/tests/test_postfix.py b/tests/test_postfix.py index 1e9c6f04..aa439d18 100644 --- a/tests/test_postfix.py +++ b/tests/test_postfix.py @@ -34,8 +34,8 @@ rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} # TODO: move postfix & openldap container files to bci-dockerfile-generator -RUN curl -Lsf -o - https://github.com/thkukuk/containers-mailserver/archive/refs/heads/master.tar.gz | tar xzf - \ - cd containers-mailserver/openldap && \ +RUN curl -Lsf -o - https://github.com/thkukuk/containers-mailserver/archive/refs/heads/master.tar.gz | tar --no-same-permissions --no-same-owner -xzf - && \ + cd containers-mailserver-master/openldap && \ cp -r ldif /entrypoint/ && \ cp slapd.init.ldif /entrypoint/ && \ cp entrypoint.sh /entrypoint/openldap-entrypoint.sh