Use GIT_BASE to dynamically determine project and credentials to clone

Change-Id: I9e2d2468c1ee0112ef72e72c195fc423195c7e16
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/job.yaml.template b/jjb/job.yaml.template
index 516791a92c64dbf3571c1c2607b54fc7cfd0e7dc..1107e9f72b9252ad2429ba21743a376465dab4d5 100644 (file)
--- a/jjb/job.yaml.template
+++ b/jjb/job.yaml.template
@@ -45,13 +45,14 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
+        - project-parameter:
+            project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/PROJECT.git'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
@@ -98,10 +99,13 @@
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/PROJECT.git'
             refspec: ''
             choosing-strategy: 'default'
 
@@ -151,10 +155,13 @@
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/PROJECT.git'
             refspec: ''
             branch: '{branch}'
 

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 03a7a839cc077c1ab78b792aaca8ce3e6a361b2f..cde79beb3b8d907676c61c4d5e5c65276d4fde19 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -5,6 +5,8 @@
         - 'builder-verify-python'
         - 'builder-merge'
 
+    project: 'releng/builder'
+
 - job-template:
     name: builder-verify-jjb
 
@@ -17,13 +19,14 @@
         artifactNumToKeep: -1
 
     parameters:
+        - project-parameter:
+            project: '{project}'
         - gerrit-parameter:
             branch: 'master'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/releng/builder'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
@@ -73,13 +76,14 @@
         artifactNumToKeep: -1
 
     parameters:
+        - project-parameter:
+            project: '{project}'
         - gerrit-parameter:
             branch: 'master'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/releng/builder'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
@@ -132,13 +136,14 @@
         artifactNumToKeep: 5
 
     parameters:
+        - project-parameter:
+            project: '{project}'
         - gerrit-parameter:
             branch: 'master'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/releng/builder'
             refspec: ''
             choosing-strategy: 'default'
 

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 4bab7f435c5649200060c3878f38e0cd303b4852..6cac01cf13b5a9907c752bd26f6a43e6276f055a 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -1,5 +1,13 @@
 # OLD Releng macros
 
+- parameter:
+    name: project-parameter
+    parameters:
+        - string:
+            name: PROJECT
+            default: '{project}'
+            description: "JJB configured PROJECT parameter to identify an ODL Gerrit project"
+
 - parameter:
     name: gerrit-parameter
     parameters:
@@ -13,7 +21,7 @@
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: ''
             branches:
                 - 'origin/{branch}'
@@ -25,7 +33,7 @@
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: '{refspec}'
             branches:
                 - 'origin/$GERRIT_BRANCH'