[COST-5551] enable Glue Data Catalog in pr_check/daily smokes

Jenkinsfile

@@ -42,7 +42,7 @@ pipeline {
 
         IQE_PLUGINS="cost_management"
         BUILD_URL="https://ci.ext.devshift.net/job/koku-pipeline-pr-check-main/${BUILD_NUMBER}/"
-        IQE_ENV_VARS="JOB_NAME=koku-ci-jenkins,BUILD_NUMBER=${BUILD_NUMBER},BUILD_URL=${BUILD_URL}"
+        IQE_ENV_VARS="JOB_NAME=koku-ci-jenkins,BUILD_NUMBER=${BUILD_NUMBER},BUILD_URL=${BUILD_URL},SCHEMA_SUFFIX=_${IMAGE_TAG}_${BUILD_NUMBER}"
         IQE_PARALLEL_ENABLED="false"
 
         GITHUB_API_ROOT='https://api.github.com/repos/project-koku/koku'

ci/functions.sh

@@ -101,7 +101,7 @@ function run_smoke_tests_stage() {
     bonfire deploy \
         ${APP_NAME} \
         --ref-env insights-production \
-        --set-template-ref ${APP_NAME}/${COMPONENT_NAME}=${ghprbActualCommit} \
+        --set-template-ref ${COMPONENT_NAME}=${ghprbActualCommit} \
         --set-image-tag ${IMAGE}=${IMAGE_TAG} \
         --namespace ${NAMESPACE} \
         ${COMPONENTS_ARG} \
@@ -112,6 +112,9 @@ function run_smoke_tests_stage() {
         --set-parameter koku/DBM_IMAGE_TAG=${IMAGE_TAG} \
         --set-parameter koku/DBM_INVOCATION=${DBM_INVOCATION} \
         --set-parameter koku/IMAGE=${IMAGE} \
+        --set-parameter koku/SCHEMA_SUFFIX=_${IMAGE_TAG}_${BUILD_NUMBER} \
+        --set-parameter trino/HIVE_PROPERTIES_FILE=glue.properties \
+        --set-parameter trino/GLUE_PROPERTIES_FILE=hive.properties \
         --no-single-replicas \
         --source=appsre \
         --timeout 600
@@ -169,8 +172,10 @@ function run_build_image_stage() {
 }
 
 function wait_for_image() {
-    echo "Waiting for initial image build..."
-    sleep 180
+    if ! [[ $(curl -k -XGET "https://quay.io/api/v1/repository/redhat-user-workloads/cost-mgmt-dev-tenant/koku/tag?specificTag=${IMAGE_TAG}" -Ls | jq '.tags | length') -gt 0  ]]; then
+        echo "Waiting for initial image build..."
+        sleep 180
+    fi
 
     local count=0
     local max=60  # Try for up to 30 minutes

smoke_test.sh

@@ -10,7 +10,7 @@ IQE_MARKER_EXPRESSION="cost_smoke"
 IQE_FILTER_EXPRESSION=""
 IQE_CJI_TIMEOUT="5h"
 IQE_PARALLEL_ENABLED="false"
-IQE_ENV_VARS="JOB_NAME=${JOB_NAME},BUILD_NUMBER=${BUILD_NUMBER}"
+IQE_ENV_VARS="JOB_NAME=${JOB_NAME},BUILD_NUMBER=${BUILD_NUMBER},SCHEMA_SUFFIX=_${BUILD_NUMBER}"
 
 # Get bonfire helper scripts
 CICD_URL="https://raw.githubusercontent.com/RedHatInsights/cicd-tools/main"
@@ -42,6 +42,9 @@ bonfire deploy \
     --optional-deps-method hybrid \
     --no-single-replicas \
     --set-parameter rbac/MIN_REPLICAS=1 \
+    --set-parameter koku/SCHEMA_SUFFIX=_${BUILD_NUMBER} \
+    --set-parameter trino/HIVE_PROPERTIES_FILE=glue.properties \
+    --set-parameter trino/GLUE_PROPERTIES_FILE=hive.properties \
     ${COMPONENTS_ARG} \
     ${COMPONENTS_RESOURCES_ARG} \
     ${EXTRA_DEPLOY_ARGS}