diff --git a/.packit.yaml b/.packit.yaml index 8349a5b42..e3cdfd567 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -30,13 +30,21 @@ actions: - bash -c "ls -al contrib/packaging/" jobs: + # Only add CS10 and RHEL-9 RPM build test + # But no e2e test on CS10 and RHEL-9 - job: copr_build trigger: pull_request targets: - centos-stream-9-x86_64 - centos-stream-9-aarch64 + - centos-stream-10-aarch64 + - centos-stream-10-x86_64 - fedora-40-x86_64 - fedora-40-aarch64 + - fedora-41-x86_64 + - fedora-41-aarch64 + - rhel-9-x86_64 + - rhel-9-aarch64 - job: tests trigger: pull_request @@ -53,7 +61,7 @@ jobs: - centos-stream-9-x86_64 - centos-stream-9-aarch64 - fedora-40-x86_64 - - fedora-40-aarch64 + - fedora-41-aarch64 tmt_plan: /to-existing-root identifier: e2e-test-to-existing-root @@ -62,7 +70,7 @@ jobs: targets: - centos-stream-9-x86_64 - centos-stream-9-aarch64 - - fedora-40-x86_64 - fedora-40-aarch64 + - fedora-41-x86_64 tmt_plan: /to-disk identifier: e2e-test-to-disk diff --git a/plans/e2e.fmf b/plans/e2e.fmf index 96e16d174..587b5a54c 100644 --- a/plans/e2e.fmf +++ b/plans/e2e.fmf @@ -1,7 +1,7 @@ discover: how: fmf test: e2e -adjust+: +adjust: - when: arch == x86_64 or arch == aarch64 provision: hardware: diff --git a/tests/e2e/bootc-install.sh b/tests/e2e/bootc-install.sh index de2be34af..dfdcbfbc3 100755 --- a/tests/e2e/bootc-install.sh +++ b/tests/e2e/bootc-install.sh @@ -77,7 +77,7 @@ sudo cp "${TEMPDIR}/domain.crt" "/etc/pki/ca-trust/source/anchors/${REGISTRY_IP} sudo update-ca-trust greenprint "Deploy local registry" -podman run \ +sudo podman run \ -d \ --name registry \ --replace \ @@ -87,7 +87,7 @@ podman run \ -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \ -e REGISTRY_HTTP_TLS_KEY=/certs/domain.key \ quay.io/bootc-test/registry:2.8.3 -podman ps -a +sudo podman ps -a # Test image URL TEST_IMAGE_NAME="bootc-workflow-test" @@ -136,10 +136,10 @@ cat "$INSTALL_CONTAINERFILE" # Build test bootc image and push to local registry greenprint "Build $TEST_OS installation container image" -podman build --tls-verify=false --retry=5 --retry-delay=10 -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$INSTALL_CONTAINERFILE" "$TEMPDIR" +sudo podman build --tls-verify=false --retry=5 --retry-delay=10 -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$INSTALL_CONTAINERFILE" "$TEMPDIR" greenprint "Push $TEST_OS installation container image" -retry podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL" +retry sudo podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL" # Prepare Ansible inventory file and ansible.cfg greenprint "Prepare inventory file" @@ -251,10 +251,10 @@ EOF # Build upgrade container image and push to locay registry greenprint "Build $TEST_OS upgrade container image" -podman build --tls-verify=false --retry=5 --retry-delay=10 -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$UPGRADE_CONTAINERFILE" . +sudo podman build --tls-verify=false --retry=5 --retry-delay=10 -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$UPGRADE_CONTAINERFILE" . greenprint "Push $TEST_OS upgrade container image" -retry podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL" +retry sudo podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL" # Copy upgrade image to local folder for bootc switch test if [[ "$AIR_GAPPED_DIR" != "" ]]; then diff --git a/tests/e2e/playbooks/templates/user-data.j2 b/tests/e2e/playbooks/templates/user-data.j2 index defcc84e1..ec086235a 100644 --- a/tests/e2e/playbooks/templates/user-data.j2 +++ b/tests/e2e/playbooks/templates/user-data.j2 @@ -7,6 +7,11 @@ users: lock_passwd: true ssh_authorized_keys: - {{ lookup('ansible.builtin.file', ssh_key_pub) }} + +# install with --cloud-init always shutdown vm on the first reboot +# https://github.com/virt-manager/virt-manager/issues/497 +# workaround is shutdown vm in cloud-init when cloud-init finished +# then start vm power_state: delay: now mode: poweroff