concourse(pipelines): polishing unpause mechanism

we also fix wrong pipeline name
orange-cloudfoundry · Oct 19, 2022 · f1f7ef6 · f1f7ef6
1 parent 72a1c27
commit f1f7ef6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/concourse/pipelines/bootstrap-all-init-pipelines.yml b/concourse/pipelines/bootstrap-all-init-pipelines.yml
@@ -283,6 +283,7 @@ jobs:
         - |
           DEST_DIR=$(pwd)/result-dir
           cd all-pipelines/pipelines
+          echo "unpause-pipeline -p ${PIPELINE}"  >> ${DEST_DIR}/flight-plan
           jobs=$(cat $PIPELINE.yml 2>/dev/null|grep -e '[[:space:]]*- name: update-pipeline.*-depls'|cut -d':' -f2|cut -c 2-)
           for j in $jobs;do
             echo "Processing ${j}"

diff --git a/concourse/pipelines/shared/concourse-pipeline.yml.erb b/concourse/pipelines/shared/concourse-pipeline.yml.erb
@@ -1,7 +1,7 @@
 <%
   require "#{ops_automation_path}/lib/pipeline_helpers"
 
-  root_deployment_name = "TODO"
+  root_deployment_name = "shared"
 
   pipeline_options = PipelineHelpers::PipelineConfigurerOptions.new.with_config(config).with_root_deployment(root_deployment_name).build
   configurer = PipelineHelpers::PipelineConfigurer.new(pipeline_options)

diff --git a/concourse/pipelines/shared/control-plane-pipeline.yml.erb b/concourse/pipelines/shared/control-plane-pipeline.yml.erb
@@ -1,6 +1,6 @@
 <%
   require "#{ops_automation_path}/lib/pipeline_helpers"
-  root_deployment_name = "TODO"
+  root_deployment_name = "shared"
   pipeline_options = PipelineHelpers::PipelineConfigurerOptions.new.with_config(config).with_root_deployment(root_deployment_name).build
   configurer = PipelineHelpers::PipelineConfigurer.new(pipeline_options)
 

diff --git a/concourse/pipelines/shared/kubernetes-pipeline.yml.erb b/concourse/pipelines/shared/kubernetes-pipeline.yml.erb
@@ -387,7 +387,7 @@ jobs:
     <% end %>
   <% end %>
       params:
-        BUILD_PIPELINE_NAME: shared-kubernetes-generated # TODO
+        BUILD_PIPELINE_NAME: shared-kubernetes-generated
   - task: fly-into-concourse
     input_mapping: {fly-cmd: trigger-plan}
     output_mapping: {flight-report: concourse-trigger-report}

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
@@ -667,7 +667,7 @@ jobs:
         output_mapping: {updated-git-resource: generated-pipelines}
         file: cf-ops-automation/concourse/tasks/git_append_a_dir_from_generated/task.yml
         params:
-          COMMIT_MESSAGE: "Generated pipelines update for TODO"
+          COMMIT_MESSAGE: "Generated pipelines update for shared"
           OLD_DIR: "coa/pipelines/generated"
       - put: secrets-writer
         attempts: 6

diff --git a/spec/scripts/generate-depls/fixtures/references/simple-shared-kubernetes.yml b/spec/scripts/generate-depls/fixtures/references/simple-shared-kubernetes.yml
@@ -277,7 +277,7 @@ jobs:
         - |
           echo "trigger-job -j $BUILD_PIPELINE_NAME/deploy-k8s-sample-simple-depls" >> result-dir/flight-plan
       params:
-        BUILD_PIPELINE_NAME: shared-kubernetes-generated # TODO
+        BUILD_PIPELINE_NAME: shared-kubernetes-generated
   - task: fly-into-concourse
     input_mapping: {fly-cmd: trigger-plan}
     output_mapping: {flight-report: concourse-trigger-report}

diff --git a/spec/scripts/generate-depls/fixtures/references/simple-shared-update.yml b/spec/scripts/generate-depls/fixtures/references/simple-shared-update.yml
@@ -601,7 +601,7 @@ jobs:
         output_mapping: {updated-git-resource: generated-pipelines}
         file: cf-ops-automation/concourse/tasks/git_append_a_dir_from_generated/task.yml
         params:
-          COMMIT_MESSAGE: "Generated pipelines update for TODO"
+          COMMIT_MESSAGE: "Generated pipelines update for shared"
           OLD_DIR: "coa/pipelines/generated"
       - put: secrets-writer
         attempts: 6