Merge "Add stable/lithium for reservation"

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
index 711182d2eb54908e5a5858ed19050cf026f6e3cb..fe013b24af8eccf791262831d6e54fea696512f0 100644 (file)
--- a/jjb/alto/alto.cfg
+++ b/jjb/alto/alto.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent,bpgcep
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent,bpgcep

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index d7b8325f3b1de7769b49629c169e329f808a649b..c03b620037c511f993bfda01b03d48abcc00468b 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -64,6 +64,7 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
@@ -72,7 +73,7 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: 'dependencies.log,sources.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'
 
@@ -132,6 +133,7 @@
             autorelease-settings: '{autorelease-settings}'
             odl-global-settings: '{odl-global-settings}'
         - autorelease-maven-deploy
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
@@ -140,6 +142,6 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: 'dependencies.log,sources.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index cb5df6270d52597610315cb1674e6a46f038584d..e1358bcc2b4069d849fff95c1d2880ae19414579 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -63,6 +63,7 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-maven-sources:
             maven-version: '{mvn32}'
             settings: '{autorelease-settings}'
@@ -71,6 +72,6 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log,patches/*.patch'
+            artifacts: 'dependencies.log,sources.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index bef3204c0d569090a7b3c687494871d6b72e42c5..7fdab6412654923602214a762898cb9650c7d092 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -17,6 +17,11 @@ git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 mkdir patches
-git submodule foreach 'git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$name.patch'
+modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
+for module in $modules; do
+    cd $module
+    git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$module.patch
+    cd ..
+done
 
 ./scripts/fix-relativepaths.sh

diff --git a/jjb/defense4all/defense4all.cfg b/jjb/defense4all/defense4all.cfg
index c81757526ccf269684ed19d6cc6b321e7dc04dd0..42ddd11be2f71b3edc10d2beb6dbc8f1d6656d40 100644 (file)
--- a/jjb/defense4all/defense4all.cfg
+++ b/jjb/defense4all/defense4all.cfg
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent
 POM: dfapp/pom.xml

diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg
index ba37d734850188746dbf012f3e1e8c87569c9ada..1f570c101d1d3800569454f6ad8494135fc39118 100644 (file)
--- a/jjb/usc/usc.cfg
+++ b/jjb/usc/usc.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
index 95e3361651886b0fb962ce950d77c12de783e387..087f8b39a8a188ed879a3193f2a5d2bd0060fdd2 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -1,4 +1,6 @@
 BRANCHES:
 - master:
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin
\ No newline at end of file
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools,odlparent,openflowplugin