From ae2056b61e67740f3f8013965f8ad6598ce1528e Mon Sep 17 00:00:00 2001 From: Sandra Biton Date: Sun, 20 Nov 2016 13:10:12 +0200 Subject: [PATCH] refactor git-url to parameter with default value Change-Id: I798157fc88b9ee802ea9bc8131e97464a8246d02 Signed-off-by: Sandra Biton --- jjb/integration/integration-macros.yaml | 2 +- jjb/integration/integration-templates.yaml | 3 ++- jjb/integration/integration-test-jobs.yaml | 3 ++- jjb/releng-defaults.yaml | 1 + jjb/releng-templates-java.yaml | 5 +++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 5ade45a1b..9b8482cba 100644 --- 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 3ba167e34..682748ce3 100644 --- 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 71e2897b1..3ce49aa00 100644 --- 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 4b8ba08b1..78e0dfa31 100644 --- 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 d0c10aa2a..857f5892d 100644 --- 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: -- 2.36.6