diff --git a/Schutzfile b/Schutzfile index ef342ee72..5743b531b 100644 --- a/Schutzfile +++ b/Schutzfile @@ -46,14 +46,14 @@ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-20230223" } ], "aarch64": [ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-20230223" } ] }, @@ -63,14 +63,14 @@ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-modular-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-x86_64-updates-released-modular-20230223" } ], "aarch64": [ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-modular-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-updates-released-modular-20230223" } ] } @@ -123,14 +123,14 @@ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-20221124" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-20230223" } ], "aarch64": [ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-20221124" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-20230223" } ] }, @@ -140,14 +140,14 @@ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-modular-20221124" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-modular-20230223" } ], "aarch64": [ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-modular-20221124" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-modular-20230223" } ] } @@ -187,34 +187,34 @@ { "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20230223" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20230223" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.8-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.8-20230223" } ], "aarch64": [ { "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.8-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.8-20230223" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.8-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.8-20230223" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.8-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.8-20230223" } ] } @@ -247,34 +247,34 @@ { "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.2-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.2-20230223" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.2-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.2-20230223" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.2-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.2-20230223" } ], "aarch64": [ { "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.2-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.2-20230223" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.2-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.2-20230223" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.2-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.2-20230223" } ] } @@ -307,34 +307,34 @@ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20230223" }, { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20230223" }, { "title": "crb", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20230223" } ], "aarch64": [ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20230223" }, { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20230223" }, { "title": "crb", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20230223" } ] } @@ -353,14 +353,14 @@ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20230223" } ], "aarch64": [ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20230223" } ] }, @@ -370,14 +370,14 @@ { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20230223" } ], "aarch64": [ { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20230223" } ] }, @@ -387,14 +387,14 @@ { "title": "powertools", "name": "powertools", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20230223" } ], "aarch64": [ { "title": "powertools", "name": "powertoosl", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20221115" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20230223" } ] } diff --git a/osbuild-composer.spec b/osbuild-composer.spec index e588394a0..aeaf4281e 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -185,6 +185,7 @@ install -m 0755 -vp _bin/osbuild-service-maintenance-tests %{buildroot}% install -m 0755 -vp _bin/osbuild-mock-openid-provider %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/provision.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ +install -m 0755 -vp tools/ansible-blocking-io.py %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/gen-certs.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/gen-ssh.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer-test/ diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh index 28e0d04ed..c5902407a 100755 --- a/test/cases/ostree-ng.sh +++ b/test/cases/ostree-ng.sh @@ -834,6 +834,10 @@ ansible_private_key_file=${SSH_KEY} ansible_ssh_common_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" EOF +# Fix ansible error https://github.com/osbuild/osbuild-composer/issues/3309 +greenprint "fix stdio file non-blocking issue" +sudo /usr/libexec/osbuild-composer-test/ansible-blocking-io.py + # Test IoT/Edge OS sudo ansible-playbook -v -i "${TEMPDIR}"/inventory \ -e image_type="$OSTREE_OSNAME" \ diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh index 0b44f1e7a..54979d4bf 100755 --- a/test/cases/ostree-raw-image.sh +++ b/test/cases/ostree-raw-image.sh @@ -889,6 +889,10 @@ ansible_become_method=sudo ansible_become_pass=${EDGE_USER_PASSWORD} EOF +# Fix ansible error https://github.com/osbuild/osbuild-composer/issues/3309 +greenprint "fix stdio file non-blocking issue" +sudo /usr/libexec/osbuild-composer-test/ansible-blocking-io.py + # Test IoT/Edge OS sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type="${OSTREE_OSNAME}" -e edge_type=edge-raw-image -e ostree_commit="${UPGRADE_HASH}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result diff --git a/test/cases/ostree-rebase-bios.sh b/test/cases/ostree-rebase-bios.sh index 702b506c8..aff37a915 100755 --- a/test/cases/ostree-rebase-bios.sh +++ b/test/cases/ostree-rebase-bios.sh @@ -517,6 +517,10 @@ ansible_private_key_file=${SSH_KEY} ansible_ssh_common_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" EOF +# Fix ansible error https://github.com/osbuild/osbuild-composer/issues/3309 +greenprint "fix stdio file non-blocking issue" +sudo /usr/libexec/osbuild-composer-test/ansible-blocking-io.py + # Test IoT/Edge OS sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=rhel-edge -e ostree_commit="${UPGRADE_HASH}" -e ostree_ref="rhel-edge:${OSTREE_REF}" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result diff --git a/test/cases/ostree-rebase-uefi.sh b/test/cases/ostree-rebase-uefi.sh index c0697f543..a46e78d71 100755 --- a/test/cases/ostree-rebase-uefi.sh +++ b/test/cases/ostree-rebase-uefi.sh @@ -520,6 +520,10 @@ ansible_private_key_file=${SSH_KEY} ansible_ssh_common_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" EOF +# Fix ansible error https://github.com/osbuild/osbuild-composer/issues/3309 +greenprint "fix stdio file non-blocking issue" +sudo /usr/libexec/osbuild-composer-test/ansible-blocking-io.py + # Test IoT/Edge OS sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=rhel-edge -e ostree_commit="${UPGRADE_HASH}" -e ostree_ref="rhel-edge:${OSTREE_REF}" -e skip_rollback_test="true" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh index 595443f9b..04cba63e4 100755 --- a/test/cases/ostree-simplified-installer.sh +++ b/test/cases/ostree-simplified-installer.sh @@ -1328,6 +1328,10 @@ ansible_become_method=sudo ansible_become_pass=${EDGE_USER_PASSWORD} EOF +# Fix ansible error https://github.com/osbuild/osbuild-composer/issues/3309 +greenprint "fix stdio file non-blocking issue" +sudo /usr/libexec/osbuild-composer-test/ansible-blocking-io.py + # Test IoT/Edge OS sudo ansible-playbook -v -i "${TEMPDIR}"/inventory -e image_type=redhat -e ostree_commit="${UPGRADE_HASH}" -e skip_rollback_test="true" -e edge_type=edge-simplified-installer -e fdo_credential="false" /usr/share/tests/osbuild-composer/ansible/check_ostree.yaml || RESULTS=0 check_result diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh index f2841d953..5124ee41d 100755 --- a/test/cases/ostree.sh +++ b/test/cases/ostree.sh @@ -686,6 +686,10 @@ ansible_private_key_file=${SSH_KEY} ansible_ssh_common_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" EOF +# Fix ansible error https://github.com/osbuild/osbuild-composer/issues/3309 +greenprint "fix stdio file non-blocking issue" +sudo /usr/libexec/osbuild-composer-test/ansible-blocking-io.py + # Test IoT/Edge OS sudo ansible-playbook -v -i "${TEMPDIR}"/inventory \ -e image_type=${IMAGE_TYPE} \ diff --git a/tools/ansible-blocking-io.py b/tools/ansible-blocking-io.py new file mode 100755 index 000000000..58d2820c7 --- /dev/null +++ b/tools/ansible-blocking-io.py @@ -0,0 +1,16 @@ +#!/usr/bin/python3 + +# This python script is to fix ansible error in CI test. It's not a bug of ansible, but a side-effect of a different change +# Details can be found in https://github.com/osbuild/osbuild-composer/issues/3309 +# Will remove it later if we do not see ansible error in CI + +import os +import sys + +for handle in (sys.stdin, sys.stdout, sys.stderr): + try: + fd = handle.fileno() + except Exception: + continue + + os.set_blocking(fd, True) diff --git a/tools/provision.sh b/tools/provision.sh index 09265f907..49b982e22 100755 --- a/tools/provision.sh +++ b/tools/provision.sh @@ -32,6 +32,11 @@ else sudo dnf install -y ansible koji fi +# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2162815 +if [[ "${ID}" == "fedora" && "$VERSION_ID" == "37" ]]; then + sudo dnf install -y nghttp2 +fi + # workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2057769 if [[ "$VERSION_ID" == "9.0" || "$VERSION_ID" == "9" ]]; then if [[ -f "/usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json" ]]; then