Skip to content

Commit

Permalink
Remove use of git in tests
Browse files Browse the repository at this point in the history
This is doing deep clones which takes forever. also the zypper installs
prevent us from going with leaner base containers.
  • Loading branch information
dirkmueller committed Oct 2, 2024
1 parent 50a0467 commit 16474eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 1 addition & 5 deletions tests/test_kiwi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions tests/test_postfix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/ && \
Expand Down

0 comments on commit 16474eb

Please sign in to comment.