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

diff --git a/jjb/opendev/global-templates-opendev-push-upstream-test.yaml b/jjb/opendev/global-templates-opendev-push-upstream-test.yaml
index df2cccad7ce31cac777d40fcfba13c826128f6f9..e9d545ef184f2a2e37726163e4afd5417a67c2b9 100644 (file)
--- 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 0112cd82975ca696e572983529e9125bcc7aa89c..b96f0b070c79f89824340e522a7b3a9d46a473b0 100644 (file)
--- 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: