Switch to using gjjb maven-merge jobs

This new Maven merge job type does away with the Jenkins Maven
project type and is capable of deploying at end.

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 5f7b0119a30adca7afb38a823adae35261022c21..840280f6477ddaf8d8b8b02275dd74a8957a54f1 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,9 +2,9 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-merge-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-merge
       - gerrit-tox-verify
 
     project: odlparent
@@ -39,9 +39,9 @@
 - project:
     name: odlparent-2.0.x
     jobs:
-      - '{project-name}-merge-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-merge
       - gerrit-tox-verify
 
     project: odlparent
@@ -79,9 +79,9 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-merge
       - gerrit-tox-verify
 
     stream: carbon

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 2f1e0251232cf8b5220c1c515a31bbf0201539e1..305c4586fce10196fefd27a7deb591f360cfe1db 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -26,7 +26,9 @@
     jenkins-ssh-credential: opendaylight-jenkins-ssh
     gerrit-server-name: OpenDaylight
     mvn-site-id: opendaylight-site
+    mvn-snapshot-id: opendaylight-snapshot
     mvn-staging-id: opendaylight-staging
+    nexus-snapshot-repo: opendaylight.snapshot
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
     lftools-version: <1.0.0