From 04ba4b81d83f45e66ef745dc77c728b2751494f0 Mon Sep 17 00:00:00 2001 From: Jakub Rusz Date: Wed, 1 Nov 2023 12:45:37 +0100 Subject: [PATCH] Switch testing to 8.10 and 9.4 nightly --- .gitlab-ci.yml | 76 +++++++++++++--------------- test/cases/cross-distro.sh | 4 +- test/cases/installers.sh | 2 +- test/cases/minimal-raw.sh | 4 +- test/cases/oscap.sh | 2 +- test/cases/ostree-ami-image.sh | 2 +- test/cases/ostree-ignition.sh | 2 +- test/cases/ostree-pulp.sh | 2 +- test/cases/ostree.sh | 4 +- test/data/repositories/rhel-810.json | 5 +- test/data/repositories/rhel-84.json | 2 +- test/data/repositories/rhel-94.json | 5 +- 12 files changed, 50 insertions(+), 60 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b94ba2c78..7f11daade 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,21 +66,17 @@ init: .nightly_rules_all: rules: - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.3-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.9-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.4-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.10-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"' .nightly_rules_x86_64: rules: - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.3-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.9-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "8"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.4-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.10-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "8"' .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL RUNNER: - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-x86_64 - - aws/rhel-9.3-nightly-aarch64 - aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-aarch64 - aws/rhel-9.4-nightly-x86_64 @@ -168,8 +164,8 @@ Prepare-rhel-internal: - RUNNER: # NOTE: 1 runner prepares for all arches b/c subsequent jobs download # artifacts from all previous jobs and the last one wins - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-9.3-nightly-x86_64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-9.4-nightly-x86_64 INTERNAL_NETWORK: ["true"] Base: @@ -197,10 +193,10 @@ Base: - aws/centos-stream-8-x86_64 - aws/centos-stream-8-aarch64 - RUNNER: - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-x86_64 - - aws/rhel-9.3-nightly-aarch64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-nightly-aarch64 - aws/centos-stream-9-x86_64 - aws/centos-stream-9-aarch64 INTERNAL_NETWORK: ["true"] @@ -230,10 +226,10 @@ Base: - aws/rhel-8.8-ga-aarch64 - aws/rhel-9.2-ga-x86_64 - aws/rhel-9.2-ga-aarch64 - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-x86_64 - - aws/rhel-9.3-nightly-aarch64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-nightly-aarch64 - aws/centos-stream-9-x86_64 - aws/centos-stream-9-aarch64 INTERNAL_NETWORK: ["true"] @@ -326,10 +322,10 @@ Image Tests: - RUNNER: - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-x86_64 - - aws/rhel-9.3-nightly-aarch64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-nightly-aarch64 INTERNAL_NETWORK: ["true"] Trigger-rhel-edge-ci: @@ -358,10 +354,10 @@ Trigger-rhel-edge-ci: - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.8-ga-x86_64 - aws/rhel-9.2-ga-x86_64 - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-x86_64 - - aws/rhel-9.3-nightly-aarch64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-nightly-aarch64 - aws/centos-stream-9-x86_64 INTERNAL_NETWORK: ["true"] @@ -521,8 +517,8 @@ API: RUNNER: - aws/rhel-8.8-ga-x86_64 - aws/rhel-9.2-ga-x86_64 - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-9.3-nightly-x86_64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-9.4-nightly-x86_64 INTERNAL_NETWORK: ["true"] - IMAGE_TYPE: ["iot-commit"] RUNNER: @@ -552,8 +548,8 @@ API: - gcp/centos-stream-8-x86_64 - gcp/rhel-8.8-ga-x86_64 - gcp/rhel-9.2-ga-x86_64 - - gcp/rhel-8.9-nightly-x86_64 - - gcp/rhel-9.3-nightly-x86_64 + - gcp/rhel-8.10-nightly-x86_64 + - gcp/rhel-9.4-nightly-x86_64 - gcp/centos-stream-9-x86_64 INTERNAL_NETWORK: ["true"] @@ -579,7 +575,7 @@ ubi-wsl.sh: extends: .libvirt_integration rules: # BLACKLIST - - if: $RUNNER !~ "/^.*(rhel-8.9|rhel-9.3).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" + - if: $RUNNER !~ "/^.*(rhel-8.10|rhel-9.4).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" - !reference [.nightly_rules_all, rules] generic_s3_http.sh: @@ -639,8 +635,8 @@ OpenSCAP: parallel: matrix: - RUNNER: - - rhos-01/rhel-8.9-nightly-x86_64 - - rhos-01/rhel-9.3-nightly-x86_64 + - rhos-01/rhel-8.10-nightly-x86_64 + - rhos-01/rhel-9.4-nightly-x86_64 Upgrade: stage: test @@ -651,7 +647,7 @@ Upgrade: - schutzbot/deploy.sh - /usr/libexec/tests/osbuild-composer/upgrade8to9.sh variables: - RUNNER: rhos-01/rhel-9.3-nightly-x86_64 + RUNNER: rhos-01/rhel-9.4-nightly-x86_64 NIGHTLY_FAIL: stage: finish @@ -684,8 +680,8 @@ Installer: parallel: matrix: - RUNNER: - - rhos-01/rhel-8.9-nightly-x86_64 - - rhos-01/rhel-9.3-nightly-x86_64 + - rhos-01/rhel-8.10-nightly-x86_64 + - rhos-01/rhel-9.4-nightly-x86_64 - rhos-01/centos-stream-9-x86_64 Manifest-diff: @@ -747,10 +743,10 @@ ContainerEmbedding: RUNNER: - aws/centos-stream-8-x86_64 - aws/centos-stream-9-x86_64 - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-x86_64 - - aws/rhel-9.3-nightly-aarch64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-nightly-aarch64 finish: stage: finish diff --git a/test/cases/cross-distro.sh b/test/cases/cross-distro.sh index 72ad1a533..2229ed9ca 100755 --- a/test/cases/cross-distro.sh +++ b/test/cases/cross-distro.sh @@ -110,8 +110,8 @@ ALL_DISTROS=$(find "$REPO_PATH" -name '*.json' -printf '%P\n' | awk -F "." '{ pr ALL_EXPECTED_DISTROS=$(echo "$ALL_DISTROS" | grep -E "$PATTERN" | grep -Ev 'beta|stream' | sort) # Warning: filter out the remaining distros by matching whole words to avoid matching # the value rhel-93 by the pattern rhel-9! -# If we're running on a RHEL 9.2 osbuild-composer doesn't know anything about 9.3 -# images so the value rhel-9.3 should be treated as unrecognized and error out as +# If we're running on a RHEL 9.3 osbuild-composer doesn't know anything about 9.4 +# images so the value rhel-9.4 should be treated as unrecognized and error out as # expected in the test snippet further below ALL_REMAINDERS=$(echo "$ALL_DISTROS" | grep -vw "$RECOGNIZED_DISTROS") diff --git a/test/cases/installers.sh b/test/cases/installers.sh index 36a62e612..9d81326fa 100755 --- a/test/cases/installers.sh +++ b/test/cases/installers.sh @@ -369,7 +369,7 @@ sudo chown qemu:qemu "$VIRT_LOG" greenprint "💿 Install image via installer(ISO) on VM" sudo virt-install --name="${IMAGE_KEY}"\ --disk path="${LIBVIRT_IMAGE_PATH}",format=qcow2 \ - --ram 3072 \ + --ram 2048 \ --vcpus 2 \ --network network=integration,mac=34:49:22:B0:83:30 \ --os-variant ${OS_VARIANT} \ diff --git a/test/cases/minimal-raw.sh b/test/cases/minimal-raw.sh index eb013fc49..9026480b4 100755 --- a/test/cases/minimal-raw.sh +++ b/test/cases/minimal-raw.sh @@ -86,10 +86,10 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) EDGE_USER_PASSWORD=foobar case "${ID}-${VERSION_ID}" in - "rhel-8.9") + "rhel-8.10") OS_VARIANT="rhel8-unknown" ;; - "rhel-9.3") + "rhel-9.4") OS_VARIANT="rhel9-unknown" ;; "centos-8") diff --git a/test/cases/oscap.sh b/test/cases/oscap.sh index 823be11b0..96d0e9e28 100755 --- a/test/cases/oscap.sh +++ b/test/cases/oscap.sh @@ -12,7 +12,7 @@ source /etc/os-release source /usr/libexec/tests/osbuild-composer/shared_lib.sh # workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660 -if [[ "$VERSION_ID" == "9.3" || "$VERSION_ID" == "9" ]]; then +if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null LIBVIRTD_ARGS= EOF diff --git a/test/cases/ostree-ami-image.sh b/test/cases/ostree-ami-image.sh index a1573651b..e003bd848 100755 --- a/test/cases/ostree-ami-image.sh +++ b/test/cases/ostree-ami-image.sh @@ -80,7 +80,7 @@ SSH_KEY_PUB=$(cat "${SSH_KEY}".pub) IGNITION_USER=core case "${ID}-${VERSION_ID}" in - "rhel-9.3") + "rhel-9.4") OSTREE_REF="rhel/9/${ARCH}/edge" SYSROOT_RO="true" ;; diff --git a/test/cases/ostree-ignition.sh b/test/cases/ostree-ignition.sh index 5d77ce7bb..1d9b4238e 100755 --- a/test/cases/ostree-ignition.sh +++ b/test/cases/ostree-ignition.sh @@ -116,7 +116,7 @@ IGNITION_USER_PASSWORD=foobar SYSROOT_RO="true" case "${ID}-${VERSION_ID}" in - "rhel-9.3") + "rhel-9.4") OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" ;; diff --git a/test/cases/ostree-pulp.sh b/test/cases/ostree-pulp.sh index 6086b3d04..bd57ce629 100644 --- a/test/cases/ostree-pulp.sh +++ b/test/cases/ostree-pulp.sh @@ -15,7 +15,7 @@ fi # Set os-variant and boot location used by virt-install. case "${ID}-${VERSION_ID}" in - "rhel-9.3") + "rhel-9.4") IMAGE_TYPE=edge-commit OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh index 815cd45a9..90484be37 100755 --- a/test/cases/ostree.sh +++ b/test/cases/ostree.sh @@ -66,7 +66,7 @@ case "${ID}-${VERSION_ID}" in BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/" fi ;; - "rhel-8.9") + "rhel-8.10") IMAGE_TYPE=edge-commit OSTREE_REF="rhel/8/${ARCH}/edge" OS_VARIANT="rhel8-unknown" @@ -108,7 +108,7 @@ case "${ID}-${VERSION_ID}" in BOOT_LOCATION="${COMPOSE_URL:-}/compose/BaseOS/x86_64/os/" fi ;; - "rhel-9.3") + "rhel-9.4") IMAGE_TYPE=edge-commit OSTREE_REF="rhel/9/${ARCH}/edge" OS_VARIANT="rhel9-unknown" diff --git a/test/data/repositories/rhel-810.json b/test/data/repositories/rhel-810.json index ec3d77221..9a6134c54 100644 --- a/test/data/repositories/rhel-810.json +++ b/test/data/repositories/rhel-810.json @@ -13,10 +13,7 @@ { "name": "rt", "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rt-n8.10-20231115/", - "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF\n0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF\n0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c\nu7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh\nXGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H\n5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW\n9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj\n/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1\nPcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY\nHVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF\nbuhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK\nCRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC\n2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf\nC/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5\nun3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E\n0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE\nIGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh\n8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL\nGht5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki\nJUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25\nOFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq\ndzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==\n=zbHE\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFsy23UBEACUKSphFEIEvNpy68VeW4Dt6qv+mU6am9a2AAl10JANLj1oqWX+\noYk3en1S6cVe2qehSL5DGVa3HMUZkP3dtbD4SgzXzxPodebPcr4+0QNWigkUisri\nXGL5SCEcOP30zDhZvg+4mpO2jMi7Kc1DLPzBBkgppcX91wa0L1pQzBcvYMPyV/Dh\nKbQHR75WdkP6OA2JXdfC94nxYq+2e0iPqC1hCP3Elh+YnSkOkrawDPmoB1g4+ft/\nxsiVGVy/W0ekXmgvYEHt6si6Y8NwXgnTMqxeSXQ9YUgVIbTpsxHQKGy76T5lMlWX\n4LCOmEVomBJg1SqF6yi9Vu8TeNThaDqT4/DddYInd0OO69s0kGIXalVgGYiW2HOD\nx2q5R1VGCoJxXomz+EbOXY+HpKPOHAjU0DB9MxbU3S248LQ69nIB5uxysy0PSco1\nsdZ8sxRNQ9Dw6on0Nowx5m6Thefzs5iK3dnPGBqHTT43DHbnWc2scjQFG+eZhe98\nEll/kb6vpBoY4bG9/wCG9qu7jj9Z+BceCNKeHllbezVLCU/Hswivr7h2dnaEFvPD\nO4GqiWiwOF06XaBMVgxA8p2HRw0KtXqOpZk+o+sUvdPjsBw42BB96A1yFX4jgFNA\nPyZYnEUdP6OOv9HSjnl7k/iEkvHq/jGYMMojixlvXpGXhnt5jNyc4GSUJQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5KSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjkEEwECACMFAlsy23UCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX\ngAAKCRD3b2bD1AgnknqOD/9fB2ASuG2aJIiap4kK58R+RmOVM4qgclAnaG57+vjI\nnKvyfV3NH/keplGNRxwqHekfPCqvkpABwhdGEXIE8ILqnPewIMr6PZNZWNJynZ9i\neSMzVuCG7jDoGyQ5/6B0f6xeBtTeBDiRl7+Alehet1twuGL1BJUYG0QuLgcEzkaE\n/gkuumeVcazLzz7L12D22nMk66GxmgXfqS5zcbqOAuZwaA6VgSEgFdV2X2JU79zS\nBQJXv7NKc+nDXFG7M7EHjY3Rma3HXkDbkT8bzh9tJV7Z7TlpT829pStWQyoxKCVq\nsEX8WsSapTKA3P9YkYCwLShgZu4HKRFvHMaIasSIZWzLu+RZH/4yyHOhj0QB7XMY\neHQ6fGSbtJ+K6SrpHOOsKQNAJ0hVbSrnA1cr5+2SDfel1RfYt0W9FA6DoH/S5gAR\ndzT1u44QVwwp3U+eFpHphFy//uzxNMtCjjdkpzhYYhOCLNkDrlRPb+bcoL/6ePSr\n016PA7eEnuC305YU1Ml2WcCn7wQV8x90o33klJmEkWtXh3X39vYtI4nCPIvZn1eP\nVy+F+wWt4vN2b8oOdlzc2paOembbCo2B+Wapv5Y9peBvlbsDSgqtJABfK8KQq/jK\nYl3h5elIa1I3uNfczeHOnf1enLOUOlq630yeM/yHizz99G1g+z/guMh5+x/OHraW\niA==\n=+Gxh\n-----END PGP PUBLIC KEY BLOCK-----\n", - "image_type_tags": [ - "edge-commit" - ] + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF\n0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF\n0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c\nu7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh\nXGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H\n5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW\n9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj\n/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1\nPcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY\nHVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF\nbuhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK\nCRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC\n2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf\nC/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5\nun3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E\n0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE\nIGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh\n8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL\nGht5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki\nJUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25\nOFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq\ndzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==\n=zbHE\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFsy23UBEACUKSphFEIEvNpy68VeW4Dt6qv+mU6am9a2AAl10JANLj1oqWX+\noYk3en1S6cVe2qehSL5DGVa3HMUZkP3dtbD4SgzXzxPodebPcr4+0QNWigkUisri\nXGL5SCEcOP30zDhZvg+4mpO2jMi7Kc1DLPzBBkgppcX91wa0L1pQzBcvYMPyV/Dh\nKbQHR75WdkP6OA2JXdfC94nxYq+2e0iPqC1hCP3Elh+YnSkOkrawDPmoB1g4+ft/\nxsiVGVy/W0ekXmgvYEHt6si6Y8NwXgnTMqxeSXQ9YUgVIbTpsxHQKGy76T5lMlWX\n4LCOmEVomBJg1SqF6yi9Vu8TeNThaDqT4/DddYInd0OO69s0kGIXalVgGYiW2HOD\nx2q5R1VGCoJxXomz+EbOXY+HpKPOHAjU0DB9MxbU3S248LQ69nIB5uxysy0PSco1\nsdZ8sxRNQ9Dw6on0Nowx5m6Thefzs5iK3dnPGBqHTT43DHbnWc2scjQFG+eZhe98\nEll/kb6vpBoY4bG9/wCG9qu7jj9Z+BceCNKeHllbezVLCU/Hswivr7h2dnaEFvPD\nO4GqiWiwOF06XaBMVgxA8p2HRw0KtXqOpZk+o+sUvdPjsBw42BB96A1yFX4jgFNA\nPyZYnEUdP6OOv9HSjnl7k/iEkvHq/jGYMMojixlvXpGXhnt5jNyc4GSUJQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5KSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjkEEwECACMFAlsy23UCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX\ngAAKCRD3b2bD1AgnknqOD/9fB2ASuG2aJIiap4kK58R+RmOVM4qgclAnaG57+vjI\nnKvyfV3NH/keplGNRxwqHekfPCqvkpABwhdGEXIE8ILqnPewIMr6PZNZWNJynZ9i\neSMzVuCG7jDoGyQ5/6B0f6xeBtTeBDiRl7+Alehet1twuGL1BJUYG0QuLgcEzkaE\n/gkuumeVcazLzz7L12D22nMk66GxmgXfqS5zcbqOAuZwaA6VgSEgFdV2X2JU79zS\nBQJXv7NKc+nDXFG7M7EHjY3Rma3HXkDbkT8bzh9tJV7Z7TlpT829pStWQyoxKCVq\nsEX8WsSapTKA3P9YkYCwLShgZu4HKRFvHMaIasSIZWzLu+RZH/4yyHOhj0QB7XMY\neHQ6fGSbtJ+K6SrpHOOsKQNAJ0hVbSrnA1cr5+2SDfel1RfYt0W9FA6DoH/S5gAR\ndzT1u44QVwwp3U+eFpHphFy//uzxNMtCjjdkpzhYYhOCLNkDrlRPb+bcoL/6ePSr\n016PA7eEnuC305YU1Ml2WcCn7wQV8x90o33klJmEkWtXh3X39vYtI4nCPIvZn1eP\nVy+F+wWt4vN2b8oOdlzc2paOembbCo2B+Wapv5Y9peBvlbsDSgqtJABfK8KQq/jK\nYl3h5elIa1I3uNfczeHOnf1enLOUOlq630yeM/yHizz99G1g+z/guMh5+x/OHraW\niA==\n=+Gxh\n-----END PGP PUBLIC KEY BLOCK-----\n" }, { "name": "ha", diff --git a/test/data/repositories/rhel-84.json b/test/data/repositories/rhel-84.json index 9ab46d1b3..d0e4d894c 100644 --- a/test/data/repositories/rhel-84.json +++ b/test/data/repositories/rhel-84.json @@ -113,4 +113,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test/data/repositories/rhel-94.json b/test/data/repositories/rhel-94.json index 0d9eb1c2c..3d06eada2 100644 --- a/test/data/repositories/rhel-94.json +++ b/test/data/repositories/rhel-94.json @@ -75,10 +75,7 @@ "name": "rt", "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-rt-n9.4-20231115/", "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF\n0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF\n0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c\nu7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh\nXGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H\n5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW\n9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj\n/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1\nPcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY\nHVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF\nbuhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK\nCRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC\n2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf\nC/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5\nun3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E\n0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE\nIGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh\n8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL\nGht5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki\nJUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25\nOFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq\ndzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==\n=zbHE\n-----END PGP PUBLIC KEY BLOCK-----\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFsy23UBEACUKSphFEIEvNpy68VeW4Dt6qv+mU6am9a2AAl10JANLj1oqWX+\noYk3en1S6cVe2qehSL5DGVa3HMUZkP3dtbD4SgzXzxPodebPcr4+0QNWigkUisri\nXGL5SCEcOP30zDhZvg+4mpO2jMi7Kc1DLPzBBkgppcX91wa0L1pQzBcvYMPyV/Dh\nKbQHR75WdkP6OA2JXdfC94nxYq+2e0iPqC1hCP3Elh+YnSkOkrawDPmoB1g4+ft/\nxsiVGVy/W0ekXmgvYEHt6si6Y8NwXgnTMqxeSXQ9YUgVIbTpsxHQKGy76T5lMlWX\n4LCOmEVomBJg1SqF6yi9Vu8TeNThaDqT4/DddYInd0OO69s0kGIXalVgGYiW2HOD\nx2q5R1VGCoJxXomz+EbOXY+HpKPOHAjU0DB9MxbU3S248LQ69nIB5uxysy0PSco1\nsdZ8sxRNQ9Dw6on0Nowx5m6Thefzs5iK3dnPGBqHTT43DHbnWc2scjQFG+eZhe98\nEll/kb6vpBoY4bG9/wCG9qu7jj9Z+BceCNKeHllbezVLCU/Hswivr7h2dnaEFvPD\nO4GqiWiwOF06XaBMVgxA8p2HRw0KtXqOpZk+o+sUvdPjsBw42BB96A1yFX4jgFNA\nPyZYnEUdP6OOv9HSjnl7k/iEkvHq/jGYMMojixlvXpGXhnt5jNyc4GSUJQARAQAB\ntDNSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5KSA8c2VjdXJpdHlAcmVkaGF0\nLmNvbT6JAjkEEwECACMFAlsy23UCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIX\ngAAKCRD3b2bD1AgnknqOD/9fB2ASuG2aJIiap4kK58R+RmOVM4qgclAnaG57+vjI\nnKvyfV3NH/keplGNRxwqHekfPCqvkpABwhdGEXIE8ILqnPewIMr6PZNZWNJynZ9i\neSMzVuCG7jDoGyQ5/6B0f6xeBtTeBDiRl7+Alehet1twuGL1BJUYG0QuLgcEzkaE\n/gkuumeVcazLzz7L12D22nMk66GxmgXfqS5zcbqOAuZwaA6VgSEgFdV2X2JU79zS\nBQJXv7NKc+nDXFG7M7EHjY3Rma3HXkDbkT8bzh9tJV7Z7TlpT829pStWQyoxKCVq\nsEX8WsSapTKA3P9YkYCwLShgZu4HKRFvHMaIasSIZWzLu+RZH/4yyHOhj0QB7XMY\neHQ6fGSbtJ+K6SrpHOOsKQNAJ0hVbSrnA1cr5+2SDfel1RfYt0W9FA6DoH/S5gAR\ndzT1u44QVwwp3U+eFpHphFy//uzxNMtCjjdkpzhYYhOCLNkDrlRPb+bcoL/6ePSr\n016PA7eEnuC305YU1Ml2WcCn7wQV8x90o33klJmEkWtXh3X39vYtI4nCPIvZn1eP\nVy+F+wWt4vN2b8oOdlzc2paOembbCo2B+Wapv5Y9peBvlbsDSgqtJABfK8KQq/jK\nYl3h5elIa1I3uNfczeHOnf1enLOUOlq630yeM/yHizz99G1g+z/guMh5+x/OHraW\niA==\n=+Gxh\n-----END PGP PUBLIC KEY BLOCK-----\n", - "check_gpg": true, - "image_type_tags": [ - "edge-commit" - ] + "check_gpg": true }, { "name": "ha",