Fix globs

SonarSource · Jan 9, 2025 · 6cd7ff0 · 6cd7ff0
1 parent 2d1018e
commit 6cd7ff0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.cirrus/tasks_gcp_marketplace.yml b/.cirrus/tasks_gcp_marketplace.yml
@@ -1,7 +1,7 @@
 build_gcp_app_template: &BUILD_GCP_APP_TEMPLATE
   ec2_instance:
     <<: *VM_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube-dce/**/*', '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')"
+  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')"
   login_to_gcr_script:
     - export DOCKER_GCLOUD_PASSWORD=$(echo ${DOCKER_GCLOUD_SA_KEY} | base64 -d)
     - docker login -u _json_key -p "$DOCKER_GCLOUD_PASSWORD" https://${GCLOUD_REGISTRY}

diff --git a/.cirrus/tasks_sonarqube.yml b/.cirrus/tasks_sonarqube.yml
@@ -1,19 +1,19 @@
 sonarqube_chart_static_compatibility_test_task:
   <<: *CHART_STATIC_COMPATIBILITY_TEST_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube/*', 'charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   script:
     - ./.cirrus/build_chart_dependencies.sh charts/sonarqube
     - ./.cirrus/unit_helm_compatibility_test.sh sonarqube
 
 chart_testing_on_openshift_sonarqube_task:
   <<: *CHART_TESTING_ON_OPENSHIFT_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube/*', 'charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   env:
     - VERIFYING_CHART: sonarqube
 
 sonarqube_chart_packaging_task:
   <<: *CHART_PACKAGING_TASK_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube/*', 'charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   script:
     - source cirrus-env BUILD
     - ./.cirrus/package.sh sonarqube
@@ -24,7 +24,7 @@ sonarqube_chart_packaging_task:
 
 sonarqube_push_to_repox_task:
   <<: *PUSH_TO_REPOX_TASK_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube/*', 'charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   script:
     - source cirrus-env ""
     - ./.cirrus/upload_chart.sh sonarqube
@@ -33,7 +33,7 @@ sonarqube_push_to_repox_task:
 
 sonarqube_trigger_release_task:
   <<: *TRIGGER_RELEASE_TASK_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube/*', 'charts/sonarqube/**/*', 'tests/unity-compatibility-test/sonarqube/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   depends_on:
     - sonarqube_chart_packaging
     - sonarqube_push_to_repox
diff --git a/.cirrus/tasks_sonarqube_dce.yml b/.cirrus/tasks_sonarqube_dce.yml
@@ -1,19 +1,19 @@
 sonarqube_dce_chart_static_compatibility_test_task:
   <<: *CHART_STATIC_COMPATIBILITY_TEST_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   script:
     - ./.cirrus/build_chart_dependencies.sh charts/sonarqube-dce
     - ./.cirrus/unit_helm_compatibility_test.sh sonarqube-dce
 
 chart_testing_on_openshift_sonarqube_dce_task:
   <<: *CHART_TESTING_ON_OPENSHIFT_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   env:
     - VERIFYING_CHART: sonarqube-dce
 
 sonarqube_dce_chart_packaging_task:
   <<: *CHART_PACKAGING_TASK_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   script:
     - source cirrus-env BUILD
     - ./.cirrus/package.sh sonarqube-dce
@@ -24,7 +24,7 @@ sonarqube_dce_chart_packaging_task:
 
 sonarqube_dce_push_to_repox_task:
   <<: *PUSH_TO_REPOX_TASK_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   script:
     - source cirrus-env ""
     - ./.cirrus/upload_chart.sh sonarqube-dce
@@ -33,7 +33,7 @@ sonarqube_dce_push_to_repox_task:
 
 sonarqube_dce_trigger_release_task:
   <<: *TRIGGER_RELEASE_TASK_TEMPLATE
-  skip: "!changesInclude('charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
+  skip: "!changesInclude('charts/sonarqube-dce/*', 'charts/sonarqube-dce/**/*', 'tests/unity-compatibility-test/sonarqube-dce/*', '.cirrus/*.sh', '.cirrus/tasks{_sonarqube_dce,_templates,}.yml', '.cirrus/tasks.star', '.cirrus.star')"
   depends_on:
     - sonarqube_dce_chart_packaging
     - sonarqube_dce_push_to_repox