modified pr checks

Author: Saurabh Pimpalgaokar

clowdapp.yaml

@@ -74,28 +74,8 @@ objects:
                 optional: true
           - name: BYPASS_UNLEASH
             value: ${BYPASS_UNLEASH}
-          - name: ENABLE_KESSEL
-            value: ${KESSEL_ENABLED}
-          - name: KESSEL_URL
-            value: ${KESSEL_URL}
-          - name: KESSEL_AUTH_ENABLED
-            value: ${KESSEL_AUTH_ENABLED}
-          - name: KESSEL_AUTH_OIDC_ISSUER
-            value: ${KESSEL_AUTH_OIDC_ISSUER}
-          - name: KESSEL_INSECURE
-            value: ${KESSEL_INSECURE}
-          - name: KESSEL_AUTH_CLIENT_ID
-            valueFrom:
-              secretKeyRef:
-                name: service-account-for-kessel
-                key: client-id
-                optional: true
-          - name: KESSEL_AUTH_CLIENT_SECRET
-            valueFrom:
-              secretKeyRef:
-                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}}
@@ -147,29 +127,8 @@ objects:
                 optional: true
           - name: BYPASS_UNLEASH
             value: ${BYPASS_UNLEASH}
-          - name: ENABLE_KESSEL
-            value: ${KESSEL_ENABLED}
-          - name: KESSEL_URL
-            value: ${KESSEL_URL}
-          - name: KESSEL_AUTH_ENABLED
-            value: ${KESSEL_AUTH_ENABLED}
-          - name: KESSEL_AUTH_OIDC_ISSUER
-            value: ${KESSEL_AUTH_OIDC_ISSUER}
-          - name: KESSEL_INSECURE
-            value: ${KESSEL_INSECURE}
-          - name: KESSEL_AUTH_CLIENT_ID
-            valueFrom:
-              secretKeyRef:
-                name: service-account-for-kessel
-                key: client-id
-                optional: true
-          - name: KESSEL_AUTH_CLIENT_SECRET
-            valueFrom:
-              secretKeyRef:
-                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}}
@@ -221,28 +180,8 @@ objects:
                 optional: true
           - name: BYPASS_UNLEASH
             value: ${BYPASS_UNLEASH}
-          - name: ENABLE_KESSEL
-            value: ${KESSEL_ENABLED}
-          - name: KESSEL_URL
-            value: ${KESSEL_URL}
-          - name: KESSEL_AUTH_ENABLED
-            value: ${KESSEL_AUTH_ENABLED}
-          - name: KESSEL_AUTH_OIDC_ISSUER
-            value: ${KESSEL_AUTH_OIDC_ISSUER}
-          - name: KESSEL_INSECURE
-            value: ${KESSEL_INSECURE}
-          - name: KESSEL_AUTH_CLIENT_ID
-            valueFrom:
-              secretKeyRef:
-                name: service-account-for-kessel
-                key: client-id
-                optional: true
-          - name: KESSEL_AUTH_CLIENT_SECRET
-            valueFrom:
-              secretKeyRef:
-                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}}
@@ -298,28 +237,8 @@ objects:
                 optional: true
           - name: BYPASS_UNLEASH
             value: ${BYPASS_UNLEASH}
-          - name: ENABLE_KESSEL
-            value: ${KESSEL_ENABLED}
-          - name: KESSEL_URL
-            value: ${KESSEL_URL}
-          - name: KESSEL_AUTH_ENABLED
-            value: ${KESSEL_AUTH_ENABLED}
-          - name: KESSEL_AUTH_OIDC_ISSUER
-            value: ${KESSEL_AUTH_OIDC_ISSUER}
-          - name: KESSEL_INSECURE
-            value: ${KESSEL_INSECURE}
-          - name: KESSEL_AUTH_CLIENT_ID
-            valueFrom:
-              secretKeyRef:
-                name: service-account-for-kessel
-                key: client-id
-                optional: true
-          - name: KESSEL_AUTH_CLIENT_SECRET
-            valueFrom:
-              secretKeyRef:
-                name: service-account-for-kessel
-                key: client-secret
-                optional: true
+          - name: BACKEND_VERSION
+            value: ${BACKEND_VERSION}
 
     database:
       name: ros
@@ -332,8 +251,6 @@ objects:
         partitions: 1
       - topicName: platform.notifications.ingress
         partitions: 1
-      - topicName: ros.events
-        partitions: 1
     testing:
       iqePlugin: ros
 
@@ -441,20 +358,17 @@ parameters:
   value: "20"
 - name: DB_MAX_OVERFLOW
   value: "20"
-- name: KESSEL_ENABLED
-  value: "false"
-- name: KESSEL_URL
-  value: kessel-inventory-api:9000
-- name: KESSEL_AUTH_ENABLED
-  value: "false"
-- name: KESSEL_AUTH_OIDC_ISSUER
-  value: ""
-- name: KESSEL_INSECURE
-  value: "true"
 
 # Feature flags
 - description: Unleash secret name
   name: UNLEASH_SECRET_NAME
   value: bypass
 - description: Unleash API url
   name: UNLEASH_URL
+- description: disable Unleash (feature flags), defaulting to fallback values
+  name: BYPASS_UNLEASH
+  value: 'false'
+- description: control old vs new backend 
+  name: BACKEND_VERSION
+  value: 'old'
+

pr_check.sh

@@ -9,11 +9,26 @@ export COMPONENTS="ros-backend"
 export IMAGE="quay.io/cloudservices/ros-backend"
 export DOCKERFILE="Dockerfile"
 
+# NEW: Backend version selection logic
+BACKEND_VERSION=${BACKEND_VERSION:-"old"}
+
+if [ "$BACKEND_VERSION" = "old" ]; then
+    export IQE_MARKER_EXPRESSION="ros_smoke and (common or old_backend)"
+    export IBUTSU_SOURCE="ros-old-backend-pr"
+elif [ "$BACKEND_VERSION" = "new" ]; then
+    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"
+fi
+
 export IQE_PLUGINS="ros"
-export IQE_MARKER_EXPRESSION="ros_smoke"
 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}"
 
 # Install bonfire repo/initialize
 CICD_URL=https://raw.githubusercontent.com/RedHatInsights/bonfire/master/cicd