From 19842703ad273883971226ce37796a32f13770c0 Mon Sep 17 00:00:00 2001 From: Olivier ORAND Date: Wed, 19 Oct 2022 11:09:38 +0200 Subject: [PATCH] concourse(shared-control-plane): fix paas-templates-limited scanning We need to detect any changes occurring in '*-depls' directories. --- concourse/pipelines/shared/control-plane-pipeline.yml.erb | 2 +- ...template_processor_for_shared_control_plane_pipeline_spec.rb | 2 +- .../fixtures/references/simple-shared-control-plane.yml | 2 +- .../generate-depls/fixtures/references/simple-shared-update.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/concourse/pipelines/shared/control-plane-pipeline.yml.erb b/concourse/pipelines/shared/control-plane-pipeline.yml.erb index 4cbb6294..64fc680e 100644 --- a/concourse/pipelines/shared/control-plane-pipeline.yml.erb +++ b/concourse/pipelines/shared/control-plane-pipeline.yml.erb @@ -138,7 +138,7 @@ resources: uri: ((paas-templates-uri)) branch: ((paas-templates-branch)) skip_ssl_verification: true - paths: [ '*-depls/', '.gitmodules', 'shared-config.yml', 'meta-inf.yml' ] + paths: [ '*-depls/**', '.gitmodules', 'shared-config.yml', 'meta-inf.yml' ] <% end %> diff --git a/spec/lib/template_processor/template_processor_for_shared_control_plane_pipeline_spec.rb b/spec/lib/template_processor/template_processor_for_shared_control_plane_pipeline_spec.rb index da1940ab..87a22a32 100644 --- a/spec/lib/template_processor/template_processor_for_shared_control_plane_pipeline_spec.rb +++ b/spec/lib/template_processor/template_processor_for_shared_control_plane_pipeline_spec.rb @@ -110,7 +110,7 @@ let(:expected_paas_templates_limited) do { "icon" => "home-analytics", "name" => "paas-templates-limited", - "source" => {"branch"=>"((paas-templates-branch))", "paths"=>["*-depls/", ".gitmodules", "shared-config.yml", "meta-inf.yml"], "skip_ssl_verification"=>true, "uri"=>"((paas-templates-uri))" }, + "source" => {"branch"=>"((paas-templates-branch))", "paths"=>["*-depls/**", ".gitmodules", "shared-config.yml", "meta-inf.yml"], "skip_ssl_verification"=>true, "uri"=>"((paas-templates-uri))" }, "type" => "git" } end diff --git a/spec/scripts/generate-depls/fixtures/references/simple-shared-control-plane.yml b/spec/scripts/generate-depls/fixtures/references/simple-shared-control-plane.yml index 6e3f83d4..24a91813 100644 --- a/spec/scripts/generate-depls/fixtures/references/simple-shared-control-plane.yml +++ b/spec/scripts/generate-depls/fixtures/references/simple-shared-control-plane.yml @@ -120,7 +120,7 @@ resources: uri: ((paas-templates-uri)) branch: ((paas-templates-branch)) skip_ssl_verification: true - paths: [ '*-depls/', '.gitmodules', 'shared-config.yml', 'meta-inf.yml' ] + paths: [ '*-depls/**', '.gitmodules', 'shared-config.yml', 'meta-inf.yml' ] jobs: - name: update-pipeline-apps-depls serial: true diff --git a/spec/scripts/generate-depls/fixtures/references/simple-shared-update.yml b/spec/scripts/generate-depls/fixtures/references/simple-shared-update.yml index acee9962..1d70a116 100644 --- a/spec/scripts/generate-depls/fixtures/references/simple-shared-update.yml +++ b/spec/scripts/generate-depls/fixtures/references/simple-shared-update.yml @@ -54,7 +54,7 @@ resources: uri: ((paas-templates-uri)) branch: ((paas-templates-branch)) skip_ssl_verification: true - paths: [ '*-depls/', '.gitmodules', 'shared-config.yml', 'meta-inf.yml' ] + paths: [ '*-depls/**', '.gitmodules', 'shared-config.yml', 'meta-inf.yml' ] jobs: - name: update-pipeline-apps-depls serial: true