updating rds-core to work through PRs

Signed-off-by: Vishnu Challa <[email protected]>

Author: Vishnu Challa

ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master.yaml

@@ -473,6 +473,39 @@ tests:
     test:
     - ref: cloud-bulldozer-e2e-benchmarking-egressip
     workflow: openshift-qe-installer-aws
+- always_run: false
+  as: e2e-rds-core-mno
+  capabilities:
+  - intranet
+  restrict_network_access: false
+  steps:
+    cluster_profile: metal-perfscale-jetlag
+    env:
+      BAREMETAL: "true"
+      BASTION_CP_INTERFACE: ens7f1
+      CRUCIBLE: "false"
+      ISOLATED_CORES: 2-39,42-79
+      JETLAG_BRANCH: main
+      LAB_CLOUD: cloud19
+      LAB_INTERFACE: eno3
+      LABEL: node-role.kubernetes.io/worker-dpdk,node-role.kubernetes.io/worker-metallb
+      OCP_BUILD: ga
+      OCP_VERSION: 4.18.5
+      PUBLIC_VLAN: "true"
+      RESERVED_CORES: 0,40,1,41
+      SRIOV_NODE_SELECTOR: node-role.kubernetes.io/worker
+      SRIOV_NUM_VFS: "64"
+      SRIOV_PF_NAME: ens7f0
+      TELCO: "true"
+    test:
+    - chain: openshift-qe-installer-bm-ping
+    - chain: openshift-qe-installer-bm-deploy
+    - chain: openshift-qe-cluster-health
+    - chain: openshift-qe-installer-bm-day2-label
+    - chain: openshift-qe-installer-bm-day2-sriov
+    - chain: openshift-qe-installer-bm-day2-metallb
+    - chain: openshift-qe-installer-bm-day2-perf-profile-rds-core
+    - ref: cloud-bulldozer-e2e-benchmarking-rds-core
 zz_generated_metadata:
   branch: master
   org: cloud-bulldozer

ci-operator/config/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal.yaml

@@ -1125,6 +1125,82 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )(e2e-pvc-density-single-node|remaining-required),?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build11
+    context: ci/prow/e2e-rds-core-mno
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      capability/intranet: intranet
+      ci-operator.openshift.io/cloud: metal-perfscale-jetlag
+      ci-operator.openshift.io/cloud-cluster-profile: metal-perfscale-jetlag
+      ci.openshift.io/generator: prowgen
+      job-release: "4.18"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-cloud-bulldozer-e2e-benchmarking-master-e2e-rds-core-mno
+    rerun_command: /test e2e-rds-core-mno
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=e2e-rds-core-mno
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )(e2e-rds-core-mno|remaining-required),?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:

ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master-presubmits.yaml

@@ -4,39 +4,42 @@ set -o nounset
 set -o pipefail
 set -x
 cat /etc/os-release
-
-if [ ${BAREMETAL} == "true" ]; then
-  SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null"
-  bastion="$(cat /bm/address)"
-  # Copy over the kubeconfig
-  if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then
-    ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig
-    export KUBECONFIG=/tmp/kubeconfig
-  else
-    export KUBECONFIG=${SHARED_DIR}/kubeconfig
-  fi
-  # Setup socks proxy
-  ssh ${SSH_ARGS} root@$bastion -fNT -D 12345
-  export https_proxy=socks5://localhost:12345
-  export http_proxy=socks5://localhost:12345
-  oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345
-fi
-
-python --version
-pushd /tmp
-python -m virtualenv ./venv_qe
-source ./venv_qe/bin/activate
-
 oc config view
 oc projects
+pushd /tmp
 
-git clone https://github.com/vishnuchalla/e2e-benchmarking --branch v0.0.1 --depth 1
-pushd e2e-benchmarking
-pushd workloads/kube-burner-ocp-wrapper
-export WORKLOAD=rds-core
-ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false PERFORMANCE_PROFILE="cpt-pao" ./run.sh
 
-if [ ${BAREMETAL} == "true" ]; then
-  # kill the ssh tunnel so the job completes
-  pkill ssh
-fi
+if [[ "$JOB_TYPE" == "presubmit" ]] && [[ "$REPO_OWNER" = "cloud-bulldozer" ]] && [[ "$REPO_NAME" = "e2e-benchmarking" ]]; then
+    if [ ${BAREMETAL} == "true" ]; then
+      SSH_ARGS="-i /bm/jh_priv_ssh_key -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null"
+      bastion="$(cat /bm/address)"
+      # Copy over the kubeconfig
+      if [ ! -f "${SHARED_DIR}/kubeconfig" ]; then
+        ssh ${SSH_ARGS} root@$bastion "cat ${KUBECONFIG_PATH}" > /tmp/kubeconfig
+        export KUBECONFIG=/tmp/kubeconfig
+      else
+        export KUBECONFIG=${SHARED_DIR}/kubeconfig
+      fi
+      # Setup socks proxy
+      ssh ${SSH_ARGS} root@$bastion -fNT -D 12345
+      export https_proxy=socks5://localhost:12345
+      export http_proxy=socks5://localhost:12345
+      oc --kubeconfig="$KUBECONFIG" config set-cluster bm --proxy-url=socks5://localhost:12345
+    fi
+    git clone https://github.com/${REPO_OWNER}/${REPO_NAME}
+    pushd ${REPO_NAME}
+    git config --global user.email "[email protected]"
+    git config --global user.name "ocp-perfscale"
+    git pull origin pull/${PULL_NUMBER}/head:${PULL_NUMBER} --rebase
+    git switch ${PULL_NUMBER}
+    pushd workloads/kube-burner-ocp-wrapper
+    export WORKLOAD=rds-core
+    ES_SERVER="" ITERATIONS=1 PPROF=false CHURN=false PERFORMANCE_PROFILE="cpt-pao" ./run.sh
+
+    if [ ${BAREMETAL} == "true" ]; then
+      # kill the ssh tunnel so the job completes
+      pkill ssh
+    fi
+else
+    echo "We are sorry, this job is only meant for cloud-bulldozer/e2e-benchmarking repo PR testing"
+fi

ci-operator/jobs/cloud-bulldozer/e2e-benchmarking/cloud-bulldozer-e2e-benchmarking-master_metal-presubmits.yaml

@@ -64,7 +64,6 @@ spec:
     userLevelNetworking: false
 EOF
 
-sleep 60
 kubectl wait --for jsonpath='{.status.updatedMachineCount}'="$(oc get node --no-headers -l node-role.kubernetes.io/worker= | wc -l)" --timeout=30m mcp worker
 oc adm wait-for-stable-cluster --minimum-stable-period=2m --timeout=20m