Merge "Rename to taglist.log so that it gets archived"

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index 0c2369ec336f762f708099f60979387230e3a1b7..eb6c91e0f15b7c7bfc51a38dbb0a336b2d14bb6e 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -62,7 +62,7 @@
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
         goals: 'clean install source:jar javadoc:jar -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
         automatic-archiving: true
@@ -136,7 +136,7 @@
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
         goals: 'clean install source:jar javadoc:jar -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
         automatic-archiving: true

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index 718bd42c2077c8ffea37119a0a884dc9215858e4..f0abbbb03cda5ee36cc28dc29ae12359add61649 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -61,7 +61,7 @@
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
         goals: 'clean install source:jar javadoc:jar -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
         automatic-archiving: true

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
index 6077afd5e25cfc4e77d462f0dde46123b7d3042a..1c53e5e760010697d3fa4c488ba767cf07b875b0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index b123316af5b23fcf86951a4939eb23f327480735..55294f262ac31c0063c72ebe7d84547f55253fc7 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -83,6 +83,7 @@
             tox --version
             cd sfc-py
             tox
+            ./jenkins_build_package.sh
 
     publishers:
         - email-notification: