Skip to content

Commit 7d0835a

Browse files
authored
SONAR-24632 Fixes the usage of skip during the GCP release
1 parent f871dd1 commit 7d0835a

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.cirrus/tasks_gcp_marketplace.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
build_gcp_app_template: &BUILD_GCP_APP_TEMPLATE
22
ec2_instance:
33
<<: *VM_TEMPLATE
4-
skip: "!changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'google-cloud-marketplace-k8s-app/*', 'google-cloud-marketplace-k8s-app/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,_gcp_marketplace,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
54
login_to_gcr_script:
65
- export DOCKER_GCLOUD_PASSWORD=$(echo ${DOCKER_GCLOUD_SA_KEY} | base64 -d)
76
- docker login -u _json_key -p "$DOCKER_GCLOUD_PASSWORD" https://${GCLOUD_REGISTRY}
@@ -18,12 +17,12 @@ build_gcp_app_template: &BUILD_GCP_APP_TEMPLATE
1817

1918
build_gcp_staging_app_task:
2019
<<: *BUILD_GCP_APP_TEMPLATE
21-
only_if: $TRIGGER == "PUSH_STAGING_DEPLOYER" || $TRIGGER == "PUSH_PROD_DEPLOYER" || $BRANCH == "master"
20+
only_if: $TRIGGER == "PUSH_STAGING_DEPLOYER" || $TRIGGER == "PUSH_PROD_DEPLOYER" || ($BRANCH == "master" && changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'google-cloud-marketplace-k8s-app/*', 'google-cloud-marketplace-k8s-app/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,_gcp_marketplace,}.yml', '.cirrus/tasks.star', '.cirrus.star'))
2221
env:
2322
GCLOUD_PRODUCT_NAME: sonarqube-dce-staging
2423

2524
verify_gcp_app_template: &VERIFY_GCP_APP_TEMPLATE
26-
only_if: $TRIGGER == "PUSH_STAGING_DEPLOYER" || $BRANCH == "master"
25+
only_if: $TRIGGER == "PUSH_STAGING_DEPLOYER" || ($BRANCH == "master" && changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'google-cloud-marketplace-k8s-app/*', 'google-cloud-marketplace-k8s-app/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,_gcp_marketplace,}.yml', '.cirrus/tasks.star', '.cirrus.star'))
2726
env:
2827
BASE_FOLDER: "/root/.gcp/cache"
2928
PATH: "${BASE_FOLDER}:${BASE_FOLDER}/google-cloud-sdk/bin:${PATH}"
@@ -52,7 +51,7 @@ verify_gcp_app_template: &VERIFY_GCP_APP_TEMPLATE
5251

5352
verify_gcp_staging_app_task:
5453
<<: *VERIFY_GCP_APP_TEMPLATE
55-
only_if: $TRIGGER == "PUSH_STAGING_DEPLOYER" || $TRIGGER == "PUSH_PROD_DEPLOYER" || $BRANCH == "master"
54+
only_if: $TRIGGER == "PUSH_STAGING_DEPLOYER" || $TRIGGER == "PUSH_PROD_DEPLOYER" || ($BRANCH == "master" && changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'google-cloud-marketplace-k8s-app/*', 'google-cloud-marketplace-k8s-app/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,_gcp_marketplace,}.yml', '.cirrus/tasks.star', '.cirrus.star'))
5655
env:
5756
GCLOUD_PRODUCT_NAME: sonarqube-dce-staging
5857
depends_on:

0 commit comments

Comments
 (0)