From ba2a3d5f68e2570e958bf06374b46c5367b742aa Mon Sep 17 00:00:00 2001 From: Feruzjon Muyassarov Date: Mon, 8 Nov 2021 10:52:06 +0200 Subject: [PATCH] Checkout to release-0.5 branch when e2e v1a5 master is triggered E2E v1a5 master jobs are enabled only in CAPM3 repository. In CAPM3 it is release-0.5 branch that holds v1a5 related code base. As such, for v1a5 master jobs, we need to make sure we default to release-0.5 branch, which will be passed to project-infra scripts, where git checkout release-0.5 will happen. For v1beta1 master jobs, we continue checking out to main branch, as configured by default here. Change-Id: I532a349236f16af6450a7f0325c499c0f35e56c2 --- jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml | 4 ++-- jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml index 9827c17e3..beb10edb4 100644 --- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml @@ -43,7 +43,7 @@ description: 'Project github repo name' - string: name: ghprbActualCommit - default: 'main' + default: 'release-0.5' description: 'CI Repo branch for triggering manual build' - string: name: ghprbAuthorRepoGitUrl @@ -51,7 +51,7 @@ description: 'CI Repo URL for triggering manual build' - string: name: ghprbTargetBranch - default: 'main' + default: 'release-0.5' description: 'Target branch of the PR' - string: name: DISTRIBUTION diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml index e2f19632e..8ea3262d8 100644 --- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml @@ -43,7 +43,7 @@ description: 'Project github repo name' - string: name: ghprbActualCommit - default: 'main' + default: 'release-0.5' description: 'CI Repo branch for triggering manual build' - string: name: ghprbAuthorRepoGitUrl @@ -51,7 +51,7 @@ description: 'CI Repo URL for triggering manual build' - string: name: ghprbTargetBranch - default: 'main' + default: 'release-0.5' description: 'Target branch of the PR' - string: name: DISTRIBUTION -- 2.25.1