diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index e789dd4608162..a55e805644b4c 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -92,7 +92,7 @@ tests: env: DRY_RUN: "y" workflow: openshift-microshift-rebase -- as: e2e-aws-tests-bootc-upstream-periodic +- as: e2e-aws-tests-bootc-upstream-periodic-x86 cron: 0 4 * * 5 steps: cluster_profile: openshift-org-aws @@ -110,7 +110,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: bootc-upstream workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-cache-nightly +- as: e2e-aws-tests-cache-nightly-x86 capabilities: - intranet cron: 30 0 * * * @@ -147,25 +147,25 @@ tests: MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests +- as: e2e-aws-tests-rpm-presubmit-el9-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: c5.metal + EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: presubmits + SCENARIO_TYPE: rpm-presubmits-el9 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm +- as: e2e-aws-tests-rpm-presubmit-el10-arm run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: m7g.metal + EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: presubmits + SCENARIO_TYPE: rpm-presubmits-el10 workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-cache +- as: e2e-aws-tests-cache-x86 capabilities: - intranet restrict_network_access: false @@ -186,100 +186,124 @@ tests: EC2_INSTANCE_TYPE: c7g.2xlarge MICROSHIFT_OS: rhel-9.8 workflow: openshift-microshift-e2e-metal-cache -- as: e2e-aws-tests-periodic - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ +- as: e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-periodic-arm - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ +- as: e2e-aws-tests-ostree-periodic-el9-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: periodics-functional + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-ostree-periodic-el9-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-ostree-periodic-el9-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: c5.metal + EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el9 + SCENARIO_TYPE: periodics-functional + TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el10 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle + TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-bootc-periodic-el9-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: m7g.metal + EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el9 + SCENARIO_TYPE: bootc-periodics-el9-functional + TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ +- as: e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: m7g.metal + EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-presubmits-el10 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle + TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ +- as: e2e-aws-tests-bootc-periodic-el10-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el10-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ +- as: e2e-aws-tests-bootc-periodic-el9-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: - EC2_INSTANCE_TYPE: c5.metal + EC2_INSTANCE_TYPE: m7g.metal + MICROSHIFT_OS: rhel-9.8 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle + TEST_EXECUTION_TIMEOUT: 45m + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-periodic-el9-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el9-functional TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ +- as: e2e-aws-tests-bootc-periodic-el10-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-periodic-arm-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ +- as: e2e-aws-tests-bootc-periodic-el10-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: m7g.metal MICROSHIFT_OS: rhel-9.8 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests - as: ocp-full-conformance-rhel-eus @@ -314,8 +338,8 @@ tests: MICROSHIFT_OS: rhel-9.8 SUITE: ai-model-serving workflow: openshift-microshift-e2e-bare-metal-tests -- as: e2e-aws-tests-release - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ +- as: e2e-aws-tests-ostree-release-el9-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -324,8 +348,8 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-release-arm - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ +- as: e2e-aws-tests-ostree-release-el9-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -334,8 +358,8 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ +- as: e2e-aws-tests-bootc-release-el9-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -344,8 +368,8 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ +- as: e2e-aws-tests-bootc-release-el10-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -354,8 +378,8 @@ tests: SCENARIO_TYPE: bootc-releases-el10 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ +- as: e2e-aws-tests-bootc-release-el9-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -364,8 +388,8 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ +- as: e2e-aws-tests-bootc-release-el10-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ steps: cluster_profile: openshift-org-aws env: @@ -374,7 +398,7 @@ tests: SCENARIO_TYPE: bootc-releases-el10 TEST_EXECUTION_TIMEOUT: 45m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-upstream +- as: e2e-aws-tests-bootc-presubmit-upstream-x86 run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ steps: cluster_profile: openshift-org-aws @@ -383,7 +407,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: bootc-upstream workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-upstream-arm +- as: e2e-aws-tests-bootc-presubmit-upstream-arm run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ steps: cluster_profile: openshift-org-aws @@ -392,7 +416,7 @@ tests: MICROSHIFT_OS: rhel-9.8 SCENARIO_TYPE: bootc-upstream workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc +- as: e2e-aws-tests-bootc-presubmit-c2cc-x86 run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ steps: cluster_profile: openshift-org-aws @@ -401,7 +425,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-c2cc workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc-arm +- as: e2e-aws-tests-bootc-presubmit-c2cc-arm run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml index 4328b61c74bc4..be0188ae655e9 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-5.0__periodics.yaml @@ -62,7 +62,7 @@ tests: env: EC2_INSTANCE_TYPE: t3.medium workflow: openshift-microshift-manage-versions-releases -- as: e2e-aws-tests-cache-nightly +- as: e2e-aws-tests-cache-nightly-x86 capabilities: - intranet cron: 30 0 * * 1-5 @@ -99,43 +99,79 @@ tests: MICROSHIFT_OS: rhel-9.6 workflow: openshift-microshift-e2e-metal-cache timeout: 4h0m0s -- as: e2e-aws-tests-bootc-nightly-el9 +- as: e2e-aws-tests-bootc-x86-nightly-el9-lifecycle cron: 0 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-nightly-el10 - cron: 0 3 * * 1-5 +- as: e2e-aws-tests-bootc-x86-nightly-el9-functional + cron: 30 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el9-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el9 - cron: 0 3 * * 1-5 +- as: e2e-aws-tests-bootc-x86-nightly-el10-lifecycle + cron: 0 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-x86-nightly-el10-functional + cron: 30 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el10-functional + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el9-lifecycle + cron: 15 3 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el9 + SCENARIO_TYPE: bootc-periodics-el9-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-arm-nightly-el10 - cron: 0 3 * * 1-5 +- as: e2e-aws-tests-bootc-arm-nightly-el9-functional + cron: 45 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c7g.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el9-functional + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el10-lifecycle + cron: 15 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c7g.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: bootc-periodics-el10-lifecycle + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-bootc-arm-nightly-el10-functional + cron: 45 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: bootc-periodics-el10 + SCENARIO_TYPE: bootc-periodics-el10-functional workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc-nightly +- as: e2e-aws-tests-bootc-x86-nightly-c2cc cron: 30 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -144,7 +180,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-c2cc workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-c2cc-arm-nightly +- as: e2e-aws-tests-bootc-arm-nightly-c2cc cron: 30 4 * * 1-5 steps: cluster_profile: openshift-org-aws @@ -153,37 +189,41 @@ tests: MICROSHIFT_OS: rhel-9.6 SCENARIO_TYPE: bootc-c2cc workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-nightly +- as: e2e-aws-tests-ostree-x86-nightly-el9-lifecycle cron: 30 3 * * 1-5 - reporter_config: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c5.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-lifecycle workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-arm-nightly - cron: 30 3 * * 1-5 - reporter_config: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' +- as: e2e-aws-tests-ostree-x86-nightly-el9-functional + cron: 0 4 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c5.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: periodics-functional + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-ostree-arm-nightly-el9-lifecycle + cron: 45 3 * * 1-5 + steps: + cluster_profile: openshift-org-aws + env: + EC2_INSTANCE_TYPE: c7g.metal + MICROSHIFT_OS: rhel-9.6 + SCENARIO_TYPE: periodics-lifecycle + workflow: openshift-microshift-e2e-metal-tests +- as: e2e-aws-tests-ostree-arm-nightly-el9-functional + cron: 15 4 * * 1-5 steps: cluster_profile: openshift-org-aws env: EC2_INSTANCE_TYPE: c7g.metal MICROSHIFT_OS: rhel-9.6 - SCENARIO_TYPE: periodics + SCENARIO_TYPE: periodics-functional workflow: openshift-microshift-e2e-metal-tests - as: e2e-aws-ovn-ocp-conformance cron: 0 4 * * 1-5 @@ -261,7 +301,7 @@ tests: MICROSHIFT_OS: rhel-9.6 SUITE: ai-model-serving workflow: openshift-microshift-e2e-bare-metal-tests -- as: e2e-aws-tests-release-periodic +- as: e2e-aws-tests-ostree-x86-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -271,7 +311,7 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-release-arm-periodic +- as: e2e-aws-tests-ostree-arm-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -281,7 +321,7 @@ tests: SCENARIO_TYPE: releases TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-periodic-el9 +- as: e2e-aws-tests-bootc-x86-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -291,7 +331,7 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-periodic-el10 +- as: e2e-aws-tests-bootc-x86-release-periodic-el10 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -301,7 +341,7 @@ tests: SCENARIO_TYPE: bootc-releases-el10 TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-periodic-el9 +- as: e2e-aws-tests-bootc-arm-release-periodic-el9 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws @@ -311,7 +351,7 @@ tests: SCENARIO_TYPE: bootc-releases-el9 TEST_EXECUTION_TIMEOUT: 60m workflow: openshift-microshift-e2e-metal-tests -- as: e2e-aws-tests-bootc-release-arm-periodic-el10 +- as: e2e-aws-tests-bootc-arm-release-periodic-el10 cron: 0 3 * * 0,2,4 steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml index 00fe201e40a54..ae2d1282f01f3 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-periodics.yaml @@ -15,7 +15,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic-arm spec: containers: - args: @@ -24,7 +24,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream-periodic + - --target=e2e-aws-tests-bootc-upstream-periodic-arm command: - ci-operator env: @@ -96,7 +96,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic-arm + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-periodic-x86 spec: containers: - args: @@ -105,7 +105,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream-periodic-arm + - --target=e2e-aws-tests-bootc-upstream-periodic-x86 command: - ci-operator env: @@ -179,7 +179,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly-arm reporter_config: slack: channel: '#microshift-alerts' @@ -196,7 +196,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly + - --target=e2e-aws-tests-cache-nightly-arm command: - ci-operator env: @@ -270,7 +270,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly-arm + name: periodic-ci-openshift-microshift-main-e2e-aws-tests-cache-nightly-x86 reporter_config: slack: channel: '#microshift-alerts' @@ -287,7 +287,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly-arm + - --target=e2e-aws-tests-cache-nightly-x86 command: - ci-operator env: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml index 1a2736ca3b681..11faf04a2374b 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml @@ -174,7 +174,7 @@ presubmits: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-functional-arm decorate: true decoration_config: skip_cloning: true @@ -184,9 +184,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests - rerun_command: /test e2e-aws-tests - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-functional-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ spec: containers: - args: @@ -195,7 +195,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests + - --target=e2e-aws-tests-bootc-periodic-el10-functional-arm command: - ci-operator env: @@ -251,14 +251,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-functional-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-arm + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-functional-x86 decorate: true decoration_config: skip_cloning: true @@ -268,9 +268,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-arm - rerun_command: /test e2e-aws-tests-arm - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-functional-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-functional/.*)$ spec: containers: - args: @@ -279,7 +279,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-arm + - --target=e2e-aws-tests-bootc-periodic-el10-functional-x86 command: - ci-operator env: @@ -335,14 +335,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-functional-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-arm-el10 + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-lifecycle-arm decorate: true decoration_config: skip_cloning: true @@ -352,9 +352,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm-el10 - rerun_command: /test e2e-aws-tests-bootc-arm-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ spec: containers: - args: @@ -363,7 +363,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-el10 + - --target=e2e-aws-tests-bootc-periodic-el10-lifecycle-arm command: - ci-operator env: @@ -419,14 +419,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-arm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-lifecycle-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-arm-el9 + context: ci/prow/e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 decorate: true decoration_config: skip_cloning: true @@ -436,9 +436,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm-el9 - rerun_command: /test e2e-aws-tests-bootc-arm-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el10/periodics-lifecycle/.*)$ spec: containers: - args: @@ -447,7 +447,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-el9 + - --target=e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 command: - ci-operator env: @@ -503,14 +503,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-arm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10-lifecycle-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-c2cc + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-functional-arm decorate: true decoration_config: skip_cloning: true @@ -520,9 +520,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-c2cc - rerun_command: /test e2e-aws-tests-bootc-c2cc - run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-functional-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ spec: containers: - args: @@ -531,7 +531,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc + - --target=e2e-aws-tests-bootc-periodic-el9-functional-arm command: - ci-operator env: @@ -587,14 +587,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-c2cc,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-functional-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-c2cc-arm + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-functional-x86 decorate: true decoration_config: skip_cloning: true @@ -604,9 +604,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-c2cc-arm - rerun_command: /test e2e-aws-tests-bootc-c2cc-arm - run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-functional-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-functional/.*)$ spec: containers: - args: @@ -615,7 +615,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc-arm + - --target=e2e-aws-tests-bootc-periodic-el9-functional-x86 command: - ci-operator env: @@ -671,14 +671,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-c2cc-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-functional-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-el10 + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-lifecycle-arm decorate: true decoration_config: skip_cloning: true @@ -688,9 +688,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el10 - rerun_command: /test e2e-aws-tests-bootc-el10 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-arm + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ spec: containers: - args: @@ -699,7 +699,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-el10 + - --target=e2e-aws-tests-bootc-periodic-el9-lifecycle-arm command: - ci-operator env: @@ -755,14 +755,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-lifecycle-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-el9 + context: ci/prow/e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 decorate: true decoration_config: skip_cloning: true @@ -772,9 +772,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el9 - rerun_command: /test e2e-aws-tests-bootc-el9 - run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 + rerun_command: /test e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-bootc/el9/periodics-lifecycle/.*)$ spec: containers: - args: @@ -783,7 +783,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-el9 + - --target=e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 command: - ci-operator env: @@ -839,14 +839,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9-lifecycle-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-arm-el10 + context: ci/prow/e2e-aws-tests-bootc-presubmit-c2cc-arm decorate: true decoration_config: skip_cloning: true @@ -856,9 +856,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm-el10 - rerun_command: /test e2e-aws-tests-bootc-periodic-arm-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-c2cc-arm + rerun_command: /test e2e-aws-tests-bootc-presubmit-c2cc-arm + run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ spec: containers: - args: @@ -867,7 +867,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-arm-el10 + - --target=e2e-aws-tests-bootc-presubmit-c2cc-arm command: - ci-operator env: @@ -923,14 +923,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-arm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-c2cc-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-arm-el9 + context: ci/prow/e2e-aws-tests-bootc-presubmit-c2cc-x86 decorate: true decoration_config: skip_cloning: true @@ -940,9 +940,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm-el9 - rerun_command: /test e2e-aws-tests-bootc-periodic-arm-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-c2cc-x86 + rerun_command: /test e2e-aws-tests-bootc-presubmit-c2cc-x86 + run_if_changed: ^(test/scenarios-bootc/c2cc/.*|test/suites/c2cc/.*|test/resources/c2cc.*)$ spec: containers: - args: @@ -951,7 +951,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-arm-el9 + - --target=e2e-aws-tests-bootc-presubmit-c2cc-x86 command: - ci-operator env: @@ -1007,14 +1007,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-arm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-c2cc-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-el10 + context: ci/prow/e2e-aws-tests-bootc-presubmit-upstream-arm decorate: true decoration_config: skip_cloning: true @@ -1024,9 +1024,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10 - rerun_command: /test e2e-aws-tests-bootc-periodic-el10 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-upstream-arm + rerun_command: /test e2e-aws-tests-bootc-presubmit-upstream-arm + run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ spec: containers: - args: @@ -1035,7 +1035,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-el10 + - --target=e2e-aws-tests-bootc-presubmit-upstream-arm command: - ci-operator env: @@ -1091,14 +1091,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-upstream-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-periodic-el9 + context: ci/prow/e2e-aws-tests-bootc-presubmit-upstream-x86 decorate: true decoration_config: skip_cloning: true @@ -1108,9 +1108,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9 - rerun_command: /test e2e-aws-tests-bootc-periodic-el9 - run_if_changed: ^(test/bin/.*|test/scenarios-bootc/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-presubmit-upstream-x86 + rerun_command: /test e2e-aws-tests-bootc-presubmit-upstream-x86 + run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ spec: containers: - args: @@ -1119,7 +1119,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-periodic-el9 + - --target=e2e-aws-tests-bootc-presubmit-upstream-x86 command: - ci-operator env: @@ -1175,14 +1175,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-periodic-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-presubmit-upstream-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-arm-el10 + context: ci/prow/e2e-aws-tests-bootc-release-el10-arm decorate: true decoration_config: skip_cloning: true @@ -1192,9 +1192,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-arm-el10 - rerun_command: /test e2e-aws-tests-bootc-release-arm-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el10-arm + rerun_command: /test e2e-aws-tests-bootc-release-el10-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1203,7 +1203,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-el10 + - --target=e2e-aws-tests-bootc-release-el10-arm command: - ci-operator env: @@ -1259,14 +1259,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-arm-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el10-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-arm-el9 + context: ci/prow/e2e-aws-tests-bootc-release-el10-x86 decorate: true decoration_config: skip_cloning: true @@ -1276,9 +1276,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-arm-el9 - rerun_command: /test e2e-aws-tests-bootc-release-arm-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el10-x86 + rerun_command: /test e2e-aws-tests-bootc-release-el10-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1287,7 +1287,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-el9 + - --target=e2e-aws-tests-bootc-release-el10-x86 command: - ci-operator env: @@ -1343,14 +1343,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-arm-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el10-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-el10 + context: ci/prow/e2e-aws-tests-bootc-release-el9-arm decorate: true decoration_config: skip_cloning: true @@ -1360,9 +1360,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el10 - rerun_command: /test e2e-aws-tests-bootc-release-el10 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el9-arm + rerun_command: /test e2e-aws-tests-bootc-release-el9-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1371,7 +1371,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-el10 + - --target=e2e-aws-tests-bootc-release-el9-arm command: - ci-operator env: @@ -1427,26 +1427,196 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el10,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el9-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-release-el9 + context: ci/prow/e2e-aws-tests-bootc-release-el9-x86 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el9-x86 + rerun_command: /test e2e-aws-tests-bootc-release-el9-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-bootc-release-el9-x86 + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el9-x86,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build05 + context: ci/prow/e2e-aws-tests-cache-arm + decorate: true + decoration_config: + skip_cloning: true + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache-arm + rerun_command: /test e2e-aws-tests-cache-arm + run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-cache-arm + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-tests-cache-arm,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build05 + context: ci/prow/e2e-aws-tests-cache-x86 decorate: true decoration_config: skip_cloning: true labels: + capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el9 - rerun_command: /test e2e-aws-tests-bootc-release-el9 - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache-x86 + rerun_command: /test e2e-aws-tests-cache-x86 + run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ spec: containers: - args: @@ -1455,7 +1625,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-el9 + - --target=e2e-aws-tests-cache-x86 command: - ci-operator env: @@ -1511,14 +1681,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-release-el9,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-cache-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-upstream + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-functional-arm decorate: true decoration_config: skip_cloning: true @@ -1528,9 +1698,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream - rerun_command: /test e2e-aws-tests-bootc-upstream - run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-functional-arm + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-functional-arm + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ spec: containers: - args: @@ -1539,7 +1709,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream + - --target=e2e-aws-tests-ostree-periodic-el9-functional-arm command: - ci-operator env: @@ -1595,14 +1765,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-upstream,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-functional-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-bootc-upstream-arm + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-functional-x86 decorate: true decoration_config: skip_cloning: true @@ -1612,9 +1782,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-upstream-arm - rerun_command: /test e2e-aws-tests-bootc-upstream-arm - run_if_changed: ^(test/scenarios-bootc/upstream/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-functional-x86 + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-functional-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-functional/.*)$ spec: containers: - args: @@ -1623,7 +1793,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-upstream-arm + - --target=e2e-aws-tests-ostree-periodic-el9-functional-x86 command: - ci-operator env: @@ -1679,27 +1849,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-bootc-upstream-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-functional-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build05 - context: ci/prow/e2e-aws-tests-cache + cluster: build03 + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-lifecycle-arm decorate: true decoration_config: skip_cloning: true labels: - capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache - rerun_command: /test e2e-aws-tests-cache - run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-lifecycle-arm + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-lifecycle-arm + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ spec: containers: - args: @@ -1708,7 +1877,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache + - --target=e2e-aws-tests-ostree-periodic-el9-lifecycle-arm command: - ci-operator env: @@ -1764,27 +1933,26 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-cache,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-lifecycle-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build05 - context: ci/prow/e2e-aws-tests-cache-arm + cluster: build03 + context: ci/prow/e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 decorate: true decoration_config: skip_cloning: true labels: - capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-cache-arm - rerun_command: /test e2e-aws-tests-cache-arm - run_if_changed: ^test\/bin\/(ci_phase_iso_build|manage_build_cache)\.sh$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 + rerun_command: /test e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 + run_if_changed: ^(test/bin/.*|test/scenarios-ostree/periodics-lifecycle/.*)$ spec: containers: - args: @@ -1793,7 +1961,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-arm + - --target=e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 command: - ci-operator env: @@ -1849,14 +2017,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-cache-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-periodic-el9-lifecycle-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-periodic + context: ci/prow/e2e-aws-tests-ostree-release-el9-arm decorate: true decoration_config: skip_cloning: true @@ -1866,9 +2034,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-periodic - rerun_command: /test e2e-aws-tests-periodic - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-release-el9-arm + rerun_command: /test e2e-aws-tests-ostree-release-el9-arm + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1877,7 +2045,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-periodic + - --target=e2e-aws-tests-ostree-release-el9-arm command: - ci-operator env: @@ -1933,14 +2101,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-periodic,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-release-el9-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-periodic-arm + context: ci/prow/e2e-aws-tests-ostree-release-el9-x86 decorate: true decoration_config: skip_cloning: true @@ -1950,9 +2118,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-periodic-arm - rerun_command: /test e2e-aws-tests-periodic-arm - run_if_changed: ^(test/bin/.*|test/scenarios-periodics/.*|test/scenarios/periodics/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-release-el9-x86 + rerun_command: /test e2e-aws-tests-ostree-release-el9-x86 + run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios-ostree/releases/.*)$ spec: containers: - args: @@ -1961,7 +2129,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-periodic-arm + - --target=e2e-aws-tests-ostree-release-el9-x86 command: - ci-operator env: @@ -2017,14 +2185,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-periodic-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-ostree-release-el9-x86,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-release + context: ci/prow/e2e-aws-tests-rpm-presubmit-el10-arm decorate: true decoration_config: skip_cloning: true @@ -2034,9 +2202,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-release - rerun_command: /test e2e-aws-tests-release - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el10-arm + rerun_command: /test e2e-aws-tests-rpm-presubmit-el10-arm + run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: - args: @@ -2045,7 +2213,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release + - --target=e2e-aws-tests-rpm-presubmit-el10-arm command: - ci-operator env: @@ -2101,14 +2269,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-release,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el10-arm,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build03 - context: ci/prow/e2e-aws-tests-release-arm + context: ci/prow/e2e-aws-tests-rpm-presubmit-el9-arm decorate: true decoration_config: skip_cloning: true @@ -2118,9 +2286,9 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-microshift-main-e2e-aws-tests-release-arm - rerun_command: /test e2e-aws-tests-release-arm - run_if_changed: ^(test/scenarios-bootc/releases/.*|test/scenarios/releases/.*)$ + name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-presubmit-el9-arm + rerun_command: /test e2e-aws-tests-rpm-presubmit-el9-arm + run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$ spec: containers: - args: @@ -2129,7 +2297,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release-arm + - --target=e2e-aws-tests-rpm-presubmit-el9-arm command: - ci-operator env: @@ -2185,7 +2353,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-tests-release-arm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-presubmit-el9-arm,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml index 545c1d0cb3992..6482bc9a88f71 100644 --- a/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml +++ b/ci-operator/jobs/openshift/microshift/openshift-microshift-release-5.0-periodics.yaml @@ -456,7 +456,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 30 3 * * 1-5 + cron: 30 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -471,15 +471,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-arm-nightly - reporter_config: - slack: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-c2cc spec: containers: - args: @@ -488,7 +480,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-arm-nightly + - --target=e2e-aws-tests-bootc-arm-nightly-c2cc - --variant=periodics command: - ci-operator @@ -547,7 +539,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 45 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -562,7 +554,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el10-functional spec: containers: - args: @@ -571,7 +563,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-nightly-el10 + - --target=e2e-aws-tests-bootc-arm-nightly-el10-functional - --variant=periodics command: - ci-operator @@ -630,7 +622,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 15 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -645,7 +637,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el10-lifecycle spec: containers: - args: @@ -654,7 +646,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-arm-nightly-el9 + - --target=e2e-aws-tests-bootc-arm-nightly-el10-lifecycle - --variant=periodics command: - ci-operator @@ -713,7 +705,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 30 4 * * 1-5 + cron: 45 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -728,7 +720,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-c2cc-arm-nightly + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el9-functional spec: containers: - args: @@ -737,7 +729,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc-arm-nightly + - --target=e2e-aws-tests-bootc-arm-nightly-el9-functional - --variant=periodics command: - ci-operator @@ -796,7 +788,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 30 4 * * 1-5 + cron: 15 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -811,7 +803,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-c2cc-nightly + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-nightly-el9-lifecycle spec: containers: - args: @@ -820,7 +812,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-c2cc-nightly + - --target=e2e-aws-tests-bootc-arm-nightly-el9-lifecycle - --variant=periodics command: - ci-operator @@ -879,7 +871,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 0 3 * * 0,2,4 decorate: true decoration_config: skip_cloning: true @@ -894,7 +886,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-nightly-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-release-periodic-el10 spec: containers: - args: @@ -903,7 +895,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-nightly-el10 + - --target=e2e-aws-tests-bootc-arm-release-periodic-el10 - --variant=periodics command: - ci-operator @@ -962,7 +954,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 1-5 + cron: 0 3 * * 0,2,4 decorate: true decoration_config: skip_cloning: true @@ -977,7 +969,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-nightly-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-arm-release-periodic-el9 spec: containers: - args: @@ -986,7 +978,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-nightly-el9 + - --target=e2e-aws-tests-bootc-arm-release-periodic-el9 - --variant=periodics command: - ci-operator @@ -1045,7 +1037,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 30 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1060,7 +1052,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-arm-periodic-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-c2cc spec: containers: - args: @@ -1069,7 +1061,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-periodic-el10 + - --target=e2e-aws-tests-bootc-x86-nightly-c2cc - --variant=periodics command: - ci-operator @@ -1128,7 +1120,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 30 4 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1143,7 +1135,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-arm-periodic-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el10-functional spec: containers: - args: @@ -1152,7 +1144,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-arm-periodic-el9 + - --target=e2e-aws-tests-bootc-x86-nightly-el10-functional - --variant=periodics command: - ci-operator @@ -1211,7 +1203,173 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 0 4 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el10-lifecycle + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-bootc-x86-nightly-el10-lifecycle + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 30 3 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el9-functional + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-bootc-x86-nightly-el9-functional + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 0 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1226,7 +1384,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-periodic-el10 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-nightly-el9-lifecycle spec: containers: - args: @@ -1235,7 +1393,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-periodic-el10 + - --target=e2e-aws-tests-bootc-x86-nightly-el9-lifecycle - --variant=periodics command: - ci-operator @@ -1309,7 +1467,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-release-periodic-el9 + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-release-periodic-el10 spec: containers: - args: @@ -1318,7 +1476,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-bootc-release-periodic-el9 + - --target=e2e-aws-tests-bootc-x86-release-periodic-el10 - --variant=periodics command: - ci-operator @@ -1376,33 +1534,23 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build12 - cron: 30 0 * * 1-5 + cluster: build11 + cron: 0 3 * * 0,2,4 decorate: true decoration_config: skip_cloning: true - timeout: 4h0m0s extra_refs: - base_ref: release-5.0 org: openshift repo: microshift labels: - capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly - reporter_config: - slack: - channel: '#microshift-alerts' - job_states_to_report: - - failure - - error - report_template: ':red_jenkins_circle: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs>' + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-bootc-x86-release-periodic-el9 spec: containers: - args: @@ -1411,7 +1559,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-cache-nightly + - --target=e2e-aws-tests-bootc-x86-release-periodic-el9 - --variant=periodics command: - ci-operator @@ -1562,23 +1710,25 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build11 - cron: 30 3 * * 1-5 + cluster: build12 + cron: 30 0 * * 1-5 decorate: true decoration_config: skip_cloning: true + timeout: 4h0m0s extra_refs: - base_ref: release-5.0 org: openshift repo: microshift labels: + capability/intranet: intranet ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-nightly + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-cache-nightly-x86 reporter_config: slack: channel: '#microshift-alerts' @@ -1595,7 +1745,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-nightly + - --target=e2e-aws-tests-cache-nightly-x86 - --variant=periodics command: - ci-operator @@ -1654,7 +1804,339 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build11 - cron: 0 3 * * 0,2,4 + cron: 15 4 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-arm-nightly-el9-functional + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-arm-nightly-el9-functional + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 45 3 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-arm-nightly-el9-lifecycle + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-arm-nightly-el9-lifecycle + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 0 3 * * 0,2,4 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-arm-release-periodic-el9 + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-arm-release-periodic-el9 + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 0 4 * * 1-5 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-5.0 + org: openshift + repo: microshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "5.0" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-x86-nightly-el9-functional + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-tests-ostree-x86-nightly-el9-functional + - --variant=periodics + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build11 + cron: 30 3 * * 1-5 decorate: true decoration_config: skip_cloning: true @@ -1669,7 +2151,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-release-arm-periodic + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-x86-nightly-el9-lifecycle spec: containers: - args: @@ -1678,7 +2160,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release-arm-periodic + - --target=e2e-aws-tests-ostree-x86-nightly-el9-lifecycle - --variant=periodics command: - ci-operator @@ -1752,7 +2234,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-release-periodic + name: periodic-ci-openshift-microshift-release-5.0-periodics-e2e-aws-tests-ostree-x86-release-periodic-el9 spec: containers: - args: @@ -1761,7 +2243,7 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-tests-release-periodic + - --target=e2e-aws-tests-ostree-x86-release-periodic-el9 - --variant=periodics command: - ci-operator diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 88ebe57fbe6af..91371134be60d 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -749,12 +749,17 @@ function get_source_dir() { [bootc-releases-el10]="scenarios-bootc/el10/releases:scenarios-bootc" [bootc-presubmits-el9]="scenarios-bootc/el9/presubmits:scenarios-bootc" [bootc-presubmits-el10]="scenarios-bootc/el10/presubmits:scenarios-bootc" - [bootc-periodics-el9]="scenarios-bootc/el9/periodics:scenarios-bootc" - [bootc-periodics-el10]="scenarios-bootc/el10/periodics:scenarios-bootc" + [bootc-periodics-el9-lifecycle]="scenarios-bootc/el9/periodics-lifecycle:scenarios-bootc" + [bootc-periodics-el9-functional]="scenarios-bootc/el9/periodics-functional:scenarios-bootc" + [bootc-periodics-el10-lifecycle]="scenarios-bootc/el10/periodics-lifecycle:scenarios-bootc" + [bootc-periodics-el10-functional]="scenarios-bootc/el10/periodics-functional:scenarios-bootc" [bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc" - [releases]="scenarios/releases:scenarios" - [presubmits]="scenarios/presubmits:scenarios" - [periodics]="scenarios/periodics:scenarios-periodics" + [releases]="scenarios-ostree/releases:scenarios-ostree" + [periodics-lifecycle]="scenarios-ostree/periodics-lifecycle:scenarios-ostree" + [periodics-functional]="scenarios-ostree/periodics-functional:scenarios-ostree" + # Both el9/el10 share the same scenarios — RHEL version is derived from SCENARIO_TYPE at runtime + [rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm" + [rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm" ) local -r scenario_type=$1 local -r base="/home/${HOST_USER}/microshift/test" diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 8c599df2a6cf5..2ce0e7ecff598 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -27,6 +27,8 @@ export CI_JOB_NAME="${JOB_NAME}" export GITHUB_TOKEN="\$(cat /tmp/token-git 2>/dev/null || echo '')" if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then ./test/bin/ci_phase_iso_build.sh -update_cache +elif [[ "${SCENARIO_TYPE}" =~ ^rpm-presubmits.*$ ]] ; then + ./test/bin/ci_phase_iso_build.sh -rpm_only else ./test/bin/ci_phase_iso_build.sh fi @@ -40,7 +42,10 @@ chmod +x /tmp/iso.sh # GBRN=mybranch # git clone "https://github.com/${GUSR}/microshift.git" -b "${GBRN}" /go/src/github.com/openshift/microshift # -ci_clone_src +# TODO: Revert to 'ci_clone_src' before merging +GUSR=agullon +GBRN=shiftweek/rpm-presubmit-ci +git clone "https://github.com/${GUSR}/microshift.git" -b "${GBRN}" /go/src/github.com/openshift/microshift download_brew_rpms() { # See BREW_RPM_SOURCE variable definition in test/bin/common.sh @@ -89,6 +94,12 @@ if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then download_brew_rpms fi +# Write SCENARIO_TYPE for RPM scenarios to read on the EC2 instance +if [[ "${SCENARIO_TYPE}" =~ ^rpm-presubmits.*$ ]]; then + mkdir -p /go/src/github.com/openshift/microshift/_output + echo "${SCENARIO_TYPE}" > /go/src/github.com/openshift/microshift/_output/scenario_type +fi + # Archive the sources, potentially including MicroShift RPMs from brew tar czf /tmp/microshift.tgz /go/src/github.com/openshift/microshift diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml index aed589f423fb3..6ac251771a66b 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml @@ -11,6 +11,8 @@ ref: env: - name: HOME default: /tmp/secret + - name: SCENARIO_TYPE + default: "" credentials: - name: microshift-rhsm-creds namespace: test-credentials