Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixup curl change #610

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Fixup curl change #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions tests/test_kiwi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions tests/test_postfix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading