Moving orion params outside of JUNIT if-block for reusability (#61103)

* Moving orion params outside of JUNIT if-block for reusability

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

* Adding additional checks for ubound variables

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

---------

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

Author: vishnuchalla

ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.17-nightly-x86.yaml

@@ -26,6 +26,7 @@ tests:
       ENABLE_LOCAL_INDEX: "true"
       ES_TYPE: qe
       EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=13s
+      HUNTER_ANALYZE: "true"
       ITERATION_MULTIPLIER_ENV: "15"
       JUNIT: "true"
       RUN_ORION: "true"

ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.18-nightly-x86.yaml

@@ -26,6 +26,7 @@ tests:
       ENABLE_LOCAL_INDEX: "true"
       ES_TYPE: qe
       EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=13s
+      HUNTER_ANALYZE: "true"
       ITERATION_MULTIPLIER_ENV: "15"
       JUNIT: "true"
       RUN_ORION: "true"

ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.19-nightly-x86.yaml

@@ -39,6 +39,7 @@ tests:
       ENABLE_LOCAL_INDEX: "true"
       ES_TYPE: qe
       EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=20s
+      HUNTER_ANALYZE: "true"
       ITERATION_MULTIPLIER_ENV: "15"
       JUNIT: "true"
       RUN_ORION: "true"

ci-operator/step-registry/openshift-qe/orion/openshift-qe-orion-commands.sh

@@ -36,38 +36,39 @@ else
 fi
 
 pip install .
-export  EXTRA_FLAGS=""
-if [[ -n "$UUID" ]]; then
+export EXTRA_FLAGS=" --lookback ${LOOKBACK}d"
+if [[ ! -z "$UUID" ]]; then
     export EXTRA_FLAGS+=" --uuid ${UUID}"
 fi
 if [ ${HUNTER_ANALYZE} == "true" ]; then
- export EXTRA_FLAGS+=" --hunter-analyze"
+    export EXTRA_FLAGS+=" --hunter-analyze"
 fi
 if [ ${JUNIT} == true ]; then
-  export EXTRA_FLAGS+=" --lookback ${LOOKBACK}d"
-  export EXTRA_FLAGS+=" --output-format junit"
-  export EXTRA_FLAGS+=" --save-output-path=junit.xml"
-  export EXTRA_FLAGS+=" --ack /tmp/${VERSION}_${ACK_FILE}"
-  export EXTRA_FLAGS+=" --hunter-analyze"
+    export EXTRA_FLAGS+=" --output-format junit"
+    export EXTRA_FLAGS+=" --save-output-path=junit.xml"
 fi
 
-if [[ -n "$ORION_CONFIG" ]]; then
-  export CONFIG="${ORION_CONFIG}"
+if [[ ! -z "$ORION_CONFIG" ]]; then
+    export CONFIG="${ORION_CONFIG}"
 fi
 
-if [[ -n "$ORION_ENVS" ]]; then
-  ORION_ENVS=$(echo "$ORION_ENVS" | xargs)
-  IFS=',' read -r -a env_array <<< "$ORION_ENVS"
-  for env_pair in "${env_array[@]}"; do
-    env_pair=$(echo "$env_pair" | xargs)
-    env_key=$(echo "$env_pair" | cut -d'=' -f1)
-    env_value=$(echo "$env_pair" | cut -d'=' -f2-)
-    export "$env_key"="$env_value"
-  done
+if [[ ! -z "$ACK_FILE" ]]; then
+    export EXTRA_FLAGS+=" --ack /tmp/${VERSION}_${ACK_FILE}"
 fi
 
-if [[ -n "$LOOKBACK_SIZE" ]]; then
-  export EXTRA_FLAGS+=" --lookback-size ${LOOKBACK_SIZE}"
+if [[ -n "${ORION_ENVS:-}" ]]; then
+    ORION_ENVS=$(echo "$ORION_ENVS" | xargs)
+    IFS=',' read -r -a env_array <<< "$ORION_ENVS"
+    for env_pair in "${env_array[@]}"; do
+      env_pair=$(echo "$env_pair" | xargs)
+      env_key=$(echo "$env_pair" | cut -d'=' -f1)
+      env_value=$(echo "$env_pair" | cut -d'=' -f2-)
+      export "$env_key"="$env_value"
+    done
+fi
+
+if [[ -n "${LOOKBACK_SIZE:-}" ]]; then
+    export EXTRA_FLAGS+=" --lookback-size ${LOOKBACK_SIZE}"
 fi
 
 set +e

ci-operator/step-registry/openshift-qe/orion/openshift-qe-orion-ref.yaml

@@ -62,6 +62,10 @@ ref:
     default: ""
     documentation:
       Var used to tell the step which workload is calling Orion, like cluster-density, node-density, etc.
+  - name: ACK_FILE
+    default: ""
+    documentation:
+      Orion ack file name that has a list of acknowledged issues/regressions.
   - name: ORION_ENVS
     default: ""
     documentation: