From 1f50fa76147280ce13a3ee78339ad203a540e9ce Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 3 Dec 2024 13:32:22 +0100 Subject: [PATCH 1/4] test: Add CentOS 9 image mode See https://gitlab.com/testing-farm/general/-/blob/main/rfd/rfd5-testing-image-mode.adoc https://issues.redhat.com/browse/COCKPIT-1213 --- packit.yaml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/packit.yaml b/packit.yaml index fd73bc8bb..d43769036 100644 --- a/packit.yaml +++ b/packit.yaml @@ -19,24 +19,13 @@ jobs: - job: copr_build trigger: pull_request targets: - - fedora-40 - - fedora-41 - - fedora-latest-aarch64 - - fedora-development - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - - centos-stream-10 - job: tests trigger: pull_request targets: - - fedora-40 - - fedora-41 - - fedora-latest-aarch64 - - fedora-development - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - - centos-stream-10 + centos-stream-9-x86_64: + distros: ["centos-stream-9", "CentOS-Stream-9-image-mode"] - job: copr_build trigger: release From bb64d07e7e5577f7985d9ff907ab9de4a4e01776 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 5 Dec 2024 09:40:56 +0100 Subject: [PATCH 2/4] try to disable tmt artifacts --- packit.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packit.yaml b/packit.yaml index d43769036..adb016922 100644 --- a/packit.yaml +++ b/packit.yaml @@ -26,6 +26,9 @@ jobs: targets: centos-stream-9-x86_64: distros: ["centos-stream-9", "CentOS-Stream-9-image-mode"] + tf_extra_params: + environments: + - artifacts: [] - job: copr_build trigger: release From 9d1a6b9d5cb92a9ca7560f4c29a0863a272839c4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 5 Dec 2024 10:36:31 +0100 Subject: [PATCH 3/4] Install test deps programmatically --- test/browser/browser.sh | 49 ++++++++++++++++++++++++++++------------- test/browser/main.fmf | 11 ++++----- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/test/browser/browser.sh b/test/browser/browser.sh index 9796f12b9..6f1be55ea 100755 --- a/test/browser/browser.sh +++ b/test/browser/browser.sh @@ -3,21 +3,40 @@ set -eux cd "${0%/*}/../.." -# HACK: ensure that critical components are up to date: https://github.com/psss/tmt/issues/682 -dnf update -y podman crun conmon criu - -# Missing iptables-nft dependency https://issues.redhat.com/browse/RHEL-58240 and -# https://bugzilla.redhat.com/show_bug.cgi?id=2319310 -if grep -Eq 'platform:(el10|f41)' /etc/os-release; then - dnf install -y iptables-nft -fi - -# if we run during cross-project testing against our main-builds COPR, then let that win -# even if Fedora has a newer revision -main_builds_repo="$(ls /etc/yum.repos.d/*cockpit*main-builds* 2>/dev/null || true)" -if [ -n "$main_builds_repo" ]; then - echo 'priority=0' >> "$main_builds_repo" - dnf distro-sync -y --repo 'copr*' cockpit-podman +# install dependencies programmatically due to https://issues.redhat.com/browse/TFT-3020 +TEST_DEPS="systemd-container cockpit-podman cockpit-ws cockpit-system criu nginx" + +if [ "${TMT_REBOOT_COUNT:-0}" -eq 0 ]; then + if bootc status | grep -q version; then + # redeploy ourselves with required test dependencies + # TODO: get correct c-podman version; https://packit.dev/docs/configuration/upstream/tests#optional-parameters + cat > Containerfile <> "$main_builds_repo" + dnf distro-sync -y --repo 'copr*' cockpit-podman + fi + fi fi # Show critical package versions diff --git a/test/browser/main.fmf b/test/browser/main.fmf index b00e9df4b..f62291c4a 100644 --- a/test/browser/main.fmf +++ b/test/browser/main.fmf @@ -1,10 +1,7 @@ -require: - - systemd-container - - cockpit-podman - - cockpit-ws - - cockpit-system - - criu - - nginx +# TF/tmt don't handle this with bootc: https://issues.redhat.com/browse/TFT-3020 +# done programmatically in test/browser/browser.sh +# require: + duration: 30m /system: From c8bb9709c5e3cef36d79d8f48b363be85c024465 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 5 Dec 2024 11:13:43 +0100 Subject: [PATCH 4/4] HACK: install cockpit 330 For fixing https://github.com/cockpit-project/cockpit/issues/21201 --- test/browser/browser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/browser/browser.sh b/test/browser/browser.sh index 6f1be55ea..d34f7106a 100755 --- a/test/browser/browser.sh +++ b/test/browser/browser.sh @@ -12,7 +12,7 @@ if [ "${TMT_REBOOT_COUNT:-0}" -eq 0 ]; then # TODO: get correct c-podman version; https://packit.dev/docs/configuration/upstream/tests#optional-parameters cat > Containerfile <