Merge "Fix ubuntu image update failures."

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 221fda6e12f4d04585d1805631d761c92f6573cb..edfd0d784d8a809194b3e558c884b5112bcead26 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -404,7 +404,7 @@
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx7168m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx3072m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index 608c4879063a17a4b9a22e1fc20090492b23af4d..ff961d9a0c6e91555f34884d4548aadabe6123e5 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -44,7 +44,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-ansible-rpm.sh
+      - shell: !include-raw: test-ansible-rpm.sh
 
     triggers:
       - timed: '@daily'
@@ -87,7 +87,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-ansible-deb.sh
+      - shell: !include-raw: test-ansible-deb.sh
 
     triggers:
       - timed: '@daily'

diff --git a/jjb/packaging/include-raw-build-deb.sh b/jjb/packaging/build-deb.sh
similarity index 100%
rename from jjb/packaging/include-raw-build-deb.sh
rename to jjb/packaging/build-deb.sh

diff --git a/jjb/packaging/include-raw-build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
similarity index 100%
rename from jjb/packaging/include-raw-build-rpm-snap.sh
rename to jjb/packaging/build-rpm-snap.sh

diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/build-rpm.sh
similarity index 100%
rename from jjb/packaging/include-raw-build-rpm.sh
rename to jjb/packaging/build-rpm.sh

diff --git a/jjb/packaging/include-raw-install-deb.sh b/jjb/packaging/install-deb.sh
similarity index 100%
rename from jjb/packaging/include-raw-install-deb.sh
rename to jjb/packaging/install-deb.sh

diff --git a/jjb/packaging/include-raw-install-rpm.sh b/jjb/packaging/install-rpm.sh
similarity index 100%
rename from jjb/packaging/include-raw-install-rpm.sh
rename to jjb/packaging/install-rpm.sh

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 57583193907741b1355d56a060f26f51af9aa258..5f4d1a0e8f13bee02fa8305dcdd2b0eedce37e57 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -73,7 +73,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-rpm.sh
+      - shell: !include-raw: build-rpm.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
@@ -141,7 +141,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-rpm-snap.sh
+      - shell: !include-raw: build-rpm-snap.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
@@ -186,15 +186,15 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-install-rpm.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           sudo yum install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
       # TODO: Remove the archive publisher
@@ -242,19 +242,19 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-install-rpm.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           sudo yum install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
-      - shell: !include-raw: include-raw-test-rpm-upgrade.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: test-rpm-upgrade.sh
+      - shell: !include-raw: start-odl.sh
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
       - lf-infra-publish
@@ -288,15 +288,15 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-install-deb.sh
-      - shell: !include-raw: include-raw-start-odl.sh
+      - shell: !include-raw: install-deb.sh
+      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           sudo apt-get install -y expect
           # Install nmap to check status of ODL's SSH port
           sudo apt-get install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
-      - shell: !include-raw: include-raw-stop-odl.sh
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
       - lf-infra-publish
@@ -394,7 +394,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-deb.sh
+      - shell: !include-raw: build-deb.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index ece33cf8e72ff420e44bd683b84764f3a21e573b..b92d46977e3dd079361f209458f4a06f7bba0277 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -52,7 +52,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-puppet.sh
+      - shell: !include-raw: test-puppet.sh
 
     triggers:
       - timed: '@weekly'
@@ -99,7 +99,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-puppet.sh
+      - shell: !include-raw: test-puppet.sh
 
     triggers:
       - timed: '@daily'

diff --git a/jjb/packaging/include-raw-start-odl.sh b/jjb/packaging/start-odl.sh
similarity index 100%
rename from jjb/packaging/include-raw-start-odl.sh
rename to jjb/packaging/start-odl.sh

diff --git a/jjb/packaging/include-raw-stop-odl.sh b/jjb/packaging/stop-odl.sh
similarity index 100%
rename from jjb/packaging/include-raw-stop-odl.sh
rename to jjb/packaging/stop-odl.sh

diff --git a/jjb/packaging/include-raw-test-ansible-deb.sh b/jjb/packaging/test-ansible-deb.sh
similarity index 100%
rename from jjb/packaging/include-raw-test-ansible-deb.sh
rename to jjb/packaging/test-ansible-deb.sh

diff --git a/jjb/packaging/include-raw-test-ansible-rpm.sh b/jjb/packaging/test-ansible-rpm.sh
similarity index 100%
rename from jjb/packaging/include-raw-test-ansible-rpm.sh
rename to jjb/packaging/test-ansible-rpm.sh

diff --git a/jjb/packaging/include-raw-test-puppet.sh b/jjb/packaging/test-puppet.sh
similarity index 100%
rename from jjb/packaging/include-raw-test-puppet.sh
rename to jjb/packaging/test-puppet.sh

diff --git a/jjb/packaging/include-raw-test-rpm-upgrade.sh b/jjb/packaging/test-rpm-upgrade.sh
similarity index 100%
rename from jjb/packaging/include-raw-test-rpm-upgrade.sh
rename to jjb/packaging/test-rpm-upgrade.sh

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index bf52f06ec7f89e4812f4a4952f38403c2f5380b2..42e6d8aeea033a4c190c7041a73cbab9c0778fa7 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -47,9 +47,10 @@
       - docker
       - gbp
       - java-builder:
-          build-timeout: 60
+          build-timeout: 75
       - mininet
-      - mininet-ovs-2.5
+      - mininet-ovs-2.5:
+          build-timeout: 60
       - robot
 
     exclude: