Skip to content

Commit 2094895

Browse files
committed
ci: Drop unnecessary -ti from podman run invocations
Especially the `-t` forces as pty allocation which causes bad rendering for things like progress bars in the github actions flow. Signed-off-by: Colin Walters <[email protected]>
1 parent dcd42f7 commit 2094895

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
- name: Install
112112
run: sudo tar -C / -xvf bootc.tar.zst
113113
- name: Integration tests
114-
run: sudo podman run --rm -ti --privileged -v /run/systemd:/run/systemd -v /:/run/host -v /usr/bin/bootc:/usr/bin/bootc --pid=host quay.io/fedora/fedora-coreos:testing-devel bootc internal-tests run-privileged-integration
114+
run: sudo podman run --rm --privileged -v /run/systemd:/run/systemd -v /:/run/host -v /usr/bin/bootc:/usr/bin/bootc --pid=host quay.io/fedora/fedora-coreos:testing-devel bootc internal-tests run-privileged-integration
115115
container-tests:
116116
if: ${{ !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
117117
name: "Container testing"
@@ -146,7 +146,7 @@ jobs:
146146
set -xeuo pipefail
147147
image=quay.io/centos-bootc/centos-bootc-dev:stream9
148148
echo 'ssh-ed25519 ABC0123 [email protected]' > test_authorized_keys
149-
sudo podman run --rm -ti --privileged -v ./test_authorized_keys:/test_authorized_keys --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
149+
sudo podman run --rm --privileged -v ./test_authorized_keys:/test_authorized_keys --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
150150
${image} bootc install to-filesystem --acknowledge-destructive \
151151
--karg=foo=bar --disable-selinux --replace=alongside --root-ssh-authorized-keys=/test_authorized_keys /target
152152
ls -al /boot/loader/
@@ -155,9 +155,9 @@ jobs:
155155
# TODO fix https://github.com/containers/bootc/pull/137
156156
sudo chattr -i /ostree/deploy/default/deploy/*
157157
sudo rm /ostree/deploy/default -rf
158-
sudo podman run --rm -ti --privileged --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
158+
sudo podman run --rm --privileged --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
159159
${image} bootc install to-existing-root --acknowledge-destructive
160-
sudo podman run --rm -ti --privileged -v /:/target -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable ${image} bootc internal-tests verify-selinux /target/ostree --warn
160+
sudo podman run --rm --privileged -v /:/target -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable ${image} bootc internal-tests verify-selinux /target/ostree --warn
161161
install-to-existing-root:
162162
if: ${{ !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
163163
name: "Test install-to-existing-root"
@@ -177,7 +177,7 @@ jobs:
177177
# so we bind mount an empty directory over /usr/lib/bootc/install.
178178
empty=$(mktemp -d)
179179
image=quay.io/centos-bootc/centos-bootc-dev:stream9
180-
sudo podman run --rm -ti --privileged --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc -v ${empty}:/usr/lib/bootc/install --pid=host --security-opt label=disable \
180+
sudo podman run --rm --privileged --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc -v ${empty}:/usr/lib/bootc/install --pid=host --security-opt label=disable \
181181
${image} bootc install to-existing-root
182182
install-to-loopback:
183183
if: ${{ !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
@@ -197,5 +197,5 @@ jobs:
197197
image=quay.io/centos-bootc/centos-bootc-dev:stream9
198198
tmpdisk=$(mktemp -p /var/tmp)
199199
truncate -s 20G ${tmpdisk}
200-
sudo podman run --rm -ti --privileged --env RUST_LOG=debug -v /dev:/dev -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
200+
sudo podman run --rm --privileged --env RUST_LOG=debug -v /dev:/dev -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
201201
-v ${tmpdisk}:/disk ${image} bootc install to-disk --via-loopback /disk

tests/kolainst/install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
2929
COPY usr usr
3030
EOF
3131
podman build -t localhost/testimage .
32-
podman run --rm -ti --privileged --pid=host --env RUST_LOG=error,bootc_lib::install=debug \
32+
podman run --rm --privileged --pid=host --env RUST_LOG=error,bootc_lib::install=debug \
3333
localhost/testimage bootc install to-disk --skip-fetch-check --karg=foo=bar ${DEV}
3434
# In theory we could e.g. wipe the bootloader setup on the primary disk, then reboot;
3535
# but for now let's just sanity test that the install command executes.

0 commit comments

Comments
 (0)