From 3487609624c9e67ff350323fa5a41147654db678 Mon Sep 17 00:00:00 2001 From: Qiujie Li Date: Tue, 19 Nov 2024 17:22:45 +0800 Subject: [PATCH 1/3] add infra to cpou upgrade extend the timeout of cucushift-upgrade-cpou-unpause-worker-mcp from 1h10m to 2h to support 120 worker nodes --- ...tly-x86-cpou-loaded-upgrade-from-4.12.yaml | 108 ++---- ...tly-x86-cpou-loaded-upgrade-from-4.14.yaml | 110 ++---- ...tly-x86-cpou-loaded-upgrade-from-4.16.yaml | 119 ++---- ...e-ocp-qe-perfscale-ci-main-presubmits.yaml | 354 ++---------------- ...t-upgrade-cpou-unpause-worker-mcp-ref.yaml | 2 +- 5 files changed, 118 insertions(+), 575 deletions(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml index c9671e70819c4..8a94e6c8daef9 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml @@ -28,59 +28,22 @@ resources: memory: 200Mi tests: - always_run: false - as: loaded-upgrade-412to414-3nodes - steps: - allow_skip_on_success: true - cluster_profile: aws-perfscale-qe - env: - BASE_DOMAIN: qe.devcluster.openshift.com - CHURN: "false" - CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge - GC: "false" - ITERATION_MULTIPLIER_ENV: "6" - ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - chain: ipi-install - test: - - as: set-upgrade-releases - commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge - dependencies: - - env: RELEASE_IMAGE_INTERMEDIATE - name: release:intermediate - - env: RELEASE_IMAGE_TARGET - name: release:target - from: cli - resources: - requests: - cpu: 100m - memory: 200Mi - - chain: openshift-qe-upgrade-max-unavailable - - chain: openshift-qe-cluster-density-v2 - - chain: openshift-upgrade-qe-sanity-cpou - timeout: 8h0m0s -- always_run: false - as: loaded-upgrade-ipsec-412to414-3nodes + as: loaded-upgrade-412to414-24nodes steps: allow_skip_on_success: true cluster_profile: aws-perfscale-qe env: BASE_DOMAIN: qe.devcluster.openshift.com CHURN: "false" + COMPUTE_NODE_REPLICAS: "24" CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge GC: "false" ITERATION_MULTIPLIER_ENV: "6" + MAX_UNAVAILABLE_WORKER: "3" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + PAUSED_MCP_NAME: worker + TIMEOUT: "150" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -97,9 +60,10 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws timeout: 8h0m0s - always_run: false - as: loaded-upgrade-412to414-24nodes + as: loaded-upgrade-ipsec-412to414-24nodes steps: allow_skip_on_success: true cluster_profile: aws-perfscale-qe @@ -111,13 +75,10 @@ tests: GC: "false" ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + PAUSED_MCP_NAME: worker + TIMEOUT: "150" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -134,28 +95,29 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws-ovn-ipsec timeout: 8h0m0s - always_run: false - as: loaded-upgrade-ipsec-412to414-24nodes + as: loaded-upgrade-412to414-120nodes steps: allow_skip_on_success: true - cluster_profile: aws-perfscale-qe + cluster_profile: aws-perfscale env: - BASE_DOMAIN: qe.devcluster.openshift.com + BASE_DOMAIN: perfscale.devcluster.openshift.com CHURN: "false" - COMPUTE_NODE_REPLICAS: "24" - CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge + COMPUTE_NODE_TYPE: m5.xlarge GC: "false" - ITERATION_MULTIPLIER_ENV: "6" - MAX_UNAVAILABLE_WORKER: "3" + ITERATION_MULTIPLIER_ENV: "9" + MAX_UNAVAILABLE_WORKER: "15" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge + PAUSED_MCP_NAME: worker + PROFILE_TYPE: reporting + SET_ENV_BY_PLATFORM: custom + SIZE_VARIANT: large + TIMEOUT: "150" + WORKER_REPLICA_COUNT: "120" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -169,9 +131,11 @@ tests: requests: cpu: 100m memory: 200Mi + - chain: workers-scale - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws timeout: 8h0m0s - always_run: false as: loaded-upgrade-ipsec-412to414-120nodes @@ -181,21 +145,19 @@ tests: env: BASE_DOMAIN: perfscale.devcluster.openshift.com CHURN: "false" - COMPUTE_NODE_REPLICAS: "120" COMPUTE_NODE_TYPE: m5.xlarge GC: "false" ITERATION_MULTIPLIER_ENV: "9" MAX_UNAVAILABLE_WORKER: "15" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge + PAUSED_MCP_NAME: worker PROFILE_TYPE: reporting + SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large + TIMEOUT: "150" + WORKER_REPLICA_COUNT: "120" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -209,9 +171,11 @@ tests: requests: cpu: 100m memory: 200Mi + - chain: workers-scale - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws-ovn-ipsec timeout: 8h0m0s zz_generated_metadata: branch: main diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml index 6cd9d2d8ff394..db1680d102da3 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml @@ -9,7 +9,7 @@ releases: architecture: amd64 product: ocp stream: nightly - version: "4.15" + version: "4.17" latest: release: architecture: amd64 @@ -28,59 +28,22 @@ resources: memory: 200Mi tests: - always_run: false - as: loaded-upgrade-414to416-3nodes - steps: - allow_skip_on_success: true - cluster_profile: aws-perfscale-qe - env: - BASE_DOMAIN: qe.devcluster.openshift.com - CHURN: "false" - CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge - GC: "false" - ITERATION_MULTIPLIER_ENV: "6" - ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - chain: ipi-install - test: - - as: set-upgrade-releases - commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge - dependencies: - - env: RELEASE_IMAGE_INTERMEDIATE - name: release:intermediate - - env: RELEASE_IMAGE_TARGET - name: release:target - from: cli - resources: - requests: - cpu: 100m - memory: 200Mi - - chain: openshift-qe-upgrade-max-unavailable - - chain: openshift-qe-cluster-density-v2 - - chain: openshift-upgrade-qe-sanity-cpou - timeout: 8h0m0s -- always_run: false - as: loaded-upgrade-ipsec-414to416-3nodes + as: loaded-upgrade-414to416-24nodes steps: allow_skip_on_success: true cluster_profile: aws-perfscale-qe env: BASE_DOMAIN: qe.devcluster.openshift.com CHURN: "false" + COMPUTE_NODE_REPLICAS: "24" CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge GC: "false" ITERATION_MULTIPLIER_ENV: "6" + MAX_UNAVAILABLE_WORKER: "3" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + PAUSED_MCP_NAME: worker + TIMEOUT: "150" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -97,9 +60,10 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws timeout: 8h0m0s - always_run: false - as: loaded-upgrade-414to416-24nodes + as: loaded-upgrade-ipsec-414to416-24nodes steps: allow_skip_on_success: true cluster_profile: aws-perfscale-qe @@ -111,13 +75,10 @@ tests: GC: "false" ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + PAUSED_MCP_NAME: worker + TIMEOUT: "150" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -134,28 +95,29 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws-ovn-ipsec timeout: 8h0m0s - always_run: false - as: loaded-upgrade-ipsec-414to416-24nodes + as: loaded-upgrade-414to416-120nodes steps: allow_skip_on_success: true - cluster_profile: aws-perfscale-qe + cluster_profile: aws-perfscale env: - BASE_DOMAIN: qe.devcluster.openshift.com + BASE_DOMAIN: perfscale.devcluster.openshift.com CHURN: "false" - COMPUTE_NODE_REPLICAS: "24" - CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge + COMPUTE_NODE_TYPE: m5.xlarge GC: "false" - ITERATION_MULTIPLIER_ENV: "6" - MAX_UNAVAILABLE_WORKER: "3" + ITERATION_MULTIPLIER_ENV: "9" + MAX_UNAVAILABLE_WORKER: "15" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge + PAUSED_MCP_NAME: worker + PROFILE_TYPE: reporting + SET_ENV_BY_PLATFORM: custom + SIZE_VARIANT: large + TIMEOUT: "150" + WORKER_REPLICA_COUNT: "120" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -169,9 +131,11 @@ tests: requests: cpu: 100m memory: 200Mi + - chain: workers-scale - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws timeout: 8h0m0s - always_run: false as: loaded-upgrade-ipsec-414to416-120nodes @@ -181,21 +145,19 @@ tests: env: BASE_DOMAIN: perfscale.devcluster.openshift.com CHURN: "false" - COMPUTE_NODE_REPLICAS: "120" COMPUTE_NODE_TYPE: m5.xlarge GC: "false" ITERATION_MULTIPLIER_ENV: "9" MAX_UNAVAILABLE_WORKER: "15" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge + PAUSED_MCP_NAME: worker PROFILE_TYPE: reporting + SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large + TIMEOUT: "150" + WORKER_REPLICA_COUNT: "120" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -209,9 +171,11 @@ tests: requests: cpu: 100m memory: 200Mi + - chain: workers-scale - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws-ovn-ipsec timeout: 8h0m0s zz_generated_metadata: branch: main diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml index c67f82b9cadd2..bbe9278d3cf44 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml @@ -27,77 +27,6 @@ resources: cpu: 100m memory: 200Mi tests: -- always_run: false - as: loaded-upgrade-416to418-3nodes - steps: - allow_skip_on_success: true - cluster_profile: aws-perfscale-qe - env: - BASE_DOMAIN: qe.devcluster.openshift.com - CHURN: "false" - CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge - GC: "false" - ITERATION_MULTIPLIER_ENV: "6" - ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - chain: ipi-install - test: - - as: set-upgrade-releases - commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge - dependencies: - - env: RELEASE_IMAGE_INTERMEDIATE - name: release:intermediate - - env: RELEASE_IMAGE_TARGET - name: release:target - from: cli - resources: - requests: - cpu: 100m - memory: 200Mi - - chain: openshift-qe-upgrade-max-unavailable - - chain: openshift-qe-cluster-density-v2 - - chain: openshift-upgrade-qe-sanity-cpou - timeout: 8h0m0s -- always_run: false - as: loaded-upgrade-ipsec-416to418-3nodes - steps: - allow_skip_on_success: true - cluster_profile: aws-perfscale-qe - env: - BASE_DOMAIN: qe.devcluster.openshift.com - CHURN: "false" - CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge - GC: "false" - ITERATION_MULTIPLIER_ENV: "6" - ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install - test: - - as: set-upgrade-releases - commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge - dependencies: - - env: RELEASE_IMAGE_INTERMEDIATE - name: release:intermediate - - env: RELEASE_IMAGE_TARGET - name: release:target - from: cli - resources: - requests: - cpu: 100m - memory: 200Mi - - chain: openshift-qe-upgrade-max-unavailable - - chain: openshift-qe-cluster-density-v2 - - chain: openshift-upgrade-qe-sanity-cpou - timeout: 8h0m0s - always_run: false as: loaded-upgrade-416to418-24nodes steps: @@ -111,13 +40,10 @@ tests: GC: "false" ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + PAUSED_MCP_NAME: worker + TIMEOUT: "150" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -134,6 +60,7 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws timeout: 8h0m0s - always_run: false as: loaded-upgrade-ipsec-416to418-24nodes @@ -148,14 +75,10 @@ tests: GC: "false" ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + PAUSED_MCP_NAME: worker + TIMEOUT: "150" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -172,6 +95,7 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws-ovn-ipsec timeout: 8h0m0s - always_run: false as: loaded-upgrade-416to418-120nodes @@ -185,16 +109,15 @@ tests: GC: "false" ITERATION_MULTIPLIER_ENV: "9" MAX_UNAVAILABLE_WORKER: "15" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge + PAUSED_MCP_NAME: worker PROFILE_TYPE: reporting + SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large + TIMEOUT: "150" WORKER_REPLICA_COUNT: "120" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -212,12 +135,13 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws timeout: 8h0m0s - always_run: false as: loaded-upgrade-ipsec-416to418-120nodes steps: allow_skip_on_success: true - cluster_profile: aws-qe + cluster_profile: aws-perfscale env: BASE_DOMAIN: perfscale.devcluster.openshift.com CHURN: "false" @@ -225,17 +149,15 @@ tests: GC: "false" ITERATION_MULTIPLIER_ENV: "9" MAX_UNAVAILABLE_WORKER: "15" + MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' + OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge + PAUSED_MCP_NAME: worker PROFILE_TYPE: reporting + SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large + TIMEOUT: "150" WORKER_REPLICA_COUNT: "120" ZONES_COUNT: "3" - post: - - chain: ipi-aws-post - pre: - - chain: ipi-conf-aws - - ref: ovn-conf - - ref: ovn-conf-ipsec-manifest - - chain: ipi-install test: - as: set-upgrade-releases commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_TARGET}" > ${SHARED_DIR}/upgrade-edge @@ -253,6 +175,7 @@ tests: - chain: openshift-qe-upgrade-max-unavailable - chain: openshift-qe-cluster-density-v2 - chain: openshift-upgrade-qe-sanity-cpou + workflow: openshift-qe-installer-aws-ovn-ipsec timeout: 8h0m0s zz_generated_metadata: branch: main diff --git a/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml b/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml index 7598aae3f5370..00a9b2674cca0 100644 --- a/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main-presubmits.yaml @@ -786,19 +786,19 @@ presubmits: - ^main$ - ^main- cluster: build10 - context: ci/prow/aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes + context: ci/prow/aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-120nodes decorate: true decoration_config: skip_cloning: true timeout: 8h0m0s labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe + ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale ci-operator.openshift.io/variant: aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes - rerun_command: /test aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes + name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-120nodes + rerun_command: /test aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-120nodes spec: containers: - args: @@ -807,7 +807,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=loaded-upgrade-412to414-24nodes + - --target=loaded-upgrade-412to414-120nodes - --variant=aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12 command: - ci-operator @@ -856,14 +856,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-120nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build10 - context: ci/prow/aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-3nodes + context: ci/prow/aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes decorate: true decoration_config: skip_cloning: true @@ -874,8 +874,8 @@ presubmits: ci-operator.openshift.io/variant: aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-3nodes - rerun_command: /test aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-3nodes + name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes + rerun_command: /test aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes spec: containers: - args: @@ -884,7 +884,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=loaded-upgrade-412to414-3nodes + - --target=loaded-upgrade-412to414-24nodes - --variant=aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12 command: - ci-operator @@ -933,7 +933,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-3nodes|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-412to414-24nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: @@ -1088,83 +1088,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-ipsec-412to414-24nodes|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-ipsec-412to414-3nodes - decorate: true - decoration_config: - skip_cloning: true - timeout: 8h0m0s - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe - ci-operator.openshift.io/variant: aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-ipsec-412to414-3nodes - rerun_command: /test aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-ipsec-412to414-3nodes - 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=loaded-upgrade-ipsec-412to414-3nodes - - --variant=aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - 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( | .* )(aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12-loaded-upgrade-ipsec-412to414-3nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: @@ -3823,19 +3746,19 @@ presubmits: - ^main$ - ^main- cluster: build10 - context: ci/prow/aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes + context: ci/prow/aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-120nodes decorate: true decoration_config: skip_cloning: true timeout: 8h0m0s labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe + ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale ci-operator.openshift.io/variant: aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes - rerun_command: /test aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes + name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-120nodes + rerun_command: /test aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-120nodes spec: containers: - args: @@ -3844,7 +3767,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=loaded-upgrade-414to416-24nodes + - --target=loaded-upgrade-414to416-120nodes - --variant=aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14 command: - ci-operator @@ -3893,14 +3816,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-120nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build10 - context: ci/prow/aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-3nodes + context: ci/prow/aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes decorate: true decoration_config: skip_cloning: true @@ -3911,8 +3834,8 @@ presubmits: ci-operator.openshift.io/variant: aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-3nodes - rerun_command: /test aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-3nodes + name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes + rerun_command: /test aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes spec: containers: - args: @@ -3921,7 +3844,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=loaded-upgrade-414to416-3nodes + - --target=loaded-upgrade-414to416-24nodes - --variant=aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14 command: - ci-operator @@ -3970,7 +3893,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-3nodes|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-414to416-24nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: @@ -4125,83 +4048,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-ipsec-414to416-24nodes|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-ipsec-414to416-3nodes - decorate: true - decoration_config: - skip_cloning: true - timeout: 8h0m0s - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe - ci-operator.openshift.io/variant: aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-ipsec-414to416-3nodes - rerun_command: /test aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-ipsec-414to416-3nodes - 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=loaded-upgrade-ipsec-414to416-3nodes - - --variant=aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - 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( | .* )(aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14-loaded-upgrade-ipsec-414to416-3nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: @@ -6461,83 +6307,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-416to418-24nodes|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-416to418-3nodes - decorate: true - decoration_config: - skip_cloning: true - timeout: 8h0m0s - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe - ci-operator.openshift.io/variant: aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-416to418-3nodes - rerun_command: /test aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-416to418-3nodes - 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=loaded-upgrade-416to418-3nodes - - --variant=aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - 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( | .* )(aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-416to418-3nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: @@ -6551,7 +6320,7 @@ presubmits: timeout: 8h0m0s labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-qe + ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale ci-operator.openshift.io/variant: aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -6692,83 +6461,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-ipsec-416to418-24nodes|remaining-required),?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-ipsec-416to418-3nodes - decorate: true - decoration_config: - skip_cloning: true - timeout: 8h0m0s - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale-qe - ci-operator.openshift.io/variant: aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-qe-ocp-qe-perfscale-ci-main-aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-ipsec-416to418-3nodes - rerun_command: /test aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-ipsec-416to418-3nodes - 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=loaded-upgrade-ipsec-416to418-3nodes - - --variant=aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - 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( | .* )(aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16-loaded-upgrade-ipsec-416to418-3nodes|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml b/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml index 0aff57b42d4d3..74bca3ae116ea 100644 --- a/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml +++ b/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml @@ -4,7 +4,7 @@ ref: namespace: ci name: verification-tests tag: latest - timeout: 1h10m + timeout: 2h grace_period: 10m commands: cucushift-upgrade-cpou-unpause-worker-mcp-commands.sh cli: latest From 3cbf22848f361e57c5a2933fa506fdbd42bb608f Mon Sep 17 00:00:00 2001 From: Qiujie Li Date: Fri, 6 Dec 2024 13:56:44 +0800 Subject: [PATCH 2/3] remove required-for-upgrade and pause infra mcp --- ...ws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml | 8 ++++---- ...ws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml | 8 ++++---- ...ws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml | 8 ++++---- .../openshift-qe-workers-infra-workload-commands.sh | 4 ---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml index 8a94e6c8daef9..79f889936a69b 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml @@ -41,7 +41,7 @@ tests: ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra TIMEOUT: "150" ZONES_COUNT: "3" test: @@ -76,7 +76,7 @@ tests: ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra TIMEOUT: "150" ZONES_COUNT: "3" test: @@ -111,7 +111,7 @@ tests: MAX_UNAVAILABLE_WORKER: "15" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra PROFILE_TYPE: reporting SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large @@ -151,7 +151,7 @@ tests: MAX_UNAVAILABLE_WORKER: "15" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra PROFILE_TYPE: reporting SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml index db1680d102da3..ff646a0d43c37 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml @@ -41,7 +41,7 @@ tests: ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra TIMEOUT: "150" ZONES_COUNT: "3" test: @@ -76,7 +76,7 @@ tests: ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra TIMEOUT: "150" ZONES_COUNT: "3" test: @@ -111,7 +111,7 @@ tests: MAX_UNAVAILABLE_WORKER: "15" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra PROFILE_TYPE: reporting SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large @@ -151,7 +151,7 @@ tests: MAX_UNAVAILABLE_WORKER: "15" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra PROFILE_TYPE: reporting SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml index bbe9278d3cf44..ec250c9c63321 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86-cpou-loaded-upgrade-from-4.16.yaml @@ -41,7 +41,7 @@ tests: ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra TIMEOUT: "150" ZONES_COUNT: "3" test: @@ -76,7 +76,7 @@ tests: ITERATION_MULTIPLIER_ENV: "6" MAX_UNAVAILABLE_WORKER: "3" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra TIMEOUT: "150" ZONES_COUNT: "3" test: @@ -111,7 +111,7 @@ tests: MAX_UNAVAILABLE_WORKER: "15" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra PROFILE_TYPE: reporting SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large @@ -151,7 +151,7 @@ tests: MAX_UNAVAILABLE_WORKER: "15" MCO_CONF_DAY2_CUSTOM_MCP: '[{"mcp_name": "infra"}]' OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: r5.4xlarge - PAUSED_MCP_NAME: worker + PAUSED_MCP_NAME: worker infra PROFILE_TYPE: reporting SET_ENV_BY_PLATFORM: custom SIZE_VARIANT: large diff --git a/ci-operator/step-registry/openshift-qe/workers-infra-workload/openshift-qe-workers-infra-workload-commands.sh b/ci-operator/step-registry/openshift-qe/workers-infra-workload/openshift-qe-workers-infra-workload-commands.sh index a65b72ad08148..0873b4fcf572d 100755 --- a/ci-operator/step-registry/openshift-qe/workers-infra-workload/openshift-qe-workers-infra-workload-commands.sh +++ b/ci-operator/step-registry/openshift-qe/workers-infra-workload/openshift-qe-workers-infra-workload-commands.sh @@ -468,8 +468,6 @@ apiVersion: machineconfiguration.openshift.io/v1 kind: MachineConfigPool metadata: name: infra - labels: - operator.machineconfiguration.openshift.io/required-for-upgrade: '' spec: machineConfigSelector: matchExpressions: @@ -484,8 +482,6 @@ apiVersion: machineconfiguration.openshift.io/v1 kind: MachineConfigPool metadata: name: workload - labels: - operator.machineconfiguration.openshift.io/required-for-upgrade: '' spec: machineConfigSelector: matchExpressions: From 4e3ba99cc4c0c1ec45504cef4ca68b64d7606893 Mon Sep 17 00:00:00 2001 From: Qiujie Li Date: Mon, 9 Dec 2024 09:15:53 +0800 Subject: [PATCH 3/3] update the timeout to 2h30m for 120 workers and 3 infra nodes cpou upgrade --- .../cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml b/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml index 74bca3ae116ea..a9a5284391b2a 100644 --- a/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml +++ b/ci-operator/step-registry/cucushift/upgrade/cpou/unpause-worker-mcp/cucushift-upgrade-cpou-unpause-worker-mcp-ref.yaml @@ -4,7 +4,7 @@ ref: namespace: ci name: verification-tests tag: latest - timeout: 2h + timeout: 2h30m grace_period: 10m commands: cucushift-upgrade-cpou-unpause-worker-mcp-commands.sh cli: latest