From d7dbc55c0ff188945a0d334bd83a022c342d63a2 Mon Sep 17 00:00:00 2001 From: Olivier ORAND Date: Thu, 12 Jan 2023 10:11:57 +0000 Subject: [PATCH] pipeline(k8s): fix re-trigger all jobs We need to target jobs in k8s pipeline. We also fix a typo in a script. --- concourse/pipelines/template/k8s-pipeline.yml.erb | 2 +- scripts/generate-and-load-pipeline.sh | 2 +- .../generate-depls/fixtures/references/simple-depls-k8s-ref.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/concourse/pipelines/template/k8s-pipeline.yml.erb b/concourse/pipelines/template/k8s-pipeline.yml.erb index 9425647c6..a03a09511 100644 --- a/concourse/pipelines/template/k8s-pipeline.yml.erb +++ b/concourse/pipelines/template/k8s-pipeline.yml.erb @@ -402,7 +402,7 @@ jobs: echo "trigger-job -j $BUILD_PIPELINE_NAME/deploy-<%= name %>" >> result-dir/flight-plan <% end %> params: - BUILD_PIPELINE_NAME: <%= root_deployment_name %>-bosh-generated + BUILD_PIPELINE_NAME: <%= root_deployment_name %>-k8s-generated - task: fly-into-concourse input_mapping: {fly-cmd: trigger-<%= root_deployment_name %>-plan} output_mapping: {flight-report: concourse-<%= root_deployment_name %>-trigger-report} diff --git a/scripts/generate-and-load-pipeline.sh b/scripts/generate-and-load-pipeline.sh index a285a7519..85dab7402 100755 --- a/scripts/generate-and-load-pipeline.sh +++ b/scripts/generate-and-load-pipeline.sh @@ -55,7 +55,7 @@ fi PIPELINE_FILE_PATH="${OUTPUT_DIR}/pipelines/${PIPELINE_NAME}-generated.yml" if [ ! -e "${PIPELINE_FILE_PATH}" ]; then - echo "SKipping ${PIPELINE_FILE_PATH} does not exit" + echo "Skipping ${PIPELINE_FILE_PATH} does not exit" exit fi PIPELINE_PUBLIC_NAME="${PREFIX}${PIPELINE_NAME}-generated" diff --git a/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml b/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml index f1ae33568..65ce9fb20 100644 --- a/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml +++ b/spec/scripts/generate-depls/fixtures/references/simple-depls-k8s-ref.yml @@ -286,7 +286,7 @@ jobs: - | echo "trigger-job -j $BUILD_PIPELINE_NAME/deploy-k8s-sample" >> result-dir/flight-plan params: - BUILD_PIPELINE_NAME: simple-depls-bosh-generated + BUILD_PIPELINE_NAME: simple-depls-k8s-generated - task: fly-into-concourse input_mapping: {fly-cmd: trigger-simple-depls-plan} output_mapping: {flight-report: concourse-simple-depls-trigger-report}