From b7540cf63cf13decd23821799f2f56270db35580 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 24 Sep 2024 13:56:32 -0600 Subject: [PATCH 01/21] allow repo arg --- .../openshift-qe-cluster-density-v2-commands.sh | 4 ++-- .../openshift-qe-cluster-density-v2-ref.yaml | 4 ++++ .../conc-builds/openshift-qe-conc-builds-commands.sh | 4 ++-- .../conc-builds/openshift-qe-conc-builds-ref.yaml | 4 ++++ .../openshift-qe-control-plane-smoke-commands.sh | 4 ++-- .../openshift-qe-control-plane-smoke-ref.yaml | 4 ++++ .../openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh | 4 ++-- .../openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml | 4 ++++ .../ingress-perf/openshift-qe-ingress-perf-commands.sh | 4 ++-- .../ingress-perf/openshift-qe-ingress-perf-ref.yaml | 4 ++++ .../openshift-qe-kube-burner-index-commands.sh | 4 ++-- .../kube-burner-index/openshift-qe-kube-burner-index-ref.yaml | 4 ++++ .../network-perf/openshift-qe-network-perf-commands.sh | 4 ++-- .../network-perf/openshift-qe-network-perf-ref.yaml | 4 ++++ .../network-policy/openshift-qe-network-policy-commands.sh | 4 ++-- .../network-policy/openshift-qe-network-policy-ref.yaml | 4 ++++ .../network-smoke/openshift-qe-network-smoke-commands.sh | 4 ++-- .../network-smoke/openshift-qe-network-smoke-ref.yaml | 4 ++++ .../openshift-qe-node-density-cni-commands.sh | 4 ++-- .../node-density-cni/openshift-qe-node-density-cni-ref.yaml | 4 ++++ .../openshift-qe-node-density-heavy-commands.sh | 4 ++-- .../openshift-qe-node-density-heavy-ref.yaml | 4 ++++ .../node-density/openshift-qe-node-density-commands.sh | 4 ++-- .../node-density/openshift-qe-node-density-ref.yaml | 4 ++++ .../router-perf/openshift-qe-router-perf-commands.sh | 4 ++-- .../router-perf/openshift-qe-router-perf-ref.yaml | 4 ++++ .../web-burner/openshift-qe-web-burner-commands.sh | 4 ++-- .../openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml | 4 ++++ 28 files changed, 84 insertions(+), 28 deletions(-) diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh index 85faf1c16f36..13f984b8d55c 100755 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh @@ -21,8 +21,8 @@ if [ -e "${ES_SECRETS_PATH}/host" ]; then ES_HOST=$(cat "${ES_SECRETS_PATH}/host") fi -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml index d40619a8e573..515490648ef4 100644 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml @@ -10,6 +10,10 @@ ref: default: "v2.2.3" documentation: |- Override the e2e version + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: KUBE_BURNER_VERSION default: "default" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh index 33cb9fb6bb39..976328bef979 100755 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh @@ -16,8 +16,8 @@ ES_USERNAME=$(cat "/secret/username") export KUBE_BURNER_URL="https://github.com/cloud-bulldozer/kube-burner/releases/download/v0.17.3/kube-burner-0.17.3-Linux-x86_64.tar.gz" -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml index 10451802167c..b0308ffc0866 100644 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml @@ -16,6 +16,10 @@ ref: cpu: 100m memory: 100Mi env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh index 59423bbcc47d..e46178f5e48a 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh @@ -11,8 +11,8 @@ pushd /tmp python -m virtualenv ./venv_qe source ./venv_qe/bin/activate -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml index b95b078dccc7..f392116ca8cf 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml @@ -14,6 +14,10 @@ ref: name: ocp-qe-gcp-sa mount_path: /ga-gsheet env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh index 850a4ec8f582..81db02c750ee 100755 --- a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh +++ b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh @@ -20,8 +20,8 @@ if [ -e "${ES_SECRETS_PATH}/host" ]; then ES_HOST=$(cat "${ES_SECRETS_PATH}/host") fi -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml index e6f1f095214a..461ecea6aaed 100644 --- a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml @@ -6,6 +6,10 @@ ref: tag: latest cli: latest env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh index 33f21606932e..34587ebc074d 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh @@ -40,8 +40,8 @@ ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") # Clone the e2e repo -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/ingress-perf diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml index e4b1769ee202..0297c698b82b 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml @@ -14,6 +14,10 @@ ref: name: perfscale-metal-bastion mount_path: /bm env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh index 9963aad729b3..df2596f9c08e 100644 --- a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh +++ b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh @@ -14,8 +14,8 @@ source ./venv_qe/bin/activate ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml index 03d89fd67490..4ec1336701f8 100644 --- a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml @@ -16,6 +16,10 @@ ref: cpu: 100m memory: 100Mi env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh index 4c89dcfffc40..8de05713ff72 100755 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh @@ -37,8 +37,8 @@ source ./venv_qe/bin/activate ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/network-perf-v2 diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml index 73704b5ee823..2b9616e790f4 100644 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml @@ -6,6 +6,10 @@ ref: tag: latest cli: latest env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh index f4394d955feb..9464041d7586 100755 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh @@ -15,8 +15,8 @@ ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml index a92f08c71896..f4fac74ea8fa 100644 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml @@ -8,6 +8,10 @@ ref: commands: openshift-qe-network-policy-commands.sh timeout: 8h0m0s env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh index 065e8594f310..56d7cec18d74 100755 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh @@ -34,8 +34,8 @@ pushd /tmp python -m virtualenv ./venv_qe source ./venv_qe/bin/activate -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/network-perf-v2 diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml index 9d3dbb6bd0b9..442961dc44c6 100644 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml @@ -19,6 +19,10 @@ ref: memory: 100Mi timeout: 4h env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh index d30f91e7af9a..d4a2d23314e4 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh @@ -14,8 +14,8 @@ source ./venv_qe/bin/activate ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml index 246c310faa28..2d6eb989fccd 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml @@ -11,6 +11,10 @@ ref: name: ocp-qe-perfscale-es mount_path: /secret env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh index 3ef06f8b1d96..0283d18786c6 100755 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh @@ -31,8 +31,8 @@ ES_USERNAME=$(cat "/secret/username") GSHEET_KEY_LOCATION="/ga-gsheet/gcp-sa-account" export GSHEET_KEY_LOCATION -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml index 6a3f91c33329..2c72f265c24a 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml @@ -17,6 +17,10 @@ ref: name: perfscale-metal-bastion mount_path: /bm env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh index a9500946cff7..79d95f342e0f 100755 --- a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh @@ -20,8 +20,8 @@ if [ -e "${ES_SECRETS_PATH}/host" ]; then ES_HOST=$(cat "${ES_SECRETS_PATH}/host") fi -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml index 580c77f0562f..1a81cbdb2265 100644 --- a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml @@ -21,6 +21,10 @@ ref: cpu: 100m memory: 100Mi env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh index f08fc06dab5b..534d67c8d3db 100755 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh @@ -16,8 +16,8 @@ ES_USERNAME=$(cat "/secret/username") GSHEET_KEY_LOCATION="/ga-gsheet/gcp-sa-account" export GSHEET_KEY_LOCATION -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/router-perf-v2 diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml index 20b4443dbd81..8077323f5190 100644 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml @@ -14,6 +14,10 @@ ref: name: ocp-qe-gcp-sa mount_path: /ga-gsheet env: + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh index c8763d3c83c5..6188185eb84e 100755 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh @@ -33,8 +33,8 @@ oc delete AdminPolicyBasedExternalRoute --all ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; -LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); +REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; +LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml index e378b874b964..2a0a5e5fa884 100644 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml @@ -22,6 +22,10 @@ ref: default: "false" documentation: |- Enable the new AdminPolicyBasedExternalRoute CR + - name: E2E_REPOSITORY + default: "" + documentation: |- + Override the e2e repository - name: E2E_VERSION default: "v2.2.3" documentation: |- From 8cb38a2d8b76b1a495bcdb771db59a6c5d0ba0a9 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:46:01 -0600 Subject: [PATCH 02/21] use stackrox e2e repo --- ...nshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index 24fafc47ac0c..4d1251e849a8 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -55,6 +55,7 @@ tests: env: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" + E2E_REPOSITORY: "https://github.com/stackrox/openshift-qe-e2e-benchmarking" ES_SECRETS_PATH: /secret_stackrox USER_TAGS: | TicketId 382 From 24af0d515330f1a968eda99cc4aa63dde65a6a0c Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:52:46 -0600 Subject: [PATCH 03/21] remove quotes --- ...shift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index 4d1251e849a8..f9831ad878c3 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -55,7 +55,7 @@ tests: env: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" - E2E_REPOSITORY: "https://github.com/stackrox/openshift-qe-e2e-benchmarking" + E2E_REPOSITORY: https://github.com/stackrox/openshift-qe-e2e-benchmarking ES_SECRETS_PATH: /secret_stackrox USER_TAGS: | TicketId 382 From 2d7d444f12d69f383dae30b8bf72c530c808867e Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:43:54 -0600 Subject: [PATCH 04/21] retry stackrox cr creates --- .../step-registry/stackrox/install/stackrox-install-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/stackrox/install/stackrox-install-commands.sh b/ci-operator/step-registry/stackrox/install/stackrox-install-commands.sh index f191e7730e49..698b20cc50de 100755 --- a/ci-operator/step-registry/stackrox/install/stackrox-install-commands.sh +++ b/ci-operator/step-registry/stackrox/install/stackrox-install-commands.sh @@ -191,7 +191,7 @@ function create_cr() { && [[ $(diff "${app}-cr.yaml" "new.${app}-cr.yaml" | grep -v password >&2; echo $?) -eq 1 ]]; then echo "INFO: Diff in upstream example ${app}. (${cr_url}/${app}-cr.yaml)" fi - oc apply -f "${app}-cr.yaml" + retry oc apply -f "${app}-cr.yaml" --timeout=30s } function retry() { From 944b7bb28a9bbbc8e869d13e566f4a34f0112230 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 24 Sep 2024 22:15:17 -0600 Subject: [PATCH 05/21] set tag version --- ...nshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index f9831ad878c3..59d5cbc10e8c 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -56,6 +56,7 @@ tests: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" E2E_REPOSITORY: https://github.com/stackrox/openshift-qe-e2e-benchmarking + E2E_VERSION: master ES_SECRETS_PATH: /secret_stackrox USER_TAGS: | TicketId 382 From 98299ea57a0bbb2233da4374b15c206e7c8df4f3 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 25 Sep 2024 08:31:58 -0600 Subject: [PATCH 06/21] specify local directory for clone --- .../openshift-qe-cluster-density-v2-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh index 13f984b8d55c..2cf1d12ebfaa 100755 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh @@ -24,7 +24,7 @@ fi REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=cluster-density-v2 From 8333da7c024cd922738998eb54ee47eccbe85390 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:52:34 -0600 Subject: [PATCH 07/21] fix across workload types --- .../conc-builds/openshift-qe-conc-builds-commands.sh | 2 +- .../openshift-qe-control-plane-smoke-commands.sh | 2 +- .../openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh | 2 +- .../ingress-perf/openshift-qe-ingress-perf-commands.sh | 2 +- .../openshift-qe-kube-burner-index-commands.sh | 2 +- .../network-perf/openshift-qe-network-perf-commands.sh | 2 +- .../network-policy/openshift-qe-network-policy-commands.sh | 2 +- .../network-smoke/openshift-qe-network-smoke-commands.sh | 2 +- .../node-density-cni/openshift-qe-node-density-cni-commands.sh | 2 +- .../openshift-qe-node-density-heavy-commands.sh | 2 +- .../node-density/openshift-qe-node-density-commands.sh | 2 +- .../router-perf/openshift-qe-router-perf-commands.sh | 2 +- .../openshift-qe/web-burner/openshift-qe-web-burner-commands.sh | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh index 976328bef979..83ddfef1c588 100755 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh @@ -19,7 +19,7 @@ export KUBE_BURNER_URL="https://github.com/cloud-bulldozer/kube-burner/releases/ REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner export WORKLOAD=concurrent-builds diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh index e46178f5e48a..1ef31f1ebc5a 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh @@ -14,7 +14,7 @@ source ./venv_qe/bin/activate REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper sleep 60; diff --git a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh index 81db02c750ee..b60a035da0dd 100755 --- a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh +++ b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh @@ -23,7 +23,7 @@ fi REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=crd-scale diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh index 34587ebc074d..31b5dfebd804 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh @@ -43,7 +43,7 @@ ES_USERNAME=$(cat "/secret/username") REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/ingress-perf # ES Configuration diff --git a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh index df2596f9c08e..c42ed485ecf0 100644 --- a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh +++ b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh @@ -17,7 +17,7 @@ ES_USERNAME=$(cat "/secret/username") REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=index EXTRA_FLAGS=$METRIC_PROFILES diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh index 8de05713ff72..72c2df045406 100755 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh @@ -40,7 +40,7 @@ ES_USERNAME=$(cat "/secret/username") REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/network-perf-v2 # Clean up resources from possible previous tests. diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh index 9464041d7586..770aaf9fd14b 100755 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh @@ -18,7 +18,7 @@ ES_USERNAME=$(cat "/secret/username") REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner export JOB_TIMEOUT=${JOB_TIMEOUT:=21600} diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh index 56d7cec18d74..ef499a95f8a7 100755 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh @@ -37,7 +37,7 @@ source ./venv_qe/bin/activate REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/network-perf-v2 # Clean up diff --git a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh index d4a2d23314e4..d760523f296e 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh @@ -17,7 +17,7 @@ ES_USERNAME=$(cat "/secret/username") REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=node-density-cni diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh index 0283d18786c6..ec7dfce5677f 100755 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh @@ -34,7 +34,7 @@ export GSHEET_KEY_LOCATION REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=node-density-heavy diff --git a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh index 79d95f342e0f..ef3fc4d7341a 100755 --- a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh @@ -23,7 +23,7 @@ fi REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=node-density diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh index 534d67c8d3db..7c842ae46240 100755 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh @@ -19,7 +19,7 @@ export GSHEET_KEY_LOCATION REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/router-perf-v2 # ES configuration export ES_SERVER="https://$ES_USERNAME:$ES_PASSWORD@search-ocp-qe-perf-scale-test-elk-hcm7wtsqpxy7xogbu72bor4uve.us-east-1.es.amazonaws.com" diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh index 6188185eb84e..7f8affba4156 100755 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh @@ -36,7 +36,7 @@ ES_USERNAME=$(cat "/secret/username") REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL $TAG_OPTION --depth 1 +git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export ES_SERVER="https://$ES_USERNAME:$ES_PASSWORD@search-ocp-qe-perf-scale-test-elk-hcm7wtsqpxy7xogbu72bor4uve.us-east-1.es.amazonaws.com" From dd461e790fbcf97cfc4f77cb6334696de22ec156 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:51:35 -0600 Subject: [PATCH 08/21] use dev repo and set arg --- ...hift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index 59d5cbc10e8c..b84e2e8da7db 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -55,8 +55,9 @@ tests: env: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" - E2E_REPOSITORY: https://github.com/stackrox/openshift-qe-e2e-benchmarking + E2E_REPOSITORY: https://github.com/davdhacs/e2e-benchmarking E2E_VERSION: master + EXTRA_ARGS: --metrics-profile https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml ES_SECRETS_PATH: /secret_stackrox USER_TAGS: | TicketId 382 From 3693896ca4ebfcf8809b76af6d15b625e62791a9 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:04:19 -0600 Subject: [PATCH 09/21] sort --- ...shift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index b84e2e8da7db..7e94f84d6434 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -57,8 +57,8 @@ tests: COMPUTE_NODE_REPLICAS: "24" E2E_REPOSITORY: https://github.com/davdhacs/e2e-benchmarking E2E_VERSION: master - EXTRA_ARGS: --metrics-profile https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml ES_SECRETS_PATH: /secret_stackrox + EXTRA_ARGS: --metrics-profile https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml USER_TAGS: | TicketId 382 ZONES_COUNT: "3" From 936f38b3e1efcc186e47a68fa56aa4abb47e3b61 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:24:06 -0600 Subject: [PATCH 10/21] add extra_args to the steps --- .../openshift-qe-cluster-density-v2-ref.yaml | 4 ++++ .../conc-builds/openshift-qe-conc-builds-ref.yaml | 4 ++++ .../openshift-qe-control-plane-smoke-ref.yaml | 4 ++++ .../openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml | 4 ++++ .../ingress-perf/openshift-qe-ingress-perf-ref.yaml | 4 ++++ .../kube-burner-index/openshift-qe-kube-burner-index-ref.yaml | 4 ++++ .../network-perf/openshift-qe-network-perf-ref.yaml | 4 ++++ .../network-policy/openshift-qe-network-policy-ref.yaml | 4 ++++ .../network-smoke/openshift-qe-network-smoke-ref.yaml | 4 ++++ .../network-vm-perf/openshift-qe-network-vm-perf-ref.yaml | 4 ++++ .../node-density-cni/openshift-qe-node-density-cni-ref.yaml | 4 ++++ .../openshift-qe-node-density-heavy-ref.yaml | 4 ++++ .../node-density/openshift-qe-node-density-ref.yaml | 4 ++++ .../router-perf/openshift-qe-router-perf-ref.yaml | 4 ++++ .../openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml | 4 ++++ 15 files changed, 60 insertions(+) diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml index 515490648ef4..9f1d3b830160 100644 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml @@ -6,6 +6,10 @@ ref: tag: latest cli: latest env: + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml index b0308ffc0866..3fac100d87df 100644 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml @@ -20,6 +20,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml index f392116ca8cf..7e538eb0c3b3 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml @@ -18,6 +18,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml index 461ecea6aaed..8f0af51cd9d8 100644 --- a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml @@ -10,6 +10,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml index 0297c698b82b..31ade20afe1c 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml @@ -18,6 +18,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml index 4ec1336701f8..e2f26ebcbf94 100644 --- a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml @@ -20,6 +20,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml index 3877ec22b721..b61996a1d6e7 100644 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml @@ -10,6 +10,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.4" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml index f4fac74ea8fa..6a7e1fb0262b 100644 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml @@ -12,6 +12,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml index 442961dc44c6..d4279e8a8b3e 100644 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml @@ -23,6 +23,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml index db572931bb1a..d981cdc92dad 100644 --- a/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml @@ -6,6 +6,10 @@ ref: tag: latest cli: latest env: + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.4" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml index 2d6eb989fccd..7998402d7a40 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml @@ -15,6 +15,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml index 2c72f265c24a..b1eee159b256 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml @@ -21,6 +21,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml index 1a81cbdb2265..e54fd447391f 100644 --- a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml @@ -25,6 +25,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml index 8077323f5190..7edb95938925 100644 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml @@ -18,6 +18,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml index 2a0a5e5fa884..44f1f8e887c2 100644 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml @@ -26,6 +26,10 @@ ref: default: "" documentation: |- Override the e2e repository + - name: EXTRA_ARGS + default: "" + documentation: |- + Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- From d252f2e797341eb9e7238c657f28ede005cdb687 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 2 Oct 2024 20:48:00 -0600 Subject: [PATCH 11/21] FLAGS not ARGS --- .../cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml | 2 +- .../openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml | 2 +- .../openshift-qe-control-plane-smoke-ref.yaml | 2 +- .../openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml | 2 +- .../ingress-perf/openshift-qe-ingress-perf-ref.yaml | 2 +- .../kube-burner-index/openshift-qe-kube-burner-index-ref.yaml | 2 +- .../network-perf/openshift-qe-network-perf-ref.yaml | 2 +- .../network-policy/openshift-qe-network-policy-ref.yaml | 2 +- .../network-smoke/openshift-qe-network-smoke-ref.yaml | 2 +- .../network-vm-perf/openshift-qe-network-vm-perf-ref.yaml | 2 +- .../node-density-cni/openshift-qe-node-density-cni-ref.yaml | 2 +- .../node-density-heavy/openshift-qe-node-density-heavy-ref.yaml | 2 +- .../node-density/openshift-qe-node-density-ref.yaml | 2 +- .../openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml | 2 +- .../openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml index 9f1d3b830160..1c89568882a7 100644 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml @@ -6,7 +6,7 @@ ref: tag: latest cli: latest env: - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml index 3fac100d87df..5a5054e972d2 100644 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml @@ -20,7 +20,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml index 7e538eb0c3b3..e309e2076277 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml @@ -18,7 +18,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml index 8f0af51cd9d8..412657eb98d0 100644 --- a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml @@ -10,7 +10,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml index 31ade20afe1c..a229779a80cc 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml @@ -18,7 +18,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml index e2f26ebcbf94..b65c591701dc 100644 --- a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml @@ -20,7 +20,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml index b61996a1d6e7..0bd2fa4a541a 100644 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml @@ -10,7 +10,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml index 6a7e1fb0262b..01d6ee924114 100644 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml @@ -12,7 +12,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml index d4279e8a8b3e..d43c914f77d3 100644 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml @@ -23,7 +23,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml index d981cdc92dad..a0ffabc2a1d1 100644 --- a/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml @@ -6,7 +6,7 @@ ref: tag: latest cli: latest env: - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml index 7998402d7a40..5e623a099462 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml @@ -15,7 +15,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml index b1eee159b256..ceb1606e55fd 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml @@ -21,7 +21,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml index e54fd447391f..0403329ddfae 100644 --- a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml @@ -25,7 +25,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml index 7edb95938925..592bb1812779 100644 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml @@ -18,7 +18,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml index 44f1f8e887c2..5dd1a88746bf 100644 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml @@ -26,7 +26,7 @@ ref: default: "" documentation: |- Override the e2e repository - - name: EXTRA_ARGS + - name: EXTRA_FLAGS default: "" documentation: |- Add args for e2e-benchmarking kube-burner-ocp cmd. From f5d83b983864d2f05917c7bbfab271494ec24bcf Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 2 Oct 2024 20:48:30 -0600 Subject: [PATCH 12/21] set flags --- ...shift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index 7e94f84d6434..b6be75045a9c 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -58,7 +58,7 @@ tests: E2E_REPOSITORY: https://github.com/davdhacs/e2e-benchmarking E2E_VERSION: master ES_SECRETS_PATH: /secret_stackrox - EXTRA_ARGS: --metrics-profile https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml + EXTRA_FLAGS: --metrics-profile https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml USER_TAGS: | TicketId 382 ZONES_COUNT: "3" From b18cd84d82cc2d7e6d9f55ccea565bb40f76cede Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:46:07 -0600 Subject: [PATCH 13/21] remove commands changes --- .../openshift-qe-cluster-density-v2-commands.sh | 6 +++--- .../conc-builds/openshift-qe-conc-builds-commands.sh | 6 +++--- .../openshift-qe-control-plane-smoke-commands.sh | 6 +++--- .../crd-scale/openshift-qe-crd-scale-commands.sh | 6 +++--- .../ingress-perf/openshift-qe-ingress-perf-commands.sh | 6 +++--- .../openshift-qe-kube-burner-index-commands.sh | 6 +++--- .../network-perf/openshift-qe-network-perf-commands.sh | 6 +++--- .../network-policy/openshift-qe-network-policy-commands.sh | 6 +++--- .../network-smoke/openshift-qe-network-smoke-commands.sh | 6 +++--- .../openshift-qe-node-density-cni-commands.sh | 6 +++--- .../openshift-qe-node-density-heavy-commands.sh | 6 +++--- .../node-density/openshift-qe-node-density-commands.sh | 6 +++--- .../router-perf/openshift-qe-router-perf-commands.sh | 6 +++--- .../web-burner/openshift-qe-web-burner-commands.sh | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh index 2cf1d12ebfaa..85faf1c16f36 100755 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh @@ -21,10 +21,10 @@ if [ -e "${ES_SECRETS_PATH}/host" ]; then ES_HOST=$(cat "${ES_SECRETS_PATH}/host") fi -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=cluster-density-v2 diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh index 83ddfef1c588..33cb9fb6bb39 100755 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-commands.sh @@ -16,10 +16,10 @@ ES_USERNAME=$(cat "/secret/username") export KUBE_BURNER_URL="https://github.com/cloud-bulldozer/kube-burner/releases/download/v0.17.3/kube-burner-0.17.3-Linux-x86_64.tar.gz" -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner export WORKLOAD=concurrent-builds diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh index 1ef31f1ebc5a..59423bbcc47d 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-commands.sh @@ -11,10 +11,10 @@ pushd /tmp python -m virtualenv ./venv_qe source ./venv_qe/bin/activate -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper sleep 60; diff --git a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh index b60a035da0dd..850a4ec8f582 100755 --- a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh +++ b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-commands.sh @@ -20,10 +20,10 @@ if [ -e "${ES_SECRETS_PATH}/host" ]; then ES_HOST=$(cat "${ES_SECRETS_PATH}/host") fi -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=crd-scale diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh index 31b5dfebd804..33f21606932e 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-commands.sh @@ -40,10 +40,10 @@ ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") # Clone the e2e repo -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/ingress-perf # ES Configuration diff --git a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh index c42ed485ecf0..9963aad729b3 100644 --- a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh +++ b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-commands.sh @@ -14,10 +14,10 @@ source ./venv_qe/bin/activate ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=index EXTRA_FLAGS=$METRIC_PROFILES diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh index 93c6f7466e03..12e483fc4e8c 100755 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-commands.sh @@ -37,10 +37,10 @@ source ./venv_qe/bin/activate ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/network-perf-v2 # Clean up resources from possible previous tests. diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh index 770aaf9fd14b..f4394d955feb 100755 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-commands.sh @@ -15,10 +15,10 @@ ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner export JOB_TIMEOUT=${JOB_TIMEOUT:=21600} diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh index ef499a95f8a7..065e8594f310 100755 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-commands.sh @@ -34,10 +34,10 @@ pushd /tmp python -m virtualenv ./venv_qe source ./venv_qe/bin/activate -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/network-perf-v2 # Clean up diff --git a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh index d760523f296e..d30f91e7af9a 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-commands.sh @@ -14,10 +14,10 @@ source ./venv_qe/bin/activate ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=node-density-cni diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh index ec7dfce5677f..3ef06f8b1d96 100755 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-commands.sh @@ -31,10 +31,10 @@ ES_USERNAME=$(cat "/secret/username") GSHEET_KEY_LOCATION="/ga-gsheet/gcp-sa-account" export GSHEET_KEY_LOCATION -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=node-density-heavy diff --git a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh index ef3fc4d7341a..a9500946cff7 100755 --- a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh +++ b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-commands.sh @@ -20,10 +20,10 @@ if [ -e "${ES_SECRETS_PATH}/host" ]; then ES_HOST=$(cat "${ES_SECRETS_PATH}/host") fi -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export WORKLOAD=node-density diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh index 7c842ae46240..f08fc06dab5b 100755 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-commands.sh @@ -16,10 +16,10 @@ ES_USERNAME=$(cat "/secret/username") GSHEET_KEY_LOCATION="/ga-gsheet/gcp-sa-account" export GSHEET_KEY_LOCATION -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/router-perf-v2 # ES configuration export ES_SERVER="https://$ES_USERNAME:$ES_PASSWORD@search-ocp-qe-perf-scale-test-elk-hcm7wtsqpxy7xogbu72bor4uve.us-east-1.es.amazonaws.com" diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh index 7f8affba4156..c8763d3c83c5 100755 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-commands.sh @@ -33,10 +33,10 @@ oc delete AdminPolicyBasedExternalRoute --all ES_PASSWORD=$(cat "/secret/password") ES_USERNAME=$(cat "/secret/username") -REPO_URL=${E2E_REPOSITORY:-"https://github.com/cloud-bulldozer/e2e-benchmarking"}; -LATEST_TAG=$(curl -s "https://api.github.com/repos/${REPO_URL#https://github.com}/releases/latest" | jq -r '.tag_name'); +REPO_URL="https://github.com/cloud-bulldozer/e2e-benchmarking"; +LATEST_TAG=$(curl -s "https://api.github.com/repos/cloud-bulldozer/e2e-benchmarking/releases/latest" | jq -r '.tag_name'); TAG_OPTION="--branch $(if [ "$E2E_VERSION" == "default" ]; then echo "$LATEST_TAG"; else echo "$E2E_VERSION"; fi)"; -git clone $REPO_URL e2e-benchmarking $TAG_OPTION --depth 1 +git clone $REPO_URL $TAG_OPTION --depth 1 pushd e2e-benchmarking/workloads/kube-burner-ocp-wrapper export ES_SERVER="https://$ES_USERNAME:$ES_PASSWORD@search-ocp-qe-perf-scale-test-elk-hcm7wtsqpxy7xogbu72bor4uve.us-east-1.es.amazonaws.com" From 4df0e1e217f456800f6c79ed23b802d7616ad872 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:51:53 -0600 Subject: [PATCH 14/21] remove E2E_REPO param --- .../openshift-qe-cluster-density-v2-ref.yaml | 4 ---- .../conc-builds/openshift-qe-conc-builds-ref.yaml | 4 ---- .../openshift-qe-control-plane-smoke-ref.yaml | 4 ---- .../openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml | 4 ---- .../ingress-perf/openshift-qe-ingress-perf-ref.yaml | 4 ---- .../kube-burner-index/openshift-qe-kube-burner-index-ref.yaml | 4 ---- .../network-perf/openshift-qe-network-perf-ref.yaml | 4 ---- .../network-policy/openshift-qe-network-policy-ref.yaml | 4 ---- .../network-smoke/openshift-qe-network-smoke-ref.yaml | 4 ---- .../node-density-cni/openshift-qe-node-density-cni-ref.yaml | 4 ---- .../openshift-qe-node-density-heavy-ref.yaml | 4 ---- .../node-density/openshift-qe-node-density-ref.yaml | 4 ---- .../router-perf/openshift-qe-router-perf-ref.yaml | 4 ---- .../openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml | 4 ---- 14 files changed, 56 deletions(-) diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml index 1c89568882a7..95550b96de87 100644 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml @@ -14,10 +14,6 @@ ref: default: "v2.2.3" documentation: |- Override the e2e version - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: KUBE_BURNER_VERSION default: "default" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml index 5a5054e972d2..5dea7c267a99 100644 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml @@ -16,10 +16,6 @@ ref: cpu: 100m memory: 100Mi env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml index e309e2076277..fa5bc5cebad6 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml @@ -14,10 +14,6 @@ ref: name: ocp-qe-gcp-sa mount_path: /ga-gsheet env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml index 412657eb98d0..0af3c87ffa6a 100644 --- a/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/crd-scale/openshift-qe-crd-scale-ref.yaml @@ -6,10 +6,6 @@ ref: tag: latest cli: latest env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml index a229779a80cc..cde4f5a9b711 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml @@ -14,10 +14,6 @@ ref: name: perfscale-metal-bastion mount_path: /bm env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml index b65c591701dc..d186b4e7752b 100644 --- a/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/kube-burner-index/openshift-qe-kube-burner-index-ref.yaml @@ -16,10 +16,6 @@ ref: cpu: 100m memory: 100Mi env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml index 0bd2fa4a541a..8ab534f37d0a 100644 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml @@ -6,10 +6,6 @@ ref: tag: latest cli: latest env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml index 01d6ee924114..16b07b173cee 100644 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml @@ -8,10 +8,6 @@ ref: commands: openshift-qe-network-policy-commands.sh timeout: 8h0m0s env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml index d43c914f77d3..3bca547b62ce 100644 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml @@ -19,10 +19,6 @@ ref: memory: 100Mi timeout: 4h env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml index 5e623a099462..1557551756e5 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-cni/openshift-qe-node-density-cni-ref.yaml @@ -11,10 +11,6 @@ ref: name: ocp-qe-perfscale-es mount_path: /secret env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml index ceb1606e55fd..842ccad62760 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml @@ -17,10 +17,6 @@ ref: name: perfscale-metal-bastion mount_path: /bm env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml index 0403329ddfae..6ae1871f5140 100644 --- a/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density/openshift-qe-node-density-ref.yaml @@ -21,10 +21,6 @@ ref: cpu: 100m memory: 100Mi env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml index 592bb1812779..ed0f9132ca2b 100644 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml @@ -14,10 +14,6 @@ ref: name: ocp-qe-gcp-sa mount_path: /ga-gsheet env: - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml index 5dd1a88746bf..3458a1e833f6 100644 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml @@ -22,10 +22,6 @@ ref: default: "false" documentation: |- Enable the new AdminPolicyBasedExternalRoute CR - - name: E2E_REPOSITORY - default: "" - documentation: |- - Override the e2e repository - name: EXTRA_FLAGS default: "" documentation: |- From d54dc6b24eb22fa2b1304ba6d4eafba85ea90358 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:54:44 -0600 Subject: [PATCH 15/21] add KUBE_BURNER_VERSION with profiles arg --- ...hift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index b6be75045a9c..618268cf0c0b 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -55,10 +55,9 @@ tests: env: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" - E2E_REPOSITORY: https://github.com/davdhacs/e2e-benchmarking - E2E_VERSION: master ES_SECRETS_PATH: /secret_stackrox EXTRA_FLAGS: --metrics-profile https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml + KUBE_BURNER_VERSION: 1.4.0 USER_TAGS: | TicketId 382 ZONES_COUNT: "3" From 92d0c185488135510be324247f0ccb37fab26533 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:17:14 -0600 Subject: [PATCH 16/21] add metrics-aggregated.yml --- ...shift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index 618268cf0c0b..46c33b0654f6 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -56,7 +56,7 @@ tests: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" ES_SECRETS_PATH: /secret_stackrox - EXTRA_FLAGS: --metrics-profile https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml + EXTRA_FLAGS: --metrics-profile metrics-aggregated.yml,https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml KUBE_BURNER_VERSION: 1.4.0 USER_TAGS: | TicketId 382 From 829bf5d296bd92c222799c4e1be28047d9b6bbb8 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:24:17 -0600 Subject: [PATCH 17/21] make update --- .../migtools-oadp-non-admin-master-postsubmits.yaml | 2 +- .../migtools-oadp-non-admin-master-presubmits.yaml | 4 ++-- .../openshift-qe-baremetal-qe-infra-master-postsubmits.yaml | 2 +- .../openshift-qe-baremetal-qe-infra-master-presubmits.yaml | 4 ++-- .../openshift-qe-baremetal-qe-infra-staging-postsubmits.yaml | 2 +- .../openshift-qe-baremetal-qe-infra-staging-presubmits.yaml | 4 ++-- .../ci-tools/openshift-ci-tools-master-postsubmits.yaml | 2 +- .../ci-tools/openshift-ci-tools-master-presubmits.yaml | 4 ++-- .../jobs/openshift/loki/openshift-loki-main-postsubmits.yaml | 2 +- .../jobs/openshift/loki/openshift-loki-main-presubmits.yaml | 4 ++-- .../loki/openshift-loki-release-5.6-postsubmits.yaml | 2 +- .../openshift/loki/openshift-loki-release-5.6-presubmits.yaml | 4 ++-- .../loki/openshift-loki-release-5.8-postsubmits.yaml | 2 +- .../openshift/loki/openshift-loki-release-5.8-presubmits.yaml | 4 ++-- .../loki/openshift-loki-release-5.9-postsubmits.yaml | 2 +- .../openshift/loki/openshift-loki-release-5.9-presubmits.yaml | 4 ++-- .../loki/openshift-loki-release-6.0-postsubmits.yaml | 2 +- .../openshift/loki/openshift-loki-release-6.0-presubmits.yaml | 4 ++-- .../loki/openshift-loki-upstream-v2.9.8-postsubmits.yaml | 2 +- .../loki/openshift-loki-upstream-v2.9.8-presubmits.yaml | 4 ++-- .../loki/openshift-loki-upstream-v3.1.0-postsubmits.yaml | 2 +- .../loki/openshift-loki-upstream-v3.1.0-presubmits.yaml | 4 ++-- .../loki/openshift-loki-upstream-v3.1.1-postsubmits.yaml | 2 +- .../loki/openshift-loki-upstream-v3.1.1-presubmits.yaml | 4 ++-- .../loki/openshift-loki-upstream-v3.2.0-postsubmits.yaml | 2 +- .../loki/openshift-loki-upstream-v3.2.0-presubmits.yaml | 4 ++-- .../openshift-multiarch-tuning-operator-main-postsubmits.yaml | 2 +- .../openshift-multiarch-tuning-operator-main-presubmits.yaml | 4 ++-- ...penshift-multiarch-tuning-operator-v0.0.1-postsubmits.yaml | 2 +- ...openshift-multiarch-tuning-operator-v0.0.1-presubmits.yaml | 4 ++-- .../openshift-multiarch-tuning-operator-v0.9-postsubmits.yaml | 2 +- .../openshift-multiarch-tuning-operator-v0.9-presubmits.yaml | 4 ++-- .../openshift-oadp-operator-master-postsubmits.yaml | 2 +- .../openshift-oadp-operator-master-presubmits.yaml | 4 ++-- .../openshift-oadp-operator-oadp-1.0-postsubmits.yaml | 2 +- .../openshift-oadp-operator-oadp-1.0-presubmits.yaml | 4 ++-- .../openshift-oadp-operator-oadp-1.3-postsubmits.yaml | 2 +- .../openshift-oadp-operator-oadp-1.3-presubmits.yaml | 4 ++-- .../openshift-oadp-operator-oadp-1.4-postsubmits.yaml | 2 +- .../openshift-oadp-operator-oadp-1.4-presubmits.yaml | 4 ++-- .../openshift-openshift-velero-plugin-master-postsubmits.yaml | 2 +- .../openshift-openshift-velero-plugin-master-presubmits.yaml | 4 ++-- ...penshift-openshift-velero-plugin-oadp-1.0-postsubmits.yaml | 2 +- ...openshift-openshift-velero-plugin-oadp-1.0-presubmits.yaml | 4 ++-- ...penshift-openshift-velero-plugin-oadp-1.3-postsubmits.yaml | 2 +- ...openshift-openshift-velero-plugin-oadp-1.3-presubmits.yaml | 4 ++-- ...penshift-openshift-velero-plugin-oadp-1.4-postsubmits.yaml | 2 +- ...openshift-openshift-velero-plugin-oadp-1.4-presubmits.yaml | 4 ++-- ...nshift-velero-plugin-for-aws-konveyor-dev-postsubmits.yaml | 2 +- ...enshift-velero-plugin-for-aws-konveyor-dev-presubmits.yaml | 4 ++-- .../openshift-velero-plugin-for-aws-oadp-1.0-postsubmits.yaml | 2 +- .../openshift-velero-plugin-for-aws-oadp-1.0-presubmits.yaml | 4 ++-- .../openshift-velero-plugin-for-aws-oadp-1.3-postsubmits.yaml | 2 +- .../openshift-velero-plugin-for-aws-oadp-1.3-presubmits.yaml | 4 ++-- .../openshift-velero-plugin-for-aws-oadp-1.4-postsubmits.yaml | 2 +- .../openshift-velero-plugin-for-aws-oadp-1.4-presubmits.yaml | 4 ++-- ...nshift-velero-plugin-for-gcp-konveyor-dev-postsubmits.yaml | 2 +- ...enshift-velero-plugin-for-gcp-konveyor-dev-presubmits.yaml | 4 ++-- .../openshift-velero-plugin-for-gcp-oadp-1.0-postsubmits.yaml | 2 +- .../openshift-velero-plugin-for-gcp-oadp-1.0-presubmits.yaml | 4 ++-- .../openshift-velero-plugin-for-gcp-oadp-1.3-postsubmits.yaml | 2 +- .../openshift-velero-plugin-for-gcp-oadp-1.3-presubmits.yaml | 4 ++-- .../openshift-velero-plugin-for-gcp-oadp-1.4-postsubmits.yaml | 2 +- .../openshift-velero-plugin-for-gcp-oadp-1.4-presubmits.yaml | 4 ++-- ...o-plugin-for-microsoft-azure-konveyor-dev-postsubmits.yaml | 2 +- ...ro-plugin-for-microsoft-azure-konveyor-dev-presubmits.yaml | 4 ++-- ...elero-plugin-for-microsoft-azure-oadp-1.0-postsubmits.yaml | 2 +- ...velero-plugin-for-microsoft-azure-oadp-1.0-presubmits.yaml | 4 ++-- ...elero-plugin-for-microsoft-azure-oadp-1.3-postsubmits.yaml | 2 +- ...velero-plugin-for-microsoft-azure-oadp-1.3-presubmits.yaml | 4 ++-- ...elero-plugin-for-microsoft-azure-oadp-1.4-postsubmits.yaml | 2 +- ...velero-plugin-for-microsoft-azure-oadp-1.4-presubmits.yaml | 4 ++-- .../velero/openshift-velero-konveyor-dev-postsubmits.yaml | 2 +- .../velero/openshift-velero-konveyor-dev-presubmits.yaml | 4 ++-- .../velero/openshift-velero-oadp-1.0-postsubmits.yaml | 2 +- .../velero/openshift-velero-oadp-1.0-presubmits.yaml | 4 ++-- .../velero/openshift-velero-oadp-1.3-postsubmits.yaml | 2 +- .../velero/openshift-velero-oadp-1.3-presubmits.yaml | 4 ++-- .../velero/openshift-velero-oadp-1.4-postsubmits.yaml | 2 +- .../velero/openshift-velero-oadp-1.4-presubmits.yaml | 4 ++-- .../stolostron-image-builder-master-postsubmits.yaml | 2 +- .../stolostron-image-builder-master-presubmits.yaml | 4 ++-- 82 files changed, 123 insertions(+), 123 deletions(-) diff --git a/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-postsubmits.yaml b/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-postsubmits.yaml index ba628acd17ae..01ffbfe6a0b2 100644 --- a/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-postsubmits.yaml +++ b/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-presubmits.yaml b/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-presubmits.yaml index 0924b8e1908c..05daf9171717 100644 --- a/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-presubmits.yaml +++ b/ci-operator/jobs/migtools/oadp-non-admin/migtools-oadp-non-admin-master-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^master$ - ^master- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-migtools-oadp-non-admin-master-images diff --git a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-postsubmits.yaml b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-postsubmits.yaml index 34941515831b..60835f76ab6f 100644 --- a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-presubmits.yaml b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-presubmits.yaml index b29dfe0a7cc7..1bf30a5906d2 100644 --- a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-master-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^master$ - ^master- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-qe-baremetal-qe-infra-master-images diff --git a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-postsubmits.yaml b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-postsubmits.yaml index 127fd5e0a320..296442401d0f 100644 --- a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-postsubmits.yaml +++ b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-presubmits.yaml b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-presubmits.yaml index 01ad6c9ede59..dcf18c84bc53 100644 --- a/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-presubmits.yaml +++ b/ci-operator/jobs/openshift-qe/baremetal-qe-infra/openshift-qe-baremetal-qe-infra-staging-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^staging$ - ^staging- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-qe-baremetal-qe-infra-staging-images diff --git a/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-postsubmits.yaml b/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-postsubmits.yaml index 4cb267a61035..b5b0a31fdbbc 100644 --- a/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-postsubmits.yaml @@ -56,7 +56,7 @@ postsubmits: cluster: build11 decorate: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-presubmits.yaml b/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-presubmits.yaml index c1a6bf863a5f..5feedea64fa9 100644 --- a/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/ci-tools/openshift-ci-tools-master-presubmits.yaml @@ -385,11 +385,11 @@ presubmits: branches: - ^master$ - ^master- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-ci-tools-master-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-main-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-main-postsubmits.yaml index 5f498fc1102c..678c30868c35 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-main-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-main-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-main-presubmits.yaml index ae11bf246b26..4602d34dafee 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-main-presubmits.yaml @@ -122,13 +122,13 @@ presubmits: branches: - ^main$ - ^main- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-main-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-postsubmits.yaml index c415e8bc7f31..034b6ebfd717 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-presubmits.yaml index 8fd31927df00..b74cc8201043 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.6-presubmits.yaml @@ -122,13 +122,13 @@ presubmits: branches: - ^release-5\.6$ - ^release-5\.6- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-release-5.6-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-postsubmits.yaml index a2e30b9405be..c7f8173f39f1 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-presubmits.yaml index f51881d03255..db6703fbb15f 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.8-presubmits.yaml @@ -122,13 +122,13 @@ presubmits: branches: - ^release-5\.8$ - ^release-5\.8- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-release-5.8-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-postsubmits.yaml index af6e7f50e728..3dff520ca8f4 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-presubmits.yaml index 7b98945bcf4c..75b2db8739bf 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-5.9-presubmits.yaml @@ -122,13 +122,13 @@ presubmits: branches: - ^release-5\.9$ - ^release-5\.9- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-release-5.9-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-postsubmits.yaml index 6df26bc94958..c8d096d349d9 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-presubmits.yaml index 933e6325f5d2..515f73e58bef 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-release-6.0-presubmits.yaml @@ -122,13 +122,13 @@ presubmits: branches: - ^release-6\.0$ - ^release-6\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-release-6.0-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-postsubmits.yaml index 4bb188ceb3f8..2a0ea30429a6 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-presubmits.yaml index 5e72bb3221d2..f00ed0bd183b 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v2.9.8-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^upstream-v2\.9\.8$ - ^upstream-v2\.9\.8- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-upstream-v2.9.8-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-postsubmits.yaml index 121310beb702..8848c1d6b7ca 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-presubmits.yaml index 40f0499bbba5..f0d31cb6e74f 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.0-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^upstream-v3\.1\.0$ - ^upstream-v3\.1\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-upstream-v3.1.0-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-postsubmits.yaml index ceefba820def..f2df88938f78 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-presubmits.yaml index 80ec16676ae9..fe0690588a87 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.1.1-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^upstream-v3\.1\.1$ - ^upstream-v3\.1\.1- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-upstream-v3.1.1-images diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-postsubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-postsubmits.yaml index eabf73c6ab6f..f7a69987944d 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-presubmits.yaml b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-presubmits.yaml index e60f1e879a19..ee1c08445d39 100644 --- a/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/loki/openshift-loki-upstream-v3.2.0-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^upstream-v3\.2\.0$ - ^upstream-v3\.2\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-loki-upstream-v3.2.0-images diff --git a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-postsubmits.yaml index 0d31de26b188..6d2fa8ccc06d 100644 --- a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-postsubmits.yaml @@ -7,7 +7,7 @@ postsubmits: cluster: build11 decorate: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-presubmits.yaml index 9877219d98aa..bfe7aa4807d7 100644 --- a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-main-presubmits.yaml @@ -278,11 +278,11 @@ presubmits: branches: - ^main$ - ^main- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-multiarch-tuning-operator-main-images diff --git a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-postsubmits.yaml b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-postsubmits.yaml index 342acf079feb..f724801e1212 100644 --- a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-postsubmits.yaml +++ b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-presubmits.yaml b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-presubmits.yaml index c24898f9c03f..233accd850e8 100644 --- a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.0.1-presubmits.yaml @@ -394,13 +394,13 @@ presubmits: branches: - ^v0\.0\.1$ - ^v0\.0\.1- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-multiarch-tuning-operator-v0.0.1-images diff --git a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-postsubmits.yaml b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-postsubmits.yaml index 0d80f44d2225..ebecaac00b7a 100644 --- a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-postsubmits.yaml +++ b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-postsubmits.yaml @@ -87,7 +87,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-presubmits.yaml b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-presubmits.yaml index 87a8fd9b56db..e68cf83973ad 100644 --- a/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/multiarch-tuning-operator/openshift-multiarch-tuning-operator-v0.9-presubmits.yaml @@ -461,13 +461,13 @@ presubmits: branches: - ^v0\.9$ - ^v0\.9- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-multiarch-tuning-operator-v0.9-images diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml index 53cbb01cea47..99e3788659ef 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml index 377bcce645bd..54382e347ec5 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml @@ -849,13 +849,13 @@ presubmits: branches: - ^master$ - ^master- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-master-images diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml index fe52c5b86643..d6b505042288 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml index 04e4c2a1129f..14ea0d854a35 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml @@ -399,13 +399,13 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-oadp-1.0-images diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-postsubmits.yaml index 1bdb7c62fa11..2ce3f91c86ab 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml index e223b03f23fe..1ea55a1d2665 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml @@ -793,13 +793,13 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-oadp-1.3-images diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml index 04177d21eb0b..fc55381b4010 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml index e2cedc4ee786..ee0feb8d72a7 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml @@ -849,13 +849,13 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-oadp-operator-oadp-1.4-images diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-postsubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-postsubmits.yaml index 4c6deb511f03..5196d98eaa49 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-presubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-presubmits.yaml index 5ba3137e84fb..13ce673f34a4 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^master$ - ^master- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-openshift-velero-plugin-master-images diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-postsubmits.yaml index b395fc5c8598..dd0785097564 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-presubmits.yaml index 487ba752497f..96798a9b18dd 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-openshift-velero-plugin-oadp-1.0-images diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-postsubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-postsubmits.yaml index 7bfb6eaa0f9a..d1975f9eac8e 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-postsubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-presubmits.yaml index f3a03ee6624f..cddf322210be 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-openshift-velero-plugin-oadp-1.3-images diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-postsubmits.yaml index fd969f9ab660..56f594ff3f8d 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-postsubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-presubmits.yaml index dd200af5b7d8..f8690b4fd63e 100644 --- a/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-openshift-velero-plugin-oadp-1.4-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-postsubmits.yaml index 7a76ede33db4..36fa21a3dd10 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-presubmits.yaml index 199925b8ee91..598665a20e9d 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^konveyor-dev$ - ^konveyor-dev- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-aws-konveyor-dev-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-postsubmits.yaml index 5273e12087d2..4a7a78e77a03 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-presubmits.yaml index e685930a85fc..aca58a57787c 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-aws-oadp-1.0-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-postsubmits.yaml index 87b8b92b2b52..beee2fc50555 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-presubmits.yaml index aa97aced6240..810520dee46b 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-aws-oadp-1.3-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-postsubmits.yaml index 31c3670b2e07..62bb9efaddc7 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-presubmits.yaml index 4e7055a406bd..81324871324a 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-aws-oadp-1.4-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-postsubmits.yaml index 70a0ba875394..3878e1663a6b 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-presubmits.yaml index 3a5da80a59b9..09733f468439 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^konveyor-dev$ - ^konveyor-dev- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-gcp-konveyor-dev-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-postsubmits.yaml index 879e73fcd199..7ccea05de964 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-presubmits.yaml index 88899fa752fb..4e8037690922 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-gcp-oadp-1.0-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-postsubmits.yaml index ad57ad0604ac..affe77998226 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-presubmits.yaml index 6bc2a319f706..44194ef27e12 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-gcp-oadp-1.3-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-postsubmits.yaml index b0531490fea3..218cd380ddda 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-presubmits.yaml index 5b97bf070f73..fabd8796c074 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-gcp-oadp-1.4-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-postsubmits.yaml index 6f9665be5192..1014e0358166 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-presubmits.yaml index 84afe1dff935..36293775e649 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^konveyor-dev$ - ^konveyor-dev- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-microsoft-azure-konveyor-dev-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-postsubmits.yaml index cfcb3245d59e..2a37f4948f14 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-presubmits.yaml index 442cae50fc99..6d8ede4a751e 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-microsoft-azure-oadp-1.0-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-postsubmits.yaml index d8a3e690e633..35c4db2a9f70 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-presubmits.yaml index f06681e2ff2e..832a372ec8b5 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-microsoft-azure-oadp-1.3-images diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-postsubmits.yaml index 5776a03c7801..493aa0927d4e 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-presubmits.yaml index 122e4c03354e..054ececb6000 100644 --- a/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-plugin-for-microsoft-azure-oadp-1.4-images diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-postsubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-postsubmits.yaml index 32b00b069d07..9541da65f9ea 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml index 0051ed6fa081..483f0396d4bf 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^konveyor-dev$ - ^konveyor-dev- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-konveyor-dev-images diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-postsubmits.yaml index b38aaa332ae3..dc1ca0626017 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-presubmits.yaml index fec9ce340eda..bcc5dfeea716 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.0-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-oadp-1.0-images diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-postsubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-postsubmits.yaml index 95d2d60ffc33..9cd10dc63bba 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-presubmits.yaml index 93c6efc7855c..cbc1ad2ebf3c 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.3-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-oadp-1.3-images diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-postsubmits.yaml index 312f83d88ce8..d6cdf38c1beb 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-postsubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-presubmits.yaml index 5c5d9b57446f..5e73753166fe 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-oadp-1.4-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-oadp-1.4-images diff --git a/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-postsubmits.yaml b/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-postsubmits.yaml index c9dbe9d2c458..f05777a845d0 100644 --- a/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-postsubmits.yaml +++ b/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-postsubmits.yaml @@ -9,7 +9,7 @@ postsubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-presubmits.yaml b/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-presubmits.yaml index 589872fc7fa6..8c1ad51c199e 100644 --- a/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-presubmits.yaml +++ b/ci-operator/jobs/stolostron/image-builder/stolostron-image-builder-master-presubmits.yaml @@ -5,13 +5,13 @@ presubmits: branches: - ^master$ - ^master- - cluster: build11 + cluster: build10 context: ci/prow/images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cluster: build11 + ci-operator.openshift.io/cluster: build10 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-stolostron-image-builder-master-images From 242c3280b01875cc146f6d238db790920fa32cee Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 9 Oct 2024 08:32:14 -0600 Subject: [PATCH 18/21] yaml moved --- ...shift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index 46c33b0654f6..767fad7a775a 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -56,7 +56,7 @@ tests: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" ES_SECRETS_PATH: /secret_stackrox - EXTRA_FLAGS: --metrics-profile metrics-aggregated.yml,https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/tests/kube-burner/cluster-density/metrics.yml + EXTRA_FLAGS: --metrics-profile metrics-aggregated.yml,https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/config/metrics-acs.yml KUBE_BURNER_VERSION: 1.4.0 USER_TAGS: | TicketId 382 From 59cafbcc4031bf1f7ca2e87fdf175e8f40ee0522 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:32:51 -0600 Subject: [PATCH 19/21] remove extraflags where not needed --- .../conc-builds/openshift-qe-conc-builds-ref.yaml | 4 ---- .../openshift-qe-control-plane-smoke-ref.yaml | 4 ---- .../ingress-perf/openshift-qe-ingress-perf-ref.yaml | 4 ---- .../network-perf/openshift-qe-network-perf-ref.yaml | 4 ---- .../network-policy/openshift-qe-network-policy-ref.yaml | 4 ---- .../network-smoke/openshift-qe-network-smoke-ref.yaml | 4 ---- .../network-vm-perf/openshift-qe-network-vm-perf-ref.yaml | 4 ---- .../router-perf/openshift-qe-router-perf-ref.yaml | 4 ---- 8 files changed, 32 deletions(-) diff --git a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml index 5dea7c267a99..10451802167c 100644 --- a/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/conc-builds/openshift-qe-conc-builds-ref.yaml @@ -16,10 +16,6 @@ ref: cpu: 100m memory: 100Mi env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml index fa5bc5cebad6..b95b078dccc7 100644 --- a/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/control-plane-smoke/openshift-qe-control-plane-smoke-ref.yaml @@ -14,10 +14,6 @@ ref: name: ocp-qe-gcp-sa mount_path: /ga-gsheet env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml index cde4f5a9b711..e4b1769ee202 100644 --- a/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/ingress-perf/openshift-qe-ingress-perf-ref.yaml @@ -14,10 +14,6 @@ ref: name: perfscale-metal-bastion mount_path: /bm env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml index 8ab534f37d0a..d02b5fac2c6a 100644 --- a/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-perf/openshift-qe-network-perf-ref.yaml @@ -6,10 +6,6 @@ ref: tag: latest cli: latest env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.4" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml index 16b07b173cee..a92f08c71896 100644 --- a/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-policy/openshift-qe-network-policy-ref.yaml @@ -8,10 +8,6 @@ ref: commands: openshift-qe-network-policy-commands.sh timeout: 8h0m0s env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml index 3bca547b62ce..9d3dbb6bd0b9 100644 --- a/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-smoke/openshift-qe-network-smoke-ref.yaml @@ -19,10 +19,6 @@ ref: memory: 100Mi timeout: 4h env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.2" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml index a0ffabc2a1d1..db572931bb1a 100644 --- a/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/network-vm-perf/openshift-qe-network-vm-perf-ref.yaml @@ -6,10 +6,6 @@ ref: tag: latest cli: latest env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.4" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml index ed0f9132ca2b..20b4443dbd81 100644 --- a/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/router-perf/openshift-qe-router-perf-ref.yaml @@ -14,10 +14,6 @@ ref: name: ocp-qe-gcp-sa mount_path: /ga-gsheet env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.2" documentation: |- From 4f8f0163eca872228c47e28073fbe95c55573dc6 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:49:22 -0600 Subject: [PATCH 20/21] remove duplicates --- .../openshift-qe-cluster-density-v2-ref.yaml | 4 ---- .../openshift-qe-node-density-heavy-ref.yaml | 4 ---- .../openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml index 95550b96de87..d40619a8e573 100644 --- a/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml @@ -6,10 +6,6 @@ ref: tag: latest cli: latest env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml index 842ccad62760..6a3f91c33329 100644 --- a/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/node-density-heavy/openshift-qe-node-density-heavy-ref.yaml @@ -17,10 +17,6 @@ ref: name: perfscale-metal-bastion mount_path: /bm env: - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- diff --git a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml index 3458a1e833f6..e378b874b964 100644 --- a/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml +++ b/ci-operator/step-registry/openshift-qe/web-burner/openshift-qe-web-burner-ref.yaml @@ -22,10 +22,6 @@ ref: default: "false" documentation: |- Enable the new AdminPolicyBasedExternalRoute CR - - name: EXTRA_FLAGS - default: "" - documentation: |- - Add args for e2e-benchmarking kube-burner-ocp cmd. - name: E2E_VERSION default: "v2.2.3" documentation: |- From 738bb8ee94d2c2f83f35d7eeb31757805a00533d Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:02:24 -0600 Subject: [PATCH 21/21] preserve default churn/timeout --- ...shift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml index 767fad7a775a..75a62cd727e9 100644 --- a/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml +++ b/ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml @@ -56,7 +56,7 @@ tests: BASE_DOMAIN: perfscale.rox.systems COMPUTE_NODE_REPLICAS: "24" ES_SECRETS_PATH: /secret_stackrox - EXTRA_FLAGS: --metrics-profile metrics-aggregated.yml,https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/config/metrics-acs.yml + EXTRA_FLAGS: --churn-duration=20m --timeout=5h --metrics-profile metrics-aggregated.yml,https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/config/metrics-acs.yml KUBE_BURNER_VERSION: 1.4.0 USER_TAGS: | TicketId 382