removed backend version param and set unleash flag value in pr check file

Author: Saurabh Pimpalgaokar

clowdapp.yaml

@@ -96,8 +96,6 @@ objects:
                 name: service-account-for-kessel
                 key: client-secret
                 optional: true
-          - name: BACKEND_VERSION
-            value: ${BACKEND_VERSION}
 
     - name: inventory-events-processor
       replicas: ${{INVENTORY_PROCESSOR_REPLICA_COUNT}}
@@ -171,8 +169,6 @@ objects:
                 name: service-account-for-kessel
                 key: client-secret
                 optional: true
-	  - name: BACKEND_VERSION
-            value: ${BACKEND_VERSION}
 
     - name: engine-result-processor
       replicas: ${{ENGINE_PROCESSOR_REPLICA_COUNT}}
@@ -246,8 +242,6 @@ objects:
                 name: service-account-for-kessel
                 key: client-secret
                 optional: true
-          - name: BACKEND_VERSION
-            value: ${BACKEND_VERSION}
 
     - name: garbage-collector-processor
       replicas: ${{GARBAGE_COLLECTOR_REPLICA_COUNT}}
@@ -325,8 +319,6 @@ objects:
                 name: service-account-for-kessel
                 key: client-secret
                 optional: true
-	  - name: BACKEND_VERSION
-            value: ${BACKEND_VERSION}
 
     database:
       name: ros
@@ -465,6 +457,3 @@ parameters:
   value: bypass
 - description: Unleash API url
   name: UNLEASH_URL
-- description: Controls old vs new backend
-  name: BACKEND_VERSION
-  value: 'old'

pr_check.sh

@@ -9,26 +9,39 @@ export COMPONENTS="ros-backend"
 export IMAGE="quay.io/cloudservices/ros-backend"
 export DOCKERFILE="Dockerfile"
 
-# NEW: Backend version selection logic
-BACKEND_VERSION=${BACKEND_VERSION:-"old"}
+# NEW: Dual backend testing logic based on job name
+echo "JOB_NAME: $JOB_NAME"
 
-if [ "$BACKEND_VERSION" = "old" ]; then
+if [[ "$JOB_NAME" == *"old-backend"* ]]; then
+    # Old backend testing configuration
+    export ROS_NEW_BACKEND_FLAG_ENABLED="false"
     export IQE_MARKER_EXPRESSION="ros_smoke and (common or old_backend)"
     export IBUTSU_SOURCE="ros-old-backend-pr"
-elif [ "$BACKEND_VERSION" = "new" ]; then
+    echo " Configured for OLD backend testing"
+    echo "   - Unleash flag will be set to: FALSE"
+    echo "   - Test markers: ros_smoke and (common or old_backend)"
+elif [[ "$JOB_NAME" == *"new-backend"* ]]; then
+    # New backend testing configuration
+    export ROS_NEW_BACKEND_FLAG_ENABLED="true"
     export IQE_MARKER_EXPRESSION="ros_smoke and (common or new_backend)"
     export IBUTSU_SOURCE="ros-new-backend-pr"
-else
-    # Default fallback
-    export IQE_MARKER_EXPRESSION="ros_smoke"
-    export IBUTSU_SOURCE="ros-backend-pr"
+    echo " Configured for NEW backend testing"
+    echo "   - Unleash flag will be set to: TRUE"
+    echo "   - Test markers: ros_smoke and (common or new_backend)"
 fi
 
+# Standard IQE configuration
 export IQE_PLUGINS="ros"
 export IQE_FILTER_EXPRESSION=""
 export IQE_CJI_TIMEOUT="30m"
-export IQE_ENV_VARS="JOB_NAME=${JOB_NAME},BUILD_NUMBER=${BUILD_NUMBER},BUILD_URL=${BUILD_URL}"
-export EXTRA_DEPLOY_ARGS="--set-parameter ros-backend/BACKEND_VERSION=${BACKEND_VERSION}"
+
+# CRITICAL: Pass ROS_NEW_BACKEND_FLAG_ENABLED to IQE via IQE_ENV_VARS
+export IQE_ENV_VARS="JOB_NAME=${JOB_NAME},BUILD_NUMBER=${BUILD_NUMBER},BUILD_URL=${BUILD_URL},ROS_NEW_BACKEND_FLAG_ENABLED=${ROS_NEW_BACKEND_FLAG_ENABLED}"
+
+echo "  Final Configuration:"
+echo "  IQE_MARKER_EXPRESSION: $IQE_MARKER_EXPRESSION"
+echo "  IBUTSU_SOURCE: $IBUTSU_SOURCE"
+echo "  IQE_ENV_VARS: $IQE_ENV_VARS"
 
 # Install bonfire repo/initialize
 CICD_URL=https://raw.githubusercontent.com/RedHatInsights/bonfire/master/cicd
@@ -39,6 +52,5 @@ source $CICD_ROOT/build.sh
 # Deploy ros to an ephemeral namespace for testing
 source $CICD_ROOT/deploy_ephemeral_env.sh
 
-# Run iqe-ros somke tests with ClowdJobInvocation
+# Run iqe-ros smoke tests with ClowdJobInvocation
 source $CICD_ROOT/cji_smoke_test.sh
-