From 2164e37a48b1eb14d5835a8cef5adea90594a5ee Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Thu, 27 Feb 2025 12:07:39 -0500 Subject: [PATCH] Addressing PR comments Signed-off-by: Vishnu Challa --- .../cloud-bulldozer-e2e-benchmarking-master.yaml | 7 +++++-- ...cloud-bulldozer-e2e-benchmarking-master-presubmits.yaml | 4 ++-- ci-operator/step-registry/cloud-bulldozer/OWNERS | 6 ------ ...r-e2e-benchmarking-cluster-density-v2-ref.metadata.json | 6 ------ ...ulldozer-e2e-benchmarking-conc-builds-ref.metadata.json | 6 ------ ...lldozer-e2e-benchmarking-ingress-perf-ref.metadata.json | 6 ------ ...dozer-e2e-benchmarking-network-policy-ref.metadata.json | 6 ------ ...ldozer-e2e-benchmarking-network-smoke-ref.metadata.json | 6 ------ ...zer-e2e-benchmarking-node-density-cni-ref.metadata.json | 6 ------ ...r-e2e-benchmarking-node-density-heavy-ref.metadata.json | 6 ------ ...lldozer-e2e-benchmarking-node-density-ref.metadata.json | 6 ------ .../cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh | 5 +---- ...d-bulldozer-e2e-benchmarking-rds-core-ref.metadata.json | 6 ------ .../cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml | 4 ++++ ...ulldozer-e2e-benchmarking-router-perf-ref.metadata.json | 6 ------ ...zer-e2e-benchmarking-udn-density-pods-ref.metadata.json | 6 ------ 16 files changed, 12 insertions(+), 80 deletions(-) diff --git a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master.yaml b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master.yaml index 48b535fc897f..0abb1287a864 100644 --- a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master.yaml +++ b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master.yaml @@ -294,12 +294,15 @@ tests: - intranet restrict_network_access: false steps: - cluster_profile: metal-perscale-cpt + cluster_profile: metal-perfscale-jetlag env: BAREMETAL: "true" + BASTION_CP_INTERFACE: ens7f1 CRUCIBLE: "false" - HUGEPAGES_COUNT: "1024" + LAB_CLOUD: cloud19 + LAB_INTERFACE: eno3 LABEL: node-role.kubernetes.io/worker-dpdk + NUM_WORKER_NODES: "2" OCP_BUILD: dev OCP_VERSION: latest test: diff --git a/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master-presubmits.yaml b/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master-presubmits.yaml index 67a42c5895cc..c005915656f7 100644 --- a/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master-presubmits.yaml +++ b/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master-presubmits.yaml @@ -612,8 +612,8 @@ presubmits: skip_cloning: true labels: capability/intranet: intranet - ci-operator.openshift.io/cloud: metal-perscale-cpt - ci-operator.openshift.io/cloud-cluster-profile: metal-perscale-cpt + ci-operator.openshift.io/cloud: metal-perfscale-jetlag + ci-operator.openshift.io/cloud-cluster-profile: metal-perfscale-jetlag ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/step-registry/cloud-bulldozer/OWNERS b/ci-operator/step-registry/cloud-bulldozer/OWNERS index 9884bf051bdb..d65f26cc2097 100644 --- a/ci-operator/step-registry/cloud-bulldozer/OWNERS +++ b/ci-operator/step-registry/cloud-bulldozer/OWNERS @@ -1,26 +1,20 @@ approvers: - jtaleric - rsevilla87 -- dry923 - venkataanil - afcollins -- krishvoor - mukrishn - mohit-sheth - morenod - chentex -- mrbojangles3 - vishnuchalla reviewers: - jtaleric - rsevilla87 -- dry923 - venkataanil - afcollins -- krishvoor - mukrishn - mohit-sheth - morenod - chentex -- mrbojangles3 - vishnuchalla \ No newline at end of file diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/cluster-density-v2/cloud-bulldozer-e2e-benchmarking-cluster-density-v2-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/cluster-density-v2/cloud-bulldozer-e2e-benchmarking-cluster-density-v2-ref.metadata.json index 99a1913c129f..48c18f5f1ce8 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/cluster-density-v2/cloud-bulldozer-e2e-benchmarking-cluster-density-v2-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/cluster-density-v2/cloud-bulldozer-e2e-benchmarking-cluster-density-v2-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/conc-builds/cloud-bulldozer-e2e-benchmarking-conc-builds-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/conc-builds/cloud-bulldozer-e2e-benchmarking-conc-builds-ref.metadata.json index 989218c8b22d..599856612dda 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/conc-builds/cloud-bulldozer-e2e-benchmarking-conc-builds-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/conc-builds/cloud-bulldozer-e2e-benchmarking-conc-builds-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/ingress-perf/cloud-bulldozer-e2e-benchmarking-ingress-perf-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/ingress-perf/cloud-bulldozer-e2e-benchmarking-ingress-perf-ref.metadata.json index edb769c757b5..af5b9a60dc14 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/ingress-perf/cloud-bulldozer-e2e-benchmarking-ingress-perf-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/ingress-perf/cloud-bulldozer-e2e-benchmarking-ingress-perf-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-policy/cloud-bulldozer-e2e-benchmarking-network-policy-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-policy/cloud-bulldozer-e2e-benchmarking-network-policy-ref.metadata.json index 468d664ad590..ba0a5438ad73 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-policy/cloud-bulldozer-e2e-benchmarking-network-policy-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-policy/cloud-bulldozer-e2e-benchmarking-network-policy-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-smoke/cloud-bulldozer-e2e-benchmarking-network-smoke-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-smoke/cloud-bulldozer-e2e-benchmarking-network-smoke-ref.metadata.json index e256a95547d0..82a9545a75ab 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-smoke/cloud-bulldozer-e2e-benchmarking-network-smoke-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/network-smoke/cloud-bulldozer-e2e-benchmarking-network-smoke-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-cni/cloud-bulldozer-e2e-benchmarking-node-density-cni-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-cni/cloud-bulldozer-e2e-benchmarking-node-density-cni-ref.metadata.json index 1dfb6f3614a7..ec2a9716b3b8 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-cni/cloud-bulldozer-e2e-benchmarking-node-density-cni-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-cni/cloud-bulldozer-e2e-benchmarking-node-density-cni-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-heavy/cloud-bulldozer-e2e-benchmarking-node-density-heavy-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-heavy/cloud-bulldozer-e2e-benchmarking-node-density-heavy-ref.metadata.json index 4cc5651bf2ac..e88546c63579 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-heavy/cloud-bulldozer-e2e-benchmarking-node-density-heavy-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density-heavy/cloud-bulldozer-e2e-benchmarking-node-density-heavy-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density/cloud-bulldozer-e2e-benchmarking-node-density-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density/cloud-bulldozer-e2e-benchmarking-node-density-ref.metadata.json index f78539ee5b88..8269a4bb5bcb 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density/cloud-bulldozer-e2e-benchmarking-node-density-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/node-density/cloud-bulldozer-e2e-benchmarking-node-density-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh index e2ba529a962d..347a3e666a7c 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh @@ -8,12 +8,9 @@ oc config view oc projects pushd /tmp - git clone https://github.com/vishnuchalla/e2e-benchmarking --branch v0.0.1 --depth 1 pushd e2e-benchmarking pushd workloads/kube-burner-ocp-wrapper export WORKLOAD=rds-core - current_worker_count=$(oc get nodes --no-headers -l node-role.kubernetes.io/worker=,node-role.kubernetes.io/infra!=,node-role.kubernetes.io/workload!= --output jsonpath="{.items[?(@.status.conditions[-1].type=='Ready')].status.conditions[-1].type}" | wc -w | xargs) - -ES_SERVER="" ITERATIONS=${current_worker_count} CHURN=false ./run.sh +ES_SERVER="" ITERATIONS=${current_worker_count} CHURN=false ./run.sh \ No newline at end of file diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.metadata.json index 7b56ec88d1ad..ac7b412d9c02 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml index 83717d4c4261..18827a72aeaf 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml @@ -6,6 +6,10 @@ ref: tag: latest cli: latest commands: cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh + credentials: + - namespace: test-credentials + name: perfscale-metal-bastion + mount_path: /bm timeout: 6h resources: requests: diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/router-perf/cloud-bulldozer-e2e-benchmarking-router-perf-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/router-perf/cloud-bulldozer-e2e-benchmarking-router-perf-ref.metadata.json index 823761a13927..e5cef422101f 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/router-perf/cloud-bulldozer-e2e-benchmarking-router-perf-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/router-perf/cloud-bulldozer-e2e-benchmarking-router-perf-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] } diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/udn-density-pods/cloud-bulldozer-e2e-benchmarking-udn-density-pods-ref.metadata.json b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/udn-density-pods/cloud-bulldozer-e2e-benchmarking-udn-density-pods-ref.metadata.json index 9f5d4b5dbcb1..66ed37ebe3f0 100644 --- a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/udn-density-pods/cloud-bulldozer-e2e-benchmarking-udn-density-pods-ref.metadata.json +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/udn-density-pods/cloud-bulldozer-e2e-benchmarking-udn-density-pods-ref.metadata.json @@ -4,29 +4,23 @@ "approvers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ], "reviewers": [ "jtaleric", "rsevilla87", - "dry923", "venkataanil", "afcollins", - "krishvoor", "mukrishn", "mohit-sheth", "morenod", "chentex", - "mrbojangles3", "vishnuchalla" ] }