Skip to content

add infra to cpou upgrade #58965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Dec 12, 2024
Merged

add infra to cpou upgrade #58965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3487609
add infra to cpou upgrade
qiliRedHat Nov 19, 2024
3cbf228
remove required-for-upgrade and pause infra mcp
qiliRedHat Dec 6, 2024
4e3ba99
update the timeout to 2h30m for 120 workers and 3 infra nodes cpou up…
qiliRedHat Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 36 additions & 72 deletions ...hift-qe-ocp-qe-perfscale-ci-main__aws-4.14-nightly-x86-cpou-loaded-upgrade-from-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 infra
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
Expand All @@ -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
Expand All @@ -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 infra
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
Expand All @@ -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 infra
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
Expand All @@ -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
Expand All @@ -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 infra
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
Expand All @@ -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
Expand Down
110 changes: 37 additions & 73 deletions ...hift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86-cpou-loaded-upgrade-from-4.14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ releases:
architecture: amd64
product: ocp
stream: nightly
version: "4.15"
version: "4.17"
latest:
release:
architecture: amd64
Expand All @@ -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 infra
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
Expand All @@ -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
Expand All @@ -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 infra
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
Expand All @@ -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 infra
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
Expand All @@ -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
Expand All @@ -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 infra
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
Expand All @@ -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
Expand Down
Loading