From d573cb2edb57eeffbac282e0647153c3f4e6ca38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20C=2E=20R=C3=ADos?= Date: Tue, 12 Mar 2024 16:39:04 +0100 Subject: [PATCH] Make PR manager use the default branch --- ci/pr-manager-pipeline.yml | 2 +- scripts/set-pipelines.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/pr-manager-pipeline.yml b/ci/pr-manager-pipeline.yml index 1b74e48..2f51f93 100644 --- a/ci/pr-manager-pipeline.yml +++ b/ci/pr-manager-pipeline.yml @@ -50,7 +50,7 @@ resources: uri: ((github-repo)) username: ((github-token)) password: ((github-password)) - branch: main + branch: ((branch)) paths: - ci/pr-pipeline.yml - ci/config-concourse.yml diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh index 782dea6..848bb04 100755 --- a/scripts/set-pipelines.sh +++ b/scripts/set-pipelines.sh @@ -27,13 +27,15 @@ set_branch_pipeline() { set_pr_manager_pipeline() { local -r pipeline_name="app-broker-pull-requests${PIPELINE_NAME_SUFFIX:+"-$PIPELINE_NAME_SUFFIX"}" + local -r branch="2.2.x" echo "Setting PR manager pipeline..." fly --target "$FLY_TARGET" set-pipeline --pipeline "$pipeline_name" \ --config pr-manager-pipeline.yml \ --load-vars-from config-concourse.yml \ - --var ci-image-tag="2.2.x" \ + --var ci-image-tag="$branch" \ + --var "branch=$branch" \ --var pipeline-name="$pipeline_name" }