From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 21 Aug 2017 19:57:54 +0000 (-0400)
Subject: Update to global-jjb v0.7.0
X-Git-Tag: release/nitrogen~128
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=901a464113b2ec230a0fd2aa5a5ebd4ce0909672;p=releng%2Fbuilder.git

Update to global-jjb v0.7.0

Release notes:
https://github.com/lfit/releng-global-jjb/blob/master/relnotes/v0.7.0.txt

Add lftools-version configuration to all users of lf-infra-parameters.

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 2076bf671..766d13fa1 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -23,6 +23,7 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+          lftools-version: '{lftools-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
@@ -155,6 +156,7 @@
           project: releng/builder
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -214,6 +216,7 @@
           branch: '{branch}'
           stream: '{stream}'
           refspec: 'refs/heads/{branch}'
+          lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
           default: '{next-release-tag}'
@@ -278,6 +281,7 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -332,6 +336,7 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+          lftools-version: '{lftools-version}'
       - autorelease-release-tag:
           release-tag: validate
       - string:
diff --git a/jjb/global-jjb b/jjb/global-jjb
index b2ad48513..0ee567bb4 160000
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit b2ad48513292eff08af5cd6a12010bb4ae9701c9
+Subproject commit 0ee567bb454432e6e4ca1bc6f45431b68e95bad3
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index dcb3f64c4..11d29ebe1 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -540,6 +540,7 @@
           project: releng/builder  # Hardcode as this job needs to pull releng/builder
           stream: '{stream}'
           branch: master  # Hardcode as releng/builder only has master
+          lftools-version: '{lftools-version}'
       - string:
           name: CSIT_BLACKLIST
           default: '{csit-blacklist}'
diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 6af7324a6..e4a2c3d1b 100644
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -79,9 +79,10 @@
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: 'mvn33'
+          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
           repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
           group-id: 'org.opendaylight.integration-packaging'
-          files-dir: '$WORKSPACE/upload_files'
+          upload-files-dir: '$WORKSPACE/upload_files'
 
     publishers:
       - lf-infra-publish
@@ -147,9 +148,10 @@
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: 'mvn33'
+          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
           repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
           group-id: 'org.opendaylight.integration-packaging'
-          files-dir: '$WORKSPACE/upload_files'
+          upload-files-dir: '$WORKSPACE/upload_files'
 
     triggers:
       - timed: '@daily'
@@ -400,9 +402,10 @@
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: '{mvn-version}'
+          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
           repo-id: 'opendaylight-{stream}-ubuntu-1604-x86_64-devel'
           group-id: 'org.opendaylight.integration-packaging'
-          files-dir: '$WORKSPACE/upload_files'
+          upload-files-dir: '$WORKSPACE/upload_files'
 
     publishers:
       - lf-infra-publish