From 24cea1c57c69fc9d166aae4829e136e2ae00d994 Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Wed, 29 Nov 2023 14:26:31 +0100 Subject: [PATCH 1/3] [CCXDEV-12286] For pr_check also use git version of ccx-cache-writer --- pr_check.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pr_check.sh b/pr_check.sh index 0a9d05f2..da4f754e 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -21,9 +21,14 @@ set -exv # -------------------------------------------- APP_NAME="ccx-data-pipeline" # name of app-sre "application" folder this component lives in REF_ENV="insights-production" -COMPONENT_NAME="ccx-insights-results" # name of app-sre "resourceTemplate" in deploy.yaml for this component +# NOTE: insights-results-aggregator contains deployment for multiple services +# for pull requests we need latest git PR version of these components to be +# deployed to ephemeral env and overriding resource template --set-template-ref. +# Using multiple components name in COMPONENT_NAME forces bonfire to use the +# git version of clowdapp.yaml(or any other) file from the pull request. +COMPONENT_NAME="ccx-insights-results ccx-cache-writer" # name of app-sre "resourceTemplate" in deploy.yaml for this component IMAGE="quay.io/cloudservices/insights-results-aggregator" -COMPONENTS="ccx-data-pipeline ccx-insights-results insights-content-service insights-results-smart-proxy ccx-mock-ams" # space-separated list of components to laod +COMPONENTS="ccx-data-pipeline ccx-insights-results insights-content-service insights-results-smart-proxy ccx-mock-ams ccx-cache-writer" # space-separated list of components to laod COMPONENTS_W_RESOURCES="" # component to keep CACHE_FROM_LATEST_IMAGE="true" DEPLOY_FRONTENDS="false" From 0d79c1a99be9e8983379a453bdc09962adf186a0 Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Wed, 29 Nov 2023 14:39:58 +0100 Subject: [PATCH 2/3] [CCXDEV-12286] For pr_check right name of service is ccx-redis --- pr_check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pr_check.sh b/pr_check.sh index da4f754e..794228cb 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -26,9 +26,9 @@ REF_ENV="insights-production" # deployed to ephemeral env and overriding resource template --set-template-ref. # Using multiple components name in COMPONENT_NAME forces bonfire to use the # git version of clowdapp.yaml(or any other) file from the pull request. -COMPONENT_NAME="ccx-insights-results ccx-cache-writer" # name of app-sre "resourceTemplate" in deploy.yaml for this component +COMPONENT_NAME="ccx-insights-results ccx-redis" # name of app-sre "resourceTemplate" in deploy.yaml for this component IMAGE="quay.io/cloudservices/insights-results-aggregator" -COMPONENTS="ccx-data-pipeline ccx-insights-results insights-content-service insights-results-smart-proxy ccx-mock-ams ccx-cache-writer" # space-separated list of components to laod +COMPONENTS="ccx-data-pipeline ccx-insights-results ccx-redis insights-content-service insights-results-smart-proxy ccx-mock-ams" # space-separated list of components to laod COMPONENTS_W_RESOURCES="" # component to keep CACHE_FROM_LATEST_IMAGE="true" DEPLOY_FRONTENDS="false" From 6c5da7940bf44d95a288fbdfcde206fdba316861 Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Wed, 29 Nov 2023 14:58:44 +0100 Subject: [PATCH 3/3] [CCXDEV-12286] For pr_check fallback to one COMPONENT_NAME for running tests --- pr_check.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pr_check.sh b/pr_check.sh index 794228cb..5496f645 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -58,6 +58,8 @@ function deploy_ephemeral() { } function run_smoke_tests() { + # Workaround: cji_smoke_test.sh requires only one component name. Fallback to only one component name. + export COMPONENT_NAME="ccx-insights-results" source $CICD_ROOT/cji_smoke_test.sh source $CICD_ROOT/post_test_results.sh # publish results in Ibutsu }