From 7af39cea4ffbe53d027efe528c72c9f9622a0e7f Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Thu, 27 Feb 2025 09:44:15 -0500 Subject: [PATCH 1/9] Adding rds-core to e2e-ci Signed-off-by: Vishnu Challa --- ...oud-bulldozer-e2e-benchmarking-master.yaml | 27 +++++- ...er-e2e-benchmarking-master-presubmits.yaml | 96 +++++++++++++++++-- .../e2e-benchmarking/rds-core/OWNERS | 1 + ...ozer-e2e-benchmarking-rds-core-commands.sh | 19 ++++ ...2e-benchmarking-rds-core-ref.metadata.json | 33 +++++++ ...lldozer-e2e-benchmarking-rds-core-ref.yaml | 15 +++ 6 files changed, 179 insertions(+), 12 deletions(-) create mode 120000 ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/OWNERS create mode 100644 ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh create mode 100644 ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.metadata.json create mode 100644 ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml 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 8b9ff285e6f30..48b535fc897f0 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 @@ -236,7 +236,7 @@ tests: - ref: cloud-bulldozer-e2e-benchmarking-router-perf workflow: openshift-qe-installer-aws - always_run: false - as: e2e-udn-density-pods-l3 + as: e2e-udn-density-pods-l3-single-node steps: allow_skip_on_success: true cluster_profile: aws-perfscale @@ -262,7 +262,7 @@ tests: - ref: cloud-bulldozer-e2e-benchmarking-udn-density-pods workflow: openshift-qe-installer-aws - always_run: false - as: e2e-udn-density-pods-l2 + as: e2e-udn-density-pods-l2-single-node steps: allow_skip_on_success: true cluster_profile: aws-perfscale @@ -288,6 +288,29 @@ tests: test: - ref: cloud-bulldozer-e2e-benchmarking-udn-density-pods workflow: openshift-qe-installer-aws +- always_run: false + as: e2e-rds-core-single-node + capabilities: + - intranet + restrict_network_access: false + steps: + cluster_profile: metal-perscale-cpt + env: + BAREMETAL: "true" + CRUCIBLE: "false" + HUGEPAGES_COUNT: "1024" + LABEL: node-role.kubernetes.io/worker-dpdk + OCP_BUILD: dev + OCP_VERSION: latest + test: + - chain: openshift-qe-installer-bm-ping + - chain: openshift-qe-installer-bm-deploy + - chain: openshift-qe-cluster-health + - chain: openshift-qe-installer-bm-day2-label + - chain: openshift-qe-installer-bm-day2-sriov + - chain: openshift-qe-installer-bm-day2-metallb + - chain: openshift-qe-installer-bm-day2-perf-profile-rds-core + - ref: cloud-bulldozer-e2e-benchmarking-rds-core zz_generated_metadata: branch: master org: cloud-bulldozer 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 04a4e0633cf06..67a42c5895cce 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 @@ -600,6 +600,82 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(e2e-node-density-single-node|remaining-required),?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/e2e-rds-core-single-node + decorate: true + decoration_config: + 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.openshift.io/generator: prowgen + job-release: "4.18" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-cloud-bulldozer-e2e-benchmarking-master-e2e-rds-core-single-node + rerun_command: /test e2e-rds-core-single-node + 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-rds-core-single-node + 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( | .* )(e2e-rds-core-single-node|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: @@ -681,7 +757,7 @@ presubmits: - ^master$ - ^master- cluster: build11 - context: ci/prow/e2e-udn-density-pods-l2 + context: ci/prow/e2e-udn-density-pods-l2-single-node decorate: true decoration_config: skip_cloning: true @@ -691,8 +767,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-cloud-bulldozer-e2e-benchmarking-master-e2e-udn-density-pods-l2 - rerun_command: /test e2e-udn-density-pods-l2 + name: pull-ci-cloud-bulldozer-e2e-benchmarking-master-e2e-udn-density-pods-l2-single-node + rerun_command: /test e2e-udn-density-pods-l2-single-node spec: containers: - args: @@ -701,7 +777,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-udn-density-pods-l2 + - --target=e2e-udn-density-pods-l2-single-node command: - ci-operator image: ci-operator:latest @@ -749,14 +825,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(e2e-udn-density-pods-l2|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(e2e-udn-density-pods-l2-single-node|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: - ^master$ - ^master- cluster: build11 - context: ci/prow/e2e-udn-density-pods-l3 + context: ci/prow/e2e-udn-density-pods-l3-single-node decorate: true decoration_config: skip_cloning: true @@ -766,8 +842,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-cloud-bulldozer-e2e-benchmarking-master-e2e-udn-density-pods-l3 - rerun_command: /test e2e-udn-density-pods-l3 + name: pull-ci-cloud-bulldozer-e2e-benchmarking-master-e2e-udn-density-pods-l3-single-node + rerun_command: /test e2e-udn-density-pods-l3-single-node spec: containers: - args: @@ -776,7 +852,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-udn-density-pods-l3 + - --target=e2e-udn-density-pods-l3-single-node command: - ci-operator image: ci-operator:latest @@ -824,4 +900,4 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(e2e-udn-density-pods-l3|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(e2e-udn-density-pods-l3-single-node|remaining-required),?($|\s.*) diff --git a/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/OWNERS b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/OWNERS @@ -0,0 +1 @@ +../OWNERS \ 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-commands.sh b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh new file mode 100644 index 0000000000000..e2ba529a962d2 --- /dev/null +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh @@ -0,0 +1,19 @@ +#!/bin/bash +set -o errexit +set -o nounset +set -o pipefail +set -x +cat /etc/os-release +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 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 new file mode 100644 index 0000000000000..7b56ec88d1ad7 --- /dev/null +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.metadata.json @@ -0,0 +1,33 @@ +{ + "path": "cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml", + "owners": { + "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/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 new file mode 100644 index 0000000000000..83717d4c42612 --- /dev/null +++ b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml @@ -0,0 +1,15 @@ +ref: + as: cloud-bulldozer-e2e-benchmarking-rds-core + from_image: + namespace: e2e + name: e2e-benchmarking + tag: latest + cli: latest + commands: cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh + timeout: 6h + resources: + requests: + cpu: 100m + memory: 100Mi + documentation: >- + This step runs the perfscale configmap-scale workload in the deployed cluster \ No newline at end of file From 2164e37a48b1eb14d5835a8cef5adea90594a5ee Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Thu, 27 Feb 2025 12:07:39 -0500 Subject: [PATCH 2/9] 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 48b535fc897f0..0abb1287a8646 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 67a42c5895cce..c005915656f74 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 9884bf051bdba..d65f26cc20979 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 99a1913c129fc..48c18f5f1ce88 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 989218c8b22db..599856612dda8 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 edb769c757b5b..af5b9a60dc14f 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 468d664ad5907..ba0a5438ad73c 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 e256a95547d06..82a9545a75aba 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 1dfb6f3614a76..ec2a9716b3b83 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 4cc5651bf2acf..e88546c635792 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 f78539ee5b886..8269a4bb5bcbf 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 e2ba529a962d2..347a3e666a7c9 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 7b56ec88d1ad7..ac7b412d9c024 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 83717d4c42612..18827a72aeaf6 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 823761a139274..e5cef422101fc 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 9f5d4b5dbcb15..66ed37ebe3f07 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" ] } From a9b868df9f37ff02e5c6073fb6294b3dd1cba306 Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Mon, 3 Mar 2025 18:05:23 -0500 Subject: [PATCH 3/9] Updating secret for rds-core Signed-off-by: Vishnu Challa --- .../cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml | 3 +++ 1 file changed, 3 insertions(+) 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 18827a72aeaf6..dc04352b14ec1 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 @@ -7,6 +7,9 @@ ref: cli: latest commands: cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh credentials: + - namespace: test-credentials + name: cluster-secrets-metal-perscale-cpt + mount_path: /secret - namespace: test-credentials name: perfscale-metal-bastion mount_path: /bm From 6dccb5f4c7ba4e84a0c64f6081d41a1ec2c5f7c6 Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Mon, 3 Mar 2025 22:08:45 -0500 Subject: [PATCH 4/9] Updating to jetlag secret Signed-off-by: Vishnu Challa --- .../rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dc04352b14ec1..ffb20023cda17 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 @@ -8,7 +8,7 @@ ref: commands: cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh credentials: - namespace: test-credentials - name: cluster-secrets-metal-perscale-cpt + name: cluster-secrets-metal-perscale-jetlag mount_path: /secret - namespace: test-credentials name: perfscale-metal-bastion From bd526f736b97fb8f7f9d8d2322081331449ddeeb Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Tue, 4 Mar 2025 16:20:11 -0500 Subject: [PATCH 5/9] fixing shell-check bug Signed-off-by: Vishnu Challa --- .../cloud-bulldozer-e2e-benchmarking-master_metal.yaml | 3 ++- .../cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml | 3 --- .../label/openshift-qe-installer-bm-day2-label-commands.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml index 99514a23edbab..f25594ebc9620 100644 --- a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml +++ b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml @@ -30,7 +30,7 @@ tests: cluster_profile: metal-perfscale-jetlag env: BAREMETAL: "true" - BASTION_CP_INTERFACE: ens7f1 + BASTION_CP_INTERFACE: eno1 CRUCIBLE: "false" ISOLATED_CORES: 2-39,42-79 LAB_CLOUD: cloud19 @@ -38,6 +38,7 @@ tests: LABEL: node-role.kubernetes.io/worker-dpdk,node-role.kubernetes.io/worker-metallb OCP_BUILD: dev OCP_VERSION: latest + PUBLIC_VLAN: "true" RESERVED_CORES: 0,40,1,41 SRIOV_NUM_VFS: "64" SRIOV_PF_NAME: ens7f0 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 ffb20023cda17..948f91f77a4bc 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 @@ -10,9 +10,6 @@ ref: - namespace: test-credentials name: cluster-secrets-metal-perscale-jetlag mount_path: /secret - - namespace: test-credentials - name: perfscale-metal-bastion - mount_path: /bm timeout: 6h resources: requests: diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh index 2957611eb4a4a..26774a70e26f3 100644 --- a/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh +++ b/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh @@ -38,7 +38,7 @@ if [ ${TELCO} == "true" ]; then for label in $(echo "${LABEL}" | tr ',' '\n' | sed 's/^ *//;s/ *$//'); do if [ -n "$label" ]; then echo "Applying label: $label to node: $node" - oc label node "$node" "$label"="" --overwrite + oc label node "$node" "$label=" --overwrite fi done done From e05af5387474d814581ebc253158e11c5cba931c Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Wed, 5 Mar 2025 14:13:27 -0500 Subject: [PATCH 6/9] Adding JETLAG_BRANCH to be main Signed-off-by: Vishnu Challa --- .../cloud-bulldozer-e2e-benchmarking-master_metal.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml index f25594ebc9620..8c93001d54818 100644 --- a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml +++ b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml @@ -33,6 +33,7 @@ tests: BASTION_CP_INTERFACE: eno1 CRUCIBLE: "false" ISOLATED_CORES: 2-39,42-79 + JETLAG_BRANCH: main LAB_CLOUD: cloud19 LAB_INTERFACE: eno3 LABEL: node-role.kubernetes.io/worker-dpdk,node-role.kubernetes.io/worker-metallb From 8373e6cfbdbf34859d960787995c8f4e856fcf36 Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Wed, 5 Mar 2025 18:57:29 -0500 Subject: [PATCH 7/9] Updating bastion cp interface for jetlag --- ...lldozer-e2e-benchmarking-master_metal.yaml | 12 ++++--- ...-benchmarking-master_metal-presubmits.yaml | 10 +++--- ...ozer-e2e-benchmarking-rds-core-commands.sh | 31 +++++++++++++++++-- ...lldozer-e2e-benchmarking-rds-core-ref.yaml | 16 ++++++++-- ...ift-qe-installer-bm-day2-label-commands.sh | 10 ++++-- ...t-qe-installer-bm-day2-metallb-commands.sh | 10 ++++-- ...-bm-day2-perf-profile-rds-core-commands.sh | 11 +++++-- ...ift-qe-installer-bm-day2-sriov-commands.sh | 10 ++++-- ...enshift-qe-installer-bm-deploy-commands.sh | 1 - 9 files changed, 84 insertions(+), 27 deletions(-) diff --git a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml index 8c93001d54818..31c3c812bf98c 100644 --- a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml +++ b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml @@ -22,7 +22,7 @@ resources: memory: 200Mi tests: - always_run: false - as: e2e-rds-core-single-node + as: e2e-rds-core-mno capabilities: - intranet restrict_network_access: false @@ -30,19 +30,21 @@ tests: cluster_profile: metal-perfscale-jetlag env: BAREMETAL: "true" - BASTION_CP_INTERFACE: eno1 + BASTION_CP_INTERFACE: ens7f1 CRUCIBLE: "false" ISOLATED_CORES: 2-39,42-79 JETLAG_BRANCH: main LAB_CLOUD: cloud19 LAB_INTERFACE: eno3 - LABEL: node-role.kubernetes.io/worker-dpdk,node-role.kubernetes.io/worker-metallb - OCP_BUILD: dev - OCP_VERSION: latest + LABEL: node-role.kubernetes.io/worker-dpdk,node-role.kubernetes.io/worker-metallb,node-role.kubernetes.io/worker-spk + OCP_BUILD: ga + OCP_VERSION: 4.18.5 PUBLIC_VLAN: "true" RESERVED_CORES: 0,40,1,41 + SRIOV_NODE_SELECTOR: node-role.kubernetes.io/worker SRIOV_NUM_VFS: "64" SRIOV_PF_NAME: ens7f0 + TELCO: "true" test: - chain: openshift-qe-installer-bm-ping - chain: openshift-qe-installer-bm-deploy diff --git a/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml b/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml index a3b8270a9ae90..6db65d669500c 100644 --- a/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml +++ b/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml @@ -6,7 +6,7 @@ presubmits: - ^master_metal$ - ^master_metal- cluster: build06 - context: ci/prow/e2e-rds-core-single-node + context: ci/prow/e2e-rds-core-mno decorate: true decoration_config: skip_cloning: true @@ -17,8 +17,8 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-cloud-bulldozer-e2e-benchmarking-master_metal-e2e-rds-core-single-node - rerun_command: /test e2e-rds-core-single-node + name: pull-ci-cloud-bulldozer-e2e-benchmarking-master_metal-e2e-rds-core-mno + rerun_command: /test e2e-rds-core-mno spec: containers: - args: @@ -27,7 +27,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-rds-core-single-node + - --target=e2e-rds-core-mno command: - ci-operator image: ci-operator:latest @@ -75,4 +75,4 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )(e2e-rds-core-single-node|remaining-required),?($|\s.*) + trigger: (?m)^/test( | .* )(e2e-rds-core-mno|remaining-required),?($|\s.*) 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 6ee9aa0f2f57f..8c07a66612c0e 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 @@ -4,12 +4,39 @@ set -o nounset set -o pipefail set -x cat /etc/os-release + +if [ ${BAREMETAL} == "true" ]; then + SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null" + bastion="$(cat /bm/address)" + # Copy over the kubeconfig + if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then + ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + export KUBECONFIG=/tmp/kubeconfig + else + export KUBECONFIG=${SHARED_DIR}/kubeconfig + fi + # Setup socks proxy + ssh ${SSH_ARGS} root@$bastion -fNT -D 12345 + export https_proxy=socks5://localhost:12345 + export http_proxy=socks5://localhost:12345 + oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345 +fi + +python --version +pushd /tmp +python -m virtualenv ./venv_qe +source ./venv_qe/bin/activate + 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 -ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false ./run.sh \ No newline at end of file +ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false ./run.sh + +if [ ${BAREMETAL} == "true" ]; then + # kill the ssh tunnel so the job completes + pkill ssh +fi \ 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.yaml b/ci-operator/step-registry/cloud-bulldozer/e2e-benchmarking/rds-core/cloud-bulldozer-e2e-benchmarking-rds-core-ref.yaml index 948f91f77a4bc..cf7439c6879dd 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 @@ -10,10 +10,22 @@ ref: - namespace: test-credentials name: cluster-secrets-metal-perscale-jetlag mount_path: /secret + - namespace: test-credentials + name: perfscale-metal-bastion + mount_path: /bm timeout: 6h resources: requests: cpu: 100m - memory: 100Mi + memory: 100Mi documentation: >- - This step runs the perfscale configmap-scale workload in the deployed cluster \ No newline at end of file + This step runs the perfscale rds-core workload in the deployed cluster + env: + - name: BAREMETAL + default: "true" + documentation: |- + Set to true if the job is for baremetal + - name: KUBECONFIG_PATH + default: "~/mno/kubeconfig" + documentation: |- + Set kubeconfig path inside the bm, default to ~/mno/kubeconfig \ No newline at end of file diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh index 26774a70e26f3..30dd858df10b8 100644 --- a/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh +++ b/ci-operator/step-registry/openshift-qe/installer/bm/day2/label/openshift-qe-installer-bm-day2-label-commands.sh @@ -9,13 +9,17 @@ if [ ${BAREMETAL} == "true" ]; then SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null" bastion="$(cat /bm/address)" # Copy over the kubeconfig - ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then + ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + export KUBECONFIG=/tmp/kubeconfig + else + export KUBECONFIG=${SHARED_DIR}/kubeconfig + fi # Setup socks proxy ssh ${SSH_ARGS} root@$bastion -fNT -D 12345 - export KUBECONFIG=/tmp/kubeconfig export https_proxy=socks5://localhost:12345 export http_proxy=socks5://localhost:12345 - oc --kubeconfig=/tmp/kubeconfig config set-cluster bm --proxy-url=socks5://localhost:12345 + oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345 fi oc config view diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/day2/metallb/openshift-qe-installer-bm-day2-metallb-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/day2/metallb/openshift-qe-installer-bm-day2-metallb-commands.sh index ed0c75fc446c0..3e92b5b233163 100644 --- a/ci-operator/step-registry/openshift-qe/installer/bm/day2/metallb/openshift-qe-installer-bm-day2-metallb-commands.sh +++ b/ci-operator/step-registry/openshift-qe/installer/bm/day2/metallb/openshift-qe-installer-bm-day2-metallb-commands.sh @@ -9,13 +9,17 @@ if [ ${BAREMETAL} == "true" ]; then SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null" bastion="$(cat /bm/address)" # Copy over the kubeconfig - ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then + ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + export KUBECONFIG=/tmp/kubeconfig + else + export KUBECONFIG=${SHARED_DIR}/kubeconfig + fi # Setup socks proxy ssh ${SSH_ARGS} root@$bastion -fNT -D 12345 - export KUBECONFIG=/tmp/kubeconfig export https_proxy=socks5://localhost:12345 export http_proxy=socks5://localhost:12345 - oc --kubeconfig=/tmp/kubeconfig config set-cluster bm --proxy-url=socks5://localhost:12345 + oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345 fi oc config view diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh index 691b003f69de1..4f030198137f2 100644 --- a/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh +++ b/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh @@ -9,13 +9,17 @@ if [ ${BAREMETAL} == "true" ]; then SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null" bastion="$(cat /bm/address)" # Copy over the kubeconfig - ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then + ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + export KUBECONFIG=/tmp/kubeconfig + else + export KUBECONFIG=${SHARED_DIR}/kubeconfig + fi # Setup socks proxy ssh ${SSH_ARGS} root@$bastion -fNT -D 12345 - export KUBECONFIG=/tmp/kubeconfig export https_proxy=socks5://localhost:12345 export http_proxy=socks5://localhost:12345 - oc --kubeconfig=/tmp/kubeconfig config set-cluster bm --proxy-url=socks5://localhost:12345 + oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345 fi oc config view @@ -62,6 +66,7 @@ EOF sleep 60 kubectl wait --for jsonpath='{.status.updatedMachineCount}'="$(oc get node --no-headers -l node-role.kubernetes.io/worker= | wc -l)" --timeout=30m mcp worker +oc adm wait-for-stable-cluster --minimum-stable-period=2m --timeout=20m if [ ${BAREMETAL} == "true" ]; then # kill the ssh tunnel so the job completes diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/day2/sriov/openshift-qe-installer-bm-day2-sriov-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/day2/sriov/openshift-qe-installer-bm-day2-sriov-commands.sh index da60337d32d70..0e7ed31eaee80 100644 --- a/ci-operator/step-registry/openshift-qe/installer/bm/day2/sriov/openshift-qe-installer-bm-day2-sriov-commands.sh +++ b/ci-operator/step-registry/openshift-qe/installer/bm/day2/sriov/openshift-qe-installer-bm-day2-sriov-commands.sh @@ -9,13 +9,17 @@ if [ ${BAREMETAL} == "true" ]; then SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null" bastion="$(cat /bm/address)" # Copy over the kubeconfig - ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then + ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + export KUBECONFIG=/tmp/kubeconfig + else + export KUBECONFIG=${SHARED_DIR}/kubeconfig + fi # Setup socks proxy ssh ${SSH_ARGS} root@$bastion -fNT -D 12345 - export KUBECONFIG=/tmp/kubeconfig export https_proxy=socks5://localhost:12345 export http_proxy=socks5://localhost:12345 - oc --kubeconfig=/tmp/kubeconfig config set-cluster bm --proxy-url=socks5://localhost:12345 + oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345 fi oc config view diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh index 3bfd20ed0a197..0099886281216 100644 --- a/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh +++ b/ci-operator/step-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh @@ -24,7 +24,6 @@ worker_node_count: $NUM_WORKER_NODES sno_node_count: $NUM_SNO_NODES ocp_version: $OCP_VERSION ocp_build: $OCP_BUILD -networktype: OVNKubernetes public_vlan: $PUBLIC_VLAN enable_fips: $FIPS ssh_private_key_file: ~/.ssh/id_rsa From 8d92af5b928a30772746deadc67e80770fb50778 Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Tue, 18 Mar 2025 10:54:13 -0400 Subject: [PATCH 8/9] Adding performance profile to rds-core Signed-off-by: Vishnu Challa --- .../cloud-bulldozer-e2e-benchmarking-rds-core-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8c07a66612c0e..0116c7820ea8d 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 @@ -34,7 +34,7 @@ git clone https://github.com/vishnuchalla/e2e-benchmarking --branch v0.0.1 --dep pushd e2e-benchmarking pushd workloads/kube-burner-ocp-wrapper export WORKLOAD=rds-core -ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false ./run.sh +ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false PERFORMANCE_PROFILE="cpt-pao" ./run.sh if [ ${BAREMETAL} == "true" ]; then # kill the ssh tunnel so the job completes From 6062a0ba2942f62c0a5f73bd98454ca2661e8b65 Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Tue, 18 Mar 2025 14:35:05 -0400 Subject: [PATCH 9/9] updating rds-core to work through PRs Signed-off-by: Vishnu Challa --- ...oud-bulldozer-e2e-benchmarking-master.yaml | 33 ++++++++ ...lldozer-e2e-benchmarking-master_metal.yaml | 60 -------------- ...er-e2e-benchmarking-master-presubmits.yaml | 76 ++++++++++++++++++ ...-benchmarking-master_metal-presubmits.yaml | 78 ------------------- ...ozer-e2e-benchmarking-rds-core-commands.sh | 67 ++++++++-------- ...-bm-day2-perf-profile-rds-core-commands.sh | 1 - 6 files changed, 144 insertions(+), 171 deletions(-) delete mode 100644 ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml delete mode 100644 ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml 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 a5cf405a6c48e..87fa8430667c1 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 @@ -473,6 +473,39 @@ tests: test: - ref: cloud-bulldozer-e2e-benchmarking-egressip workflow: openshift-qe-installer-aws +- always_run: false + as: e2e-rds-core-mno + capabilities: + - intranet + restrict_network_access: false + steps: + cluster_profile: metal-perfscale-jetlag + env: + BAREMETAL: "true" + BASTION_CP_INTERFACE: ens7f1 + CRUCIBLE: "false" + ISOLATED_CORES: 2-39,42-79 + JETLAG_BRANCH: main + LAB_CLOUD: cloud19 + LAB_INTERFACE: eno3 + LABEL: node-role.kubernetes.io/worker-dpdk,node-role.kubernetes.io/worker-metallb + OCP_BUILD: ga + OCP_VERSION: 4.18.5 + PUBLIC_VLAN: "true" + RESERVED_CORES: 0,40,1,41 + SRIOV_NODE_SELECTOR: node-role.kubernetes.io/worker + SRIOV_NUM_VFS: "64" + SRIOV_PF_NAME: ens7f0 + TELCO: "true" + test: + - chain: openshift-qe-installer-bm-ping + - chain: openshift-qe-installer-bm-deploy + - chain: openshift-qe-cluster-health + - chain: openshift-qe-installer-bm-day2-label + - chain: openshift-qe-installer-bm-day2-sriov + - chain: openshift-qe-installer-bm-day2-metallb + - chain: openshift-qe-installer-bm-day2-perf-profile-rds-core + - ref: cloud-bulldozer-e2e-benchmarking-rds-core zz_generated_metadata: branch: master org: cloud-bulldozer diff --git a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml b/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml deleted file mode 100644 index 31c3c812bf98c..0000000000000 --- a/ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml +++ /dev/null @@ -1,60 +0,0 @@ -build_root: - project_image: - dockerfile_literal: | - FROM registry.ci.openshift.org/ocp/ubi-python-311:9 - USER 0 -releases: - arm64-latest: - candidate: - architecture: arm64 - product: ocp - stream: nightly - version: "4.18" - latest: - candidate: - product: ocp - stream: nightly - version: "4.18" -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -tests: -- always_run: false - as: e2e-rds-core-mno - capabilities: - - intranet - restrict_network_access: false - steps: - cluster_profile: metal-perfscale-jetlag - env: - BAREMETAL: "true" - BASTION_CP_INTERFACE: ens7f1 - CRUCIBLE: "false" - ISOLATED_CORES: 2-39,42-79 - JETLAG_BRANCH: main - LAB_CLOUD: cloud19 - LAB_INTERFACE: eno3 - LABEL: node-role.kubernetes.io/worker-dpdk,node-role.kubernetes.io/worker-metallb,node-role.kubernetes.io/worker-spk - OCP_BUILD: ga - OCP_VERSION: 4.18.5 - PUBLIC_VLAN: "true" - RESERVED_CORES: 0,40,1,41 - SRIOV_NODE_SELECTOR: node-role.kubernetes.io/worker - SRIOV_NUM_VFS: "64" - SRIOV_PF_NAME: ens7f0 - TELCO: "true" - test: - - chain: openshift-qe-installer-bm-ping - - chain: openshift-qe-installer-bm-deploy - - chain: openshift-qe-cluster-health - - chain: openshift-qe-installer-bm-day2-label - - chain: openshift-qe-installer-bm-day2-sriov - - chain: openshift-qe-installer-bm-day2-metallb - - chain: openshift-qe-installer-bm-day2-perf-profile-rds-core - - ref: cloud-bulldozer-e2e-benchmarking-rds-core -zz_generated_metadata: - branch: master_metal - org: cloud-bulldozer - repo: e2e-benchmarking 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 7f647e672cc43..46a7aed79f03d 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 @@ -1125,6 +1125,82 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )(e2e-pvc-density-single-node|remaining-required),?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build11 + context: ci/prow/e2e-rds-core-mno + decorate: true + decoration_config: + skip_cloning: true + labels: + capability/intranet: intranet + 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" + name: pull-ci-cloud-bulldozer-e2e-benchmarking-master-e2e-rds-core-mno + rerun_command: /test e2e-rds-core-mno + 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-rds-core-mno + 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( | .* )(e2e-rds-core-mno|remaining-required),?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml b/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml deleted file mode 100644 index 6db65d669500c..0000000000000 --- a/ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml +++ /dev/null @@ -1,78 +0,0 @@ -presubmits: - cloud-bulldozer/e2e-benchmarking: - - agent: kubernetes - always_run: false - branches: - - ^master_metal$ - - ^master_metal- - cluster: build06 - context: ci/prow/e2e-rds-core-mno - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/intranet: intranet - 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" - name: pull-ci-cloud-bulldozer-e2e-benchmarking-master_metal-e2e-rds-core-mno - rerun_command: /test e2e-rds-core-mno - 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-rds-core-mno - 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( | .* )(e2e-rds-core-mno|remaining-required),?($|\s.*) 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 0116c7820ea8d..68b7758328862 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 @@ -4,39 +4,42 @@ set -o nounset set -o pipefail set -x cat /etc/os-release - -if [ ${BAREMETAL} == "true" ]; then - SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null" - bastion="$(cat /bm/address)" - # Copy over the kubeconfig - if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then - ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig - export KUBECONFIG=/tmp/kubeconfig - else - export KUBECONFIG=${SHARED_DIR}/kubeconfig - fi - # Setup socks proxy - ssh ${SSH_ARGS} root@$bastion -fNT -D 12345 - export https_proxy=socks5://localhost:12345 - export http_proxy=socks5://localhost:12345 - oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345 -fi - -python --version -pushd /tmp -python -m virtualenv ./venv_qe -source ./venv_qe/bin/activate - 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 -ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false PERFORMANCE_PROFILE="cpt-pao" ./run.sh -if [ ${BAREMETAL} == "true" ]; then - # kill the ssh tunnel so the job completes - pkill ssh -fi \ No newline at end of file +if [[ "$JOB_TYPE" == "presubmit" ]] && [[ "$REPO_OWNER" = "cloud-bulldozer" ]] && [[ "$REPO_NAME" = "e2e-benchmarking" ]]; then + if [ ${BAREMETAL} == "true" ]; then + SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null" + bastion="$(cat /bm/address)" + # Copy over the kubeconfig + if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then + ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig + export KUBECONFIG=/tmp/kubeconfig + else + export KUBECONFIG=${SHARED_DIR}/kubeconfig + fi + # Setup socks proxy + ssh ${SSH_ARGS} root@$bastion -fNT -D 12345 + export https_proxy=socks5://localhost:12345 + export http_proxy=socks5://localhost:12345 + oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345 + fi + git clone https://github.com/${REPO_OWNER}/${REPO_NAME} + pushd ${REPO_NAME} + git config --global user.email "ocp-perfscale@redhat.com" + git config --global user.name "ocp-perfscale" + git pull origin pull/${PULL_NUMBER}/head:${PULL_NUMBER} --rebase + git switch ${PULL_NUMBER} + pushd workloads/kube-burner-ocp-wrapper + export WORKLOAD=rds-core + ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false PERFORMANCE_PROFILE="cpt-pao" ./run.sh + + if [ ${BAREMETAL} == "true" ]; then + # kill the ssh tunnel so the job completes + pkill ssh + fi +else + echo "We are sorry, this job is only meant for cloud-bulldozer/e2e-benchmarking repo PR testing" +fi diff --git a/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh b/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh index 4f030198137f2..5f33d407e7725 100644 --- a/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh +++ b/ci-operator/step-registry/openshift-qe/installer/bm/day2/perf-profile/rds-core/openshift-qe-installer-bm-day2-perf-profile-rds-core-commands.sh @@ -64,7 +64,6 @@ spec: userLevelNetworking: false EOF -sleep 60 kubectl wait --for jsonpath='{.status.updatedMachineCount}'="$(oc get node --no-headers -l node-role.kubernetes.io/worker= | wc -l)" --timeout=30m mcp worker oc adm wait-for-stable-cluster --minimum-stable-period=2m --timeout=20m