Merge pull request #606 from SUSE/postfix_no_git

Remove use of git in tests
SUSE · Oct 5, 2024 · 997b842 · 997b842
2 parents 50a0467 + 16474eb
commit 997b842
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/tests/test_kiwi.py b/tests/test_kiwi.py
@@ -19,11 +19,7 @@
 
 CONTAINERFILE_KIWI_EXTENDED = """
 RUN set -euo pipefail; \
-zypper -n in --no-recommends git-core; \
-zypper -n clean; \
-rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
-
-RUN git clone https://github.com/OSInside/kiwi
+    curl -Lsf -o - https://github.com/OSInside/kiwi/archive/refs/heads/master.tar.gz | tar xzf -
 """
 
 for kiwi_ctr in KIWI_CONTAINERS:

diff --git a/tests/test_postfix.py b/tests/test_postfix.py
@@ -29,12 +29,12 @@
 
 CONTAINERFILE_POSTFIX_WITH_LDAP_ENABLED = """
 RUN set -euo pipefail; \
-zypper -n in --no-recommends git find openldap2 openldap2-client; \
+zypper -n in --no-recommends find openldap2 openldap2-client; \
 zypper -n clean; \
 rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # TODO: move postfix & openldap container files to bci-dockerfile-generator
-RUN git clone https://github.com/thkukuk/containers-mailserver.git && \
+RUN curl -Lsf -o - https://github.com/thkukuk/containers-mailserver/archive/refs/heads/master.tar.gz | tar xzf - \
     cd containers-mailserver/openldap && \
     cp -r ldif /entrypoint/ && \
     cp slapd.init.ldif /entrypoint/ && \