From 6cd2fd3d110cdf5f935940a06593466325e3dea5 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 22 Oct 2024 12:20:04 +0200 Subject: [PATCH 1/4] Update osbuild/images to v0.40.0-r9.4.1 Includes https://github.com/osbuild/images/pull/989. --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/osbuild/images/pkg/manifest/os.go | 7 +++++++ vendor/modules.txt | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index f571516f52..80c5ebf977 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/labstack/gommon v0.4.2 github.com/openshift-online/ocm-sdk-go v0.1.398 github.com/oracle/oci-go-sdk/v54 v54.0.0 - github.com/osbuild/images v0.40.0 + github.com/osbuild/images v0.40.0-r9.4.1 github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1 github.com/osbuild/pulp-client v0.1.0 github.com/prometheus/client_golang v1.18.0 diff --git a/go.sum b/go.sum index 5996751f25..53d7cc15ff 100644 --- a/go.sum +++ b/go.sum @@ -503,8 +503,8 @@ github.com/openshift-online/ocm-sdk-go v0.1.398 h1:6C1mDcPxzG4jSduOaWixTTI5gSEO+ github.com/openshift-online/ocm-sdk-go v0.1.398/go.mod h1:tke8vKcE7eHKyRbkJv6qo4ljo919zhx04uyQTcgF5cQ= github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXchUUZ+LS4= github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc= -github.com/osbuild/images v0.40.0 h1:aVlg1+0CiVY6ViuEAMjEIBXvXfTtbKGHHIgQ8N95YWE= -github.com/osbuild/images v0.40.0/go.mod h1:RyfQIjcdjGQ+wKcqLCd5KrCixO0xsDRaDYCgorPFVXk= +github.com/osbuild/images v0.40.0-r9.4.1 h1:8IUN+mXlAlJ1fT5FX13hz7dSP6cFgsQoAm4PkzcDiP0= +github.com/osbuild/images v0.40.0-r9.4.1/go.mod h1:RyfQIjcdjGQ+wKcqLCd5KrCixO0xsDRaDYCgorPFVXk= github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1 h1:UFEJIcPa46W8gtWgOYzriRKYyy1t6SWL0BI7fPTuVvc= github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1/go.mod h1:z+WA+dX6qMwc7fqY5jCzESDIlg4WR2sBQezxsoXv9Ik= github.com/osbuild/pulp-client v0.1.0 h1:L0C4ezBJGTamN3BKdv+rKLuq/WxXJbsFwz/Hj7aEmJ8= diff --git a/vendor/github.com/osbuild/images/pkg/manifest/os.go b/vendor/github.com/osbuild/images/pkg/manifest/os.go index e6df046290..afcbc3c66b 100644 --- a/vendor/github.com/osbuild/images/pkg/manifest/os.go +++ b/vendor/github.com/osbuild/images/pkg/manifest/os.go @@ -392,6 +392,13 @@ func (p *OS) serialize() osbuild.Pipeline { if p.OSTreeRef != "" { rpmOptions.OSTreeBooted = common.ToPtr(true) rpmOptions.DBPath = "/usr/share/rpm" + // The dracut-config-rescue package will create a rescue kernel when + // installed. This creates an issue with ostree-based images because + // rpm-ostree requires that only one kernel exists in the image. + // Disabling dracut for ostree-based systems resolves this issue. + // Dracut will be run by rpm-ostree itself while composing the image. + // https://github.com/osbuild/images/issues/624 + rpmOptions.DisableDracut = true } pipeline.AddStage(osbuild.NewRPMStage(rpmOptions, osbuild.NewRpmStageSourceFilesInputs(p.packageSpecs))) diff --git a/vendor/modules.txt b/vendor/modules.txt index 35d04334f1..0516b7f684 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -851,7 +851,7 @@ github.com/oracle/oci-go-sdk/v54/identity github.com/oracle/oci-go-sdk/v54/objectstorage github.com/oracle/oci-go-sdk/v54/objectstorage/transfer github.com/oracle/oci-go-sdk/v54/workrequests -# github.com/osbuild/images v0.40.0 +# github.com/osbuild/images v0.40.0-r9.4.1 ## explicit; go 1.19 github.com/osbuild/images/internal/common github.com/osbuild/images/internal/environment From 9f385e732faaa8a24f0fef1688c45d9a7e734905 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 22 Oct 2024 13:09:32 +0200 Subject: [PATCH 2/4] github: disable kube-linter The test is non-required and failing but it's blocking the GitLab CI trigger. The templates it's testing aren't relevant for this branch. --- .github/workflows/tests.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2782dcc5ab..cc4d387e05 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -258,26 +258,6 @@ jobs: name: PR_STATUS path: SKIP_CI.txt - kube-linter: - name: "๐ŸŽ€ kube-linter" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: redhat-actions/oc-installer@v1 - - name: Process template - run: | - mkdir processed-templates - oc process -f templates/composer.yml \ - -p IMAGE_TAG=image_tag \ - --local \ - -o yaml > processed-templates/composer.yml - - - uses: stackrox/kube-linter-action@v1.0.4 - with: - directory: processed-templates - config: templates/.kube-linter-config.yml - version: 0.3.0 - cloud-cleaner-is-enabled: name: "๐Ÿงน cloud-cleaner-is-enabled" runs-on: ubuntu-latest From f346d1914118b059c8d74d18ff84956f810ad442 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 22 Oct 2024 13:40:22 +0200 Subject: [PATCH 3/4] gitlab: trim tests to RHEL 9.4 Make all tests run on RHEL 9.4 GA (with newest terraform config). Remove tests that don't run on RHEL. Remove repo configs for RHEL 9.4 in the Schutzfile to match runner config in main. --- .gitlab-ci.yml | 347 +++----------------------------------------- Schutzfile | 41 +----- schutzbot/terraform | 2 +- 3 files changed, 21 insertions(+), 369 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc706d9198..8dd18fb5b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,10 +79,8 @@ init: .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL RUNNER: - - 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/rhel-9.4-ga-x86_64 + - aws/rhel-9.4-ga-aarch64 INTERNAL_NETWORK: ["true"] @@ -95,23 +93,6 @@ RPM: - sh "schutzbot/mockbuild.sh" parallel: matrix: - - RUNNER: - - aws/fedora-38-x86_64 - - aws/fedora-38-aarch64 - - aws/fedora-39-x86_64 - - aws/fedora-39-aarch64 - - aws/fedora-40-x86_64 - - aws/fedora-40-aarch64 - - aws/rhel-8.4-ga-x86_64 - - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-9.3-ga-aarch64 - - aws/centos-stream-8-x86_64 - - aws/centos-stream-8-aarch64 - - aws/centos-stream-9-x86_64 - - aws/centos-stream-9-aarch64 - <<: *RPM_RUNNERS_RHEL Build -tests RPM for RHEL: @@ -129,28 +110,6 @@ Build -tests RPM for RHEL: matrix: - <<: *RPM_RUNNERS_RHEL -Container: - stage: rpmbuild - extends: .terraform - rules: - - !reference [.build_rules, rules] - script: - - sh "schutzbot/containerbuild.sh" - parallel: - matrix: - - RUNNER: - - aws/rhel-8.9-ga-x86_64 - -Packer: - stage: test - extends: .terraform - rules: - - if: '$CI_PIPELINE_SOURCE != "schedule"' - script: - - tools/ci-build-worker-packer.sh - variables: - RUNNER: aws/rhel-9.3-ga-x86_64 - Prepare-rhel-internal: stage: prepare-rhel-internal extends: .terraform @@ -168,8 +127,7 @@ 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.10-nightly-x86_64 - - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] Base: @@ -183,27 +141,7 @@ Base: - /usr/libexec/tests/osbuild-composer/base_tests.sh parallel: matrix: - - RUNNER: - - aws/fedora-38-x86_64 - - aws/fedora-38-aarch64 - - aws/fedora-39-x86_64 - - aws/fedora-39-aarch64 - - aws/rhel-8.4-ga-x86_64 - - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-9.3-ga-aarch64 - - aws/centos-stream-8-x86_64 - - aws/centos-stream-8-aarch64 - - RUNNER: - - 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"] + - <<: *RPM_RUNNERS_RHEL .regression: stage: test @@ -216,27 +154,7 @@ Base: - /usr/libexec/tests/osbuild-composer/${SCRIPT} parallel: matrix: - - RUNNER: - - aws/fedora-38-x86_64 - - aws/fedora-38-aarch64 - - aws/fedora-39-x86_64 - - aws/fedora-39-aarch64 - - aws/centos-stream-8-x86_64 - - aws/centos-stream-8-aarch64 - - RUNNER: - - aws/rhel-8.4-ga-x86_64 - - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-9.3-ga-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"] + - <<: *RPM_RUNNERS_RHEL regression-bigiso: extends: .regression @@ -283,17 +201,6 @@ regression-include-excluded-packages: variables: SCRIPT: regression-include-excluded-packages.sh -regression-old-worker-new-composer: - parallel: - matrix: - - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 - INTERNAL_NETWORK: ["true"] - extends: .regression - variables: - SCRIPT: regression-old-worker-new-composer.sh - regression-insecure-repo: extends: .regression rules: @@ -323,14 +230,7 @@ Image Tests: - /usr/libexec/tests/osbuild-composer/image_tests.sh parallel: matrix: - - RUNNER: - - aws/rhel-8.4-ga-x86_64 - - aws/rhel-8.4-ga-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"] + - <<: *RPM_RUNNERS_RHEL Trigger-rhel-edge-ci: rules: @@ -354,15 +254,8 @@ Trigger-rhel-edge-ci: .rhel_runners: &rhel_runners RUNNER: - - aws/centos-stream-8-x86_64 - - aws/rhel-8.4-ga-x86_64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 - - 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/rhel-9.4-ga-x86_64 + - aws/rhel-9.4-ga-aarch64 INTERNAL_NETWORK: ["true"] .integration_rhel: @@ -371,61 +264,12 @@ Trigger-rhel-edge-ci: matrix: - *rhel_runners -.fedora_runners: &fedora_runners - RUNNER: - - aws/fedora-38-x86_64 - - aws/fedora-39-x86_64 - -.integration_fedora: - extends: .integration_base - parallel: - matrix: - - *fedora_runners - .integration: extends: .integration_base parallel: matrix: - - *fedora_runners - *rhel_runners -koji.sh (cloud upload): - stage: test - extends: .terraform - rules: - - !reference [.upstream_rules_all, rules] - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/koji.sh cloud-upload ${CLOUD_TARGET} ${IMAGE_TYPE} - parallel: - matrix: - - RUNNER: - # Brew workers use RHEL-8.7 - - aws/rhel-8.9-ga-x86_64 - INTERNAL_NETWORK: ["true"] - CLOUD_TARGET: aws - IMAGE_TYPE: aws-rhui - - RUNNER: - # Brew workers use RHEL-8.6 - - aws/rhel-8.9-ga-x86_64 - INTERNAL_NETWORK: ["true"] - CLOUD_TARGET: azure - IMAGE_TYPE: azure-rhui - - RUNNER: - # Brew workers use RHEL-8.6 - - aws/rhel-8.9-ga-x86_64 - INTERNAL_NETWORK: ["true"] - CLOUD_TARGET: gcp - IMAGE_TYPE: gcp-rhui - -koji.sh (cloudapi): - extends: .integration - # Not supported in nightly pipelines - rules: - - !reference [.upstream_rules_all, rules] - variables: - SCRIPT: koji.sh - aws.sh: extends: .integration variables: @@ -460,7 +304,7 @@ azure.sh_hyperv_gen2: # The required GCE image type is not supported on Fedora gcp.sh: extends: .integration_rhel - rules: + rules: - !reference [.upstream_rules_x86_64, rules] - !reference [.nightly_rules_x86_64, rules] variables: @@ -488,11 +332,7 @@ filesystem.sh: extends: .integration parallel: matrix: - - RUNNER: - # don't execute on fedora-39 yet until https://lkml.kernel.org/linux-xfs/20230823220225.3591135-1-david@fromorbit.com/#t is in the kernel - # see also https://github.com/osbuild/osbuild-composer/pull/3820#issuecomment-1881587335 for more details - - aws/fedora-38-x86_64 - - *rhel_runners + - *rhel_runners variables: SCRIPT: filesystem.sh @@ -527,93 +367,13 @@ API: matrix: - <<: *API_TESTS RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] - - IMAGE_TYPE: ["iot-commit"] - RUNNER: - - aws/fedora-38-x86_64 - - aws/fedora-39-x86_64 - - IMAGE_TYPE: ["iot-bootable-container"] - RUNNER: - - aws/fedora-39-x86_64 - - aws/fedora-39-aarch64 - - aws/fedora-40-x86_64 - - aws/fedora-40-aarch64 - IMAGE_TYPE: ["aws"] RUNNER: - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-aarch64 + - aws/rhel-9.4-ga-aarch64 INTERNAL_NETWORK: ["true"] -API-module-hotfixes: - stage: test - extends: .terraform - rules: - - !reference [.upstream_rules_all, rules] - # note: cloud API is not supported for on-prem installations so - # don't run this test case for nightly trees - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/api.sh "${IMAGE_TYPE}" - parallel: - matrix: - - IMAGE_TYPE: - - aws - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 - INTERNAL_NETWORK: ["true"] - TEST_MODULE_HOTFIXES: [1] - - IMAGE_TYPE: - - vsphere - RUNNER: - - aws/rhel-8.9-ga-x86_64 - INTERNAL_NETWORK: ["true"] - TEST_MODULE_HOTFIXES: [1] - -API-no-dot-notation: - stage: test - extends: .terraform - rules: - - !reference [.upstream_rules_all, rules] - # note: cloud API is not supported for on-prem installations so - # don't run this test case for nightly trees - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/api.sh "${IMAGE_TYPE}" - parallel: - matrix: - - IMAGE_TYPE: - - aws - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 - INTERNAL_NETWORK: ["true"] - TEST_NO_DOT_NOTATION: [1] - -API-distro-alias: - stage: test - extends: .terraform - rules: - - !reference [.upstream_rules_all, rules] - # note: cloud API is not supported for on-prem installations so - # don't run this test case for nightly trees - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/api.sh "${IMAGE_TYPE}" - parallel: - matrix: - - IMAGE_TYPE: - - aws-sap-rhui - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 - INTERNAL_NETWORK: ["true"] - TEST_DISTRO_ALIAS: [1] - .libvirt_integration: stage: test extends: .terraform/gcp @@ -626,15 +386,7 @@ API-distro-alias: parallel: matrix: - RUNNER: - - rhos-01/fedora-38-x86_64 - # - rhos-01/fedora-39-x86_64 - - RUNNER: - - gcp/centos-stream-8-x86_64 - - gcp/rhel-8.9-ga-x86_64 - - gcp/rhel-9.3-ga-x86_64 - - gcp/rhel-8.10-nightly-x86_64 - - gcp/rhel-9.4-nightly-x86_64 - - gcp/centos-stream-9-x86_64 + - gcp/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] libvirt.sh: @@ -642,19 +394,6 @@ libvirt.sh: variables: SCRIPT: libvirt.sh -ubi-wsl.sh: - stage: test - extends: .terraform - rules: - - !reference [.upstream_rules_all, rules] - - !reference [.nightly_rules_all, rules] - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/ubi-wsl.sh - variables: - RUNNER: aws/rhel-8.9-ga-x86_64 - INTERNAL_NETWORK: "true" - weldr-distro-dot-notation+aliases: stage: test extends: .terraform @@ -667,8 +406,7 @@ weldr-distro-dot-notation+aliases: parallel: matrix: - RUNNER: - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] .generic_s3: @@ -698,32 +436,6 @@ aws_s3.sh: variables: SCRIPT: aws_s3.sh -RHEL 9 on 8: - stage: test - extends: .terraform - rules: - - !reference [.upstream_rules_all, rules] - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/koji.sh - variables: - RUNNER: aws/rhel-8.9-ga-x86_64 - INTERNAL_NETWORK: "true" - DISTRO_CODE: rhel-91 - -Multi-tenancy: - stage: test - extends: .terraform - rules: - - if: '$CI_PIPELINE_SOURCE != "schedule"' - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/multi-tenancy.sh - variables: - # only 8.7 GA b/c the Image Builder service runs on RHEL 8 - RUNNER: aws/rhel-8.9-ga-x86_64 - INTERNAL_NETWORK: "true" - OpenSCAP: stage: test extends: .terraform @@ -735,8 +447,7 @@ OpenSCAP: parallel: matrix: - RUNNER: - - rhos-01/rhel-8.10-nightly-x86_64 - - rhos-01/rhel-9.4-nightly-x86_64 + - rhos-01/rhel-9.4-ga-x86_64 Upgrade: stage: test @@ -747,7 +458,7 @@ Upgrade: - schutzbot/deploy.sh - /usr/libexec/tests/osbuild-composer/upgrade8to9.sh variables: - RUNNER: rhos-01/rhel-9.4-nightly-x86_64-large + RUNNER: rhos-01/rhel-9.4-ga-x86_64-large NIGHTLY_FAIL: stage: finish @@ -780,9 +491,7 @@ Installer: parallel: matrix: - RUNNER: - - rhos-01/rhel-8.10-nightly-x86_64 - - rhos-01/rhel-9.4-nightly-x86_64 - - rhos-01/centos-stream-9-x86_64 + - rhos-01/rhel-9.4-ga-x86_64 SonarQube: stage: test @@ -796,20 +505,6 @@ SonarQube: INTERNAL_NETWORK: "true" GIT_DEPTH: 0 -ContainerUpload: - stage: test - extends: .terraform - rules: - - !reference [.upstream_rules_all, rules] - script: - - schutzbot/deploy.sh - - /usr/libexec/tests/osbuild-composer/container-upload.sh - parallel: - matrix: - - RUNNER: - - aws/fedora-38-x86_64 - - aws/fedora-39-x86_64 - ContainerEmbedding: stage: test extends: .terraform @@ -823,12 +518,8 @@ ContainerEmbedding: matrix: - INTERNAL_NETWORK: "true" RUNNER: - - aws/centos-stream-8-x86_64 - - aws/centos-stream-9-x86_64 - - 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/rhel-9.4-ga-x86_64 + - aws/rhel-9.4-ga-aarch64 finish: stage: finish diff --git a/Schutzfile b/Schutzfile index e8a1870511..8bba8cc6f0 100644 --- a/Schutzfile +++ b/Schutzfile @@ -245,46 +245,7 @@ "osbuild": { "commit": "322974695cfd6fe3022d8ec4c968b368b674d4dc" } - }, - "repos": [ - { - "file": "/etc/yum.repos.d/rhel9internal.repo", - "x86_64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.4-20240101" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240101" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240101" - } - ], - "aarch64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240101" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240101" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240101" - } - ] - } - ] + } }, "centos-8": { "dependencies": { diff --git a/schutzbot/terraform b/schutzbot/terraform index a663e49021..c2b82038bd 100644 --- a/schutzbot/terraform +++ b/schutzbot/terraform @@ -1 +1 @@ -ac4c95f6e60b34458682845ea07a32d99ec91899 +b39783c2e634fa0aa0c77d31f9374bc71554db4e From b0ea6eb641d34cdb090598c2e3e1707108539dc6 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Tue, 22 Oct 2024 16:18:29 +0200 Subject: [PATCH 4/4] test: pull azure.sh from main The azure.sh test uses the cloud-image-val container which is not version pinned. Older versions of the script wont work with the newer container, so let's pull in the latest version of the script which should work with the current container. --- test/cases/azure.sh | 47 +++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/test/cases/azure.sh b/test/cases/azure.sh index c6e186c6f5..5138ecb8b8 100755 --- a/test/cases/azure.sh +++ b/test/cases/azure.sh @@ -36,6 +36,8 @@ fi TEMPDIR=$(mktemp -d) function cleanup() { greenprint "== Script execution stopped or finished - Cleaning up ==" + # kill dangling journalctl processes to prevent GitLab CI from hanging + sudo pkill journalctl || echo "Nothing killed" sudo rm -rf "$TEMPDIR" } trap cleanup EXIT @@ -50,6 +52,7 @@ if ! hash az; then mkdir "${AZURE_CMD_CREDS_DIR}" AZURE_CMD="sudo ${CONTAINER_RUNTIME} run --rm \ + --net=host \ -v ${AZURE_CMD_CREDS_DIR}:/root/.azure:Z \ -v ${TEMPDIR}:${TEMPDIR}:Z \ ${CONTAINER_IMAGE_CLOUD_TOOLS} az" @@ -156,8 +159,6 @@ sudo composer-cli blueprints depsolve bash WORKER_UNIT=$(sudo systemctl list-units | grep -o -E "osbuild.*worker.*\.service") sudo journalctl -af -n 1 -u "${WORKER_UNIT}" & WORKER_JOURNAL_PID=$! -# Stop watching the worker journal when exiting. -trap 'sudo pkill -P ${WORKER_JOURNAL_PID}' EXIT # Start the compose and upload to Azure. greenprint "๐Ÿš€ Starting compose" @@ -184,9 +185,8 @@ greenprint "๐Ÿ’ฌ Getting compose log and metadata" get_compose_log "$COMPOSE_ID" get_compose_metadata "$COMPOSE_ID" -# Kill the journal monitor immediately and remove the trap +# Kill the journal monitor sudo pkill -P ${WORKER_JOURNAL_PID} -trap - EXIT # Did the compose finish with success? if [[ $COMPOSE_STATUS != FINISHED ]]; then @@ -220,9 +220,11 @@ tee "${TEMPDIR}/resource-file.json" <