From 4f447ced7f3318251b99ff4c317f6dbaf526bdd3 Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Tue, 18 Jun 2019 11:53:22 +0100 Subject: [PATCH] OPENDEV: TEST-Update SCM to checkout master branch It looks like SCM can't determinate which branch to checkout when we specify 'refs/heads/*' we can specify 'refs/heads/master' as the script will checkout correct branch. Fix project parameter for push-upstream: opendev/{project} Change-Id: I7b320a63611ead0e3693e3edc886739c1424b024 --- jjb/opendev/global-templates-opendev-push-upstream-test.yaml | 2 +- jjb/opendev/global-templates-opendev-rebase-test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/opendev/global-templates-opendev-push-upstream-test.yaml b/jjb/opendev/global-templates-opendev-push-upstream-test.yaml index df2cccad7..e9d545ef1 100644 --- a/jjb/opendev/global-templates-opendev-push-upstream-test.yaml +++ b/jjb/opendev/global-templates-opendev-push-upstream-test.yaml @@ -13,7 +13,7 @@ parameters: - string: name: PROJECT - default: '{project}' + default: 'opendev/{project}' description: JJB configured PROJECT parameter to identify a Nordix Gerrit project - nordix-gerrit-parameters diff --git a/jjb/opendev/global-templates-opendev-rebase-test.yaml b/jjb/opendev/global-templates-opendev-rebase-test.yaml index 0112cd829..b96f0b070 100644 --- a/jjb/opendev/global-templates-opendev-rebase-test.yaml +++ b/jjb/opendev/global-templates-opendev-rebase-test.yaml @@ -24,7 +24,7 @@ scm: - git-scm: ssh-credentials-id: nordixinfra-lfn-gerrit-ssh - branch: '*' + branch: 'master' refspec: '' triggers: -- 2.25.1