refactor git-url to parameter with default value

Change-Id: I798157fc88b9ee802ea9bc8131e97464a8246d02
Signed-off-by: Sandra Biton <sandra.biton@hpe.com>

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 5ade45a1b1bd49d50fb477a280bb2ceeb46c9452..9b8482cba0f5b10976e6ab6f675dcea7dd79605d 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -75,7 +75,7 @@
     parameters:
         - string:
             name: DISTROGITURL
-            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/integration/distribution'
+            default: '{git-url}/integration/distribution'
             description: 'Distribution GIT URL (do not modify)'
 
 - parameter:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 3ba167e347b3ab4e283f51ffebd3c06b5fc8c666..682748ce31a44cd122bdabc1f0d8035e14b654a6 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1237,7 +1237,8 @@
             artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
-        - integration-distribution-git-url
+        - integration-distribution-git-url:
+            git-url: '{git-url}'
         - string:
             name: feature
             default: 'all'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 71e2897b12cc7f79b6ccb1ebbf8a03baf4ae0dda..3ce49aa00e2573b64d8844e31d105735f68a1cd5 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -336,7 +336,8 @@
             artifacts: '{archive-artifacts} **/dependency_tree.txt'
         - integration-branch:
             branch: '{branch}'
-        - integration-distribution-git-url
+        - integration-distribution-git-url:
+            git-url: '{git-url}'
 
     scm:
         - integration-gerrit-scm:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 4b8ba08b1e397411167b4c1ca2cdcfadc8f7a225..78e0dfa312a4557ccb745037093e70bdc5ec39d3 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -14,6 +14,7 @@
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
     server-name: 'OpenDaylight'
+    git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index d0c10aa2ac8d1836cc55f2526377725a87342543..857f5892dafe862610d085e9679b2e3141fe2f01 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -154,7 +154,8 @@
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-        - integration-distribution-git-url
+        - integration-distribution-git-url:
+            git-url: '{git-url}'
 
     scm:
         - integration-gerrit-scm:
@@ -578,7 +579,7 @@
             release-branch: '{branch}'
         - string:
             name: CLONE_URL
-            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
+            default: '{git-url}/releng/autorelease'
             description: "Autorelease clone URL"
 
     scm: