From e3e7acada210d2eee2d4fc9d7f86ab8e53d7fb27 Mon Sep 17 00:00:00 2001 From: maskarb Date: Wed, 22 Jan 2025 12:12:37 -0500 Subject: [PATCH] switch smokes over to Glue --- Jenkinsfile | 2 +- ci/functions.sh | 3 +++ smoke_test.sh | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2da8761666..80a4b17aac 100644 --- a/Jenkinsfile +++ b/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}" IQE_PARALLEL_ENABLED="false" GITHUB_API_ROOT='https://api.github.com/repos/project-koku/koku' diff --git a/ci/functions.sh b/ci/functions.sh index 6f2a4048ca..bcf8e9acb4 100755 --- a/ci/functions.sh +++ b/ci/functions.sh @@ -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} \ + --set-parameter trino/HIVE_PROPERTIES_FILE=glue.properties \ + --set-parameter trino/GLUE_PROPERTIES_FILE=hive.properties \ --no-single-replicas \ --source=appsre \ --timeout 600 diff --git a/smoke_test.sh b/smoke_test.sh index 1f15775b3c..de45095f7a 100755 --- a/smoke_test.sh +++ b/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=_${IMAGE_TAG}" # 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=_${IMAGE_TAG} \ + --set-parameter trino/HIVE_PROPERTIES_FILE=glue.properties \ + --set-parameter trino/GLUE_PROPERTIES_FILE=hive.properties \ ${COMPONENTS_ARG} \ ${COMPONENTS_RESOURCES_ARG} \ ${EXTRA_DEPLOY_ARGS}