Horreum local index (#54077)

* enable local indexing for POC jobs Signed-off-by: Shashank Reddy Boyapally <sboyapal@redhat.com> * changed with flag name Signed-off-by: Shashank Reddy Boyapally <sboyapal@redhat.com> * ran ci-operator-config Signed-off-by: Shashank Reddy Boyapally <sboyapal@redhat.com> * changed flag name to ENABLE_LOCAL_INDEX Signed-off-by: Shashank Reddy Boyapally <sboyapal@redhat.com> --------- Signed-off-by: Shashank Reddy Boyapally <sboyapal@redhat.com>
openshift · Jul 12, 2024 · 90cb82d · 90cb82d
1 parent 94e357d
commit 90cb82d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 60 deletions.
diff --git a/...t-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml b/...t-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml
@@ -31,6 +31,7 @@ tests:
       BASE_DOMAIN: perfscale.devcluster.openshift.com
       COMPUTE_NODE_REPLICAS: "120"
       COMPUTE_NODE_TYPE: m5.xlarge
+      ENABLE_LOCAL_INDEX: "true"
       EXTRA_FLAGS: --churn-duration=20m --service-latency
       PROFILE_TYPE: reporting
       SIZE_VARIANT: large

diff --git a/...t-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.17-nightly-x86.yaml b/...t-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.17-nightly-x86.yaml
@@ -30,6 +30,7 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       COMPUTE_NODE_REPLICAS: "6"
+      ENABLE_LOCAL_INDEX: "true"
       EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=13s
       ITERATION_MULTIPLIER_ENV: "15"
       ZONES_COUNT: "3"

diff --git a/...step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh b/...step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-commands.sh
@@ -32,7 +32,7 @@ export ITERATIONS=$(($iteration_multiplier*$current_worker_count))
 
 export ES_SERVER="https://$ES_USERNAME:$ES_PASSWORD@search-ocp-qe-perf-scale-test-elk-hcm7wtsqpxy7xogbu72bor4uve.us-east-1.es.amazonaws.com"
 
-if [[ "${USE_HORREUM_WEBHOOK}" == "true" ]]; then
+if [[ "${ENABLE_LOCAL_INDEX}" == "true" ]]; then
     EXTRA_FLAGS+=" --local-indexing"
 fi
 EXTRA_FLAGS+=" --gc-metrics=true --profile-type=${PROFILE_TYPE}"
@@ -45,33 +45,7 @@ folder_name=$(ls -t -d /tmp/*/ | head -1)
 jq ".iterations = $ITERATIONS" $folder_name/index_data.json >> ${SHARED_DIR}/index_data.json
 
 
-if [[ "${USE_HORREUM_WEBHOOK}" == "true" ]]; then
+if [[ "${ENABLE_LOCAL_INDEX}" == "true" ]]; then
     metrics_folder_name=$(find . -maxdepth 1 -type d -name 'collected-metric*' | head -n 1)
     cp -r "${metrics_folder_name}" "${ARTIFACT_DIR}/"
-
-    WEBHOOK_USER=$(cat "/horreum-secret/horreum-webhook-user")
-
-    export artifacts_base_url="https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs"
-    export artifacts_pr_base_url="https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_release"
-    job_id=$JOB_NAME
-    task_id=$BUILD_ID
-
-    if [[ "${JOB_TYPE}" == "presubmit" ]]; then
-        artifacts_url="${artifacts_pr_base_url}/${PULL_NUMBER}/${job_id}/${task_id}/artifacts"
-    else
-        artifacts_url="${artifacts_base_url}/${job_id}/${task_id}/artifacts"
-    fi
-
-    benchmark_name="openshift-qe-cluster-density-v2"
-
-    WEBHOOK_URL="https://snake-curious-easily.ngrok-free.app"
-    JSON_DATA='{"jobName":"kube-burner-poc","parameters":{"ARTIFACTS_URL":"'"$artifacts_url"'", "BENCHMARK_NAME":"'"$benchmark_name"'", "BUCKET_NAME":"test-platform-results", "TYPE":"report"}}'
-
-    curl -X POST \
-         -u "user:$WEBHOOK_USER"  \
-         --header "Content-Type: application/json" \
-         --retry 5 \
-         "$WEBHOOK_URL" \
-         -d "$JSON_DATA"
-
 fi
diff --git a/...or/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml b/...or/step-registry/openshift-qe/cluster-density-v2/openshift-qe-cluster-density-v2-ref.yaml
@@ -33,10 +33,10 @@ ref:
     default: "9"
     documentation: |-
       The number of iterations per worker nodes to create
-  - name: USE_HORREUM_WEBHOOK
+  - name: ENABLE_LOCAL_INDEX
     default: "false"
     documentation: |-
-      Trigger to call horreum webhook
+      Trigger to enable local indexing
   commands: openshift-qe-cluster-density-v2-commands.sh
   timeout: 6h
   credentials:

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
@@ -29,7 +29,7 @@ EXTRA_FLAGS="--gc-metrics=true --pods-per-node=$PODS_PER_NODE --pod-ready-thresh
 
 export ES_SERVER="https://$ES_USERNAME:$ES_PASSWORD@search-ocp-qe-perf-scale-test-elk-hcm7wtsqpxy7xogbu72bor4uve.us-east-1.es.amazonaws.com"
 
-if [[ "${USE_HORREUM_WEBHOOK}" == "true" ]]; then
+if [[ "${ENABLE_LOCAL_INDEX}" == "true" ]]; then
     EXTRA_FLAGS+=" --local-indexing"
 fi
 
@@ -42,33 +42,7 @@ rm -f ${SHARED_DIR}/index.json
 folder_name=$(ls -t -d /tmp/*/ | head -1)
 jq ".iterations = $PODS_PER_NODE" $folder_name/index_data.json >> ${SHARED_DIR}/index_data.json
 
-if [[ "${USE_HORREUM_WEBHOOK}" == "true" ]]; then
+if [[ "${ENABLE_LOCAL_INDEX}" == "true" ]]; then
     metrics_folder_name=$(find . -maxdepth 1 -type d -name 'collected-metric*' | head -n 1)
     cp -r "${metrics_folder_name}" "${ARTIFACT_DIR}/"
-
-    WEBHOOK_USER=$(cat "/horreum-secret/horreum-webhook-user")
-
-    export artifacts_base_url="https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs"
-    export artifacts_pr_base_url="https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_release"
-    job_id=$JOB_NAME
-    task_id=$BUILD_ID
-
-    if [[ "${JOB_TYPE}" == "presubmit" ]]; then
-        artifacts_url="${artifacts_pr_base_url}/${PULL_NUMBER}/${job_id}/${task_id}/artifacts"
-    else
-        artifacts_url="${artifacts_base_url}/${job_id}/${task_id}/artifacts"
-    fi
-
-    benchmark_name="openshift-qe-node-density"
-
-    WEBHOOK_URL="https://snake-curious-easily.ngrok-free.app"
-    JSON_DATA='{"jobName":"kube-burner-poc","parameters":{"ARTIFACTS_URL":"'"$artifacts_url"'", "BENCHMARK_NAME":"'"$benchmark_name"'", "BUCKET_NAME":"test-platform-results", "TYPE":"report"}}'
-
-    curl -X POST \
-         -u "user:$WEBHOOK_USER"  \
-         --header "Content-Type: application/json" \
-         --retry 5 \
-         "$WEBHOOK_URL" \
-         -d "$JSON_DATA"
-
 fi
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
@@ -37,9 +37,9 @@ ref:
     default: "both"
     documentation: |-
       Kube-burner indexing profile type
-  - name: USE_HORREUM_WEBHOOK
+  - name: ENABLE_LOCAL_INDEX
     default: "false"
     documentation: |-
-      Trigger to call horreum webhook
+      Trigger to enable local-indexing
   documentation: >-
     This step runs the perfscale node-density workload in the deployed cluster