Merge "Migrate aaa matrix-verify jobs to freestyle-verify jobs"

diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh
index 25aa8a4ec6f8c687af21adf3cce4dd7c33f09355..bca93210b8e01a949bc1950b392dbbb34eb4b97b 100755 (executable)
--- a/jenkins-scripts/basic_settings.sh
+++ b/jenkins-scripts/basic_settings.sh
@@ -12,17 +12,7 @@ Host *
 
 # we don't want to do SSH host key checking on Rackspace spin-up systems
 # Dallas (ODL)
-Host 10.30.11.*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
-# Dallas (ODLForge)
-Host 10.30.12.*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
-# Chicago (ODL)
-Host 10.30.32.*
+Host 10.29.12.* 10.29.13.* 10.29.14.* 10.29.15.*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 

diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
index 064af6e5cfa84647a5d383ee1c5203ccec9ebef7..ecb371cf38610cbb6ec0e81af310e07b04aab642 100755 (executable)
--- a/jenkins-scripts/robot.sh
+++ b/jenkins-scripts/robot.sh
@@ -7,23 +7,12 @@ jenkins     ALL = NOPASSWD: /usr/bin/sshuttle, /usr/bin/kill, /usr/sbin/iptables
 EOF
 
 yum clean all
-yum install -y -q unzip python-netaddr sshuttle @development
-yum remove -y robotframework-{sshlibrary,requests}
+yum install -y -q python-netaddr
 
-# These development packages are needed for successful installation of robotframework-sshlibrary (done elsewhere)
-yum install -y -q libffi-devel openssl-devel
-
-## Install netcat & docker-py
-yum install -y -q nc python-docker-py
-
-# Install dependencies for matplotlib library used in longevity framework
-yum install -y yum-utils
-yum-builddep -y python-matplotlib
+## Install docker-py
+yum install -y -q python-docker-py
 
 # make sure the firewall is stopped
 service iptables stop
 
-# install crudini command line tool for editing config files
-yum install -y crudini
-
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh
index 6fa6626b8b380ec822f60ed76efa23b04ed34d49..75ed826619aeb9436af4b4b0fe9961c791bfef38 100755 (executable)
--- a/jenkins-scripts/system_type.sh
+++ b/jenkins-scripts/system_type.sh
@@ -18,7 +18,7 @@ for i in "autorelease,autorelease" \
          "java-builder,builder" \
          "devstack,devstack" \
          "docker,docker" \
-         "gbp-trusty,ubuntu-docker-ovs" \
+         "ubuntu-trusty-gbp,ubuntu-docker-ovs" \
          "matrix,matrix" \
          "robot,robot" \
          "ubuntu-trusty-mininet,mininet-ubuntu"

diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg
deleted file mode 100644 (file)
index b08666a..0000000
--- a/jjb/aaa/aaa.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: yangtools,controller

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
deleted file mode 100644 (file)
index f877318..0000000
--- a/jjb/alto/alto.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: controller,yangtools,odlparent,l2switch

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
deleted file mode 100644 (file)
index 6fe7680..0000000
--- a/jjb/armoury/armoury.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8,openjdk7
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk8,openjdk7
-MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
-DEPENDENCIES: odlparent,yangtools,controller,mdsal

diff --git a/jjb/atrium/atrium.cfg b/jjb/atrium/atrium.cfg
deleted file mode 100644 (file)
index bbaede9..0000000
--- a/jjb/atrium/atrium.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-DEPENDENCIES: odlparent,yangtools,controller,mdsal

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
deleted file mode 100644 (file)
index a46fcd6..0000000
--- a/jjb/bgpcep/bgpcep.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate dependency:tree
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: odlparent,yangtools,controller,mdsal,tcpmd5

diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg
deleted file mode 100644 (file)
index b31cc3c..0000000
--- a/jjb/capwap/capwap.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/cardinal/cardinal.cfg b/jjb/cardinal/cardinal.cfg
deleted file mode 100644 (file)
index b295c8e..0000000
--- a/jjb/cardinal/cardinal.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin,iotdm,sfc

diff --git a/jjb/centinel/centinel.cfg b/jjb/centinel/centinel.cfg
deleted file mode 100644 (file)
index ef67d88..0000000
--- a/jjb/centinel/centinel.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
deleted file mode 100644 (file)
index dc71907..0000000
--- a/jjb/controller/controller.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs dependency:tree
-MVN_OPTS: -Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
-DEPENDENCIES: yangtools,aaa

diff --git a/jjb/coretutorials/coretutorials.cfg b/jjb/coretutorials/coretutorials.cfg
deleted file mode 100644 (file)
index 6b372ec..0000000
--- a/jjb/coretutorials/coretutorials.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: odlparent,yangtools,controller
-JDKS: openjdk7,openjdk8

diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg
deleted file mode 100644 (file)
index 6cd39ac..0000000
--- a/jjb/didm/didm.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: odlparent

diff --git a/jjb/discovery/discovery.cfg b/jjb/discovery/discovery.cfg
deleted file mode 100644 (file)
index 0c84df3..0000000
--- a/jjb/discovery/discovery.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk7
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7
-DEPENDENCIES: odlparent

diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg
deleted file mode 100644 (file)
index 0a4d7a2..0000000
--- a/jjb/dlux/dlux.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false

diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg
deleted file mode 100644 (file)
index 4997af6..0000000
--- a/jjb/docs/docs.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    distribution-check: false
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false

diff --git a/jjb/faas/faas.cfg b/jjb/faas/faas.cfg
deleted file mode 100644 (file)
index 95012b0..0000000
--- a/jjb/faas/faas.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/genius/genius.cfg b/jjb/genius/genius.cfg
deleted file mode 100644 (file)
index 0f7a8f4..0000000
--- a/jjb/genius/genius.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin,neutron

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
deleted file mode 100644 (file)
index b0a997c..0000000
--- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-MVN_GOALS: -U clean install findbugs:findbugs dependency:tree -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: odlparent,yangtools,controller,openflowjava,openflowplugin,neutron,sfc,ovsdb

diff --git a/jjb/infrautils/infrautils.cfg b/jjb/infrautils/infrautils.cfg
deleted file mode 100644 (file)
index 5cc2bd1..0000000
--- a/jjb/infrautils/infrautils.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-DEPENDENCIES: odlparent

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 59e870e24b96c07da39379b9d13f604be16ed202..e8ca86e1bffc7271c1eadbb70a7fc91c4a153447 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -13,7 +13,10 @@
 ROBOT_VENV=`mktemp -d --suffix=robot_venv`
 echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
 
-virtualenv ${ROBOT_VENV}
+# The --system-site-packages parameter allows us to pick up system level
+# installed packages. This allows us to bake matplotlib which takes very long
+# to install into the image.
+virtualenv --system-site-packages ${ROBOT_VENV}
 source ${ROBOT_VENV}/bin/activate
 
 set -exu
@@ -29,7 +32,6 @@ pip install --upgrade jsonpath-rw
 
 # Modules for longevity framework robot library
 pip install elasticsearch==1.7.0 elasticsearch-dsl==0.0.11
-pip install --upgrade matplotlib
 
 # Print installed versions.
 pip freeze

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 528c7becb83ec44eaa21f6bcd5ad501af0b9b469..b7265586d4eb0ac01ab06e96d757a500932ff88d 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -42,7 +42,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
 
@@ -116,7 +116,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
 
     scm:
         - gerrit-trigger-scm:
@@ -220,7 +220,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -269,7 +269,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:

diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg
deleted file mode 100644 (file)
index 1de3331..0000000
--- a/jjb/iotdm/iotdm.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-DEPENDENCIES: controller,yangtools,odlparent,aaa

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
deleted file mode 100644 (file)
index b97f83d..0000000
--- a/jjb/l2switch/l2switch.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install dependency:tree
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
-DEPENDENCIES: yangtools,controller,openflowjava,openflowplugin
-JDKS: openjdk7,openjdk8

diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg
deleted file mode 100644 (file)
index 90ae6cd..0000000
--- a/jjb/lacp/lacp.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-MVN_GOALS: clean install javadoc:aggregate dependency:tree -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: yangtools,controller,openflowjava,openflowplugin,odlparent

diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg
deleted file mode 100644 (file)
index e260d22..0000000
--- a/jjb/lispflowmapping/lispflowmapping.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-MVN_GOALS: clean install findbugs:findbugs javadoc:aggregate dependency:tree -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-MVN_OPTS: -Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-DEPENDENCIES: controller,odlparent,yangtools,neutron

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
deleted file mode 100644 (file)
index e57ccb7..0000000
--- a/jjb/mdsal/mdsal.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install dependency:tree -Dintegrationtests
-MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m
-DEPENDENCIES: odlparent,yangtools

diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg
deleted file mode 100644 (file)
index b0c3a1d..0000000
--- a/jjb/messaging4transport/messaging4transport.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-DEPENDENCIES: yangtools,aaa,controller,odlparent
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true

diff --git a/jjb/natapp/natapp.cfg b/jjb/natapp/natapp.cfg
deleted file mode 100644 (file)
index bcbd66b..0000000
--- a/jjb/natapp/natapp.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin

diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg
deleted file mode 100644 (file)
index 95012b0..0000000
--- a/jjb/nemo/nemo.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
deleted file mode 100644 (file)
index 6fe57bb..0000000
--- a/jjb/netconf/netconf.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install dependency:tree -Pintegrationtests
-MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
-DEPENDENCIES: aaa,controller,odlparent,yangtools

diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg
deleted file mode 100644 (file)
index b67f06d..0000000
--- a/jjb/netide/netide.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: odlparent,yangtools,controller,openflowjava

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 357b20d52364c5a7814649c81ff055d76f09f0ae..a883b2ca6b693dea46e23e657ab1b6a4203d31a7 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -102,7 +102,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install dependency:tree -V verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
+            goals: 'clean install dependency:tree -V -B verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index cab7a6c956acb000e370b1d936b70a7679c2f2c1..fae791cd1b95d5fdde33ff13b890555519e72738 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -48,7 +48,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -V -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'netvirt-settings'
         settings-type: cfp
@@ -61,7 +61,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'verify -V -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            goals: 'verify -V -B -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'

diff --git a/jjb/netvirt/netvirt.cfg b/jjb/netvirt/netvirt.cfg
deleted file mode 100644 (file)
index 6fe418a..0000000
--- a/jjb/netvirt/netvirt.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: controller,neutron,odlparent,openflowjava,openflowplugin,ovsdb,sfc,yangtools
-JOB_TEMPLATES: verify

diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg
deleted file mode 100644 (file)
index 998ccf8..0000000
--- a/jjb/neutron/neutron.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-DEPENDENCIES: odlparent,aaa
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false

diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg
deleted file mode 100644 (file)
index ef67d88..0000000
--- a/jjb/next/next.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg
deleted file mode 100644 (file)
index c586932..0000000
--- a/jjb/nic/nic.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: controller,odlparent,vtn,yangtools,groupbasedpolicy

diff --git a/jjb/ocpplugin/ocpplugin.cfg b/jjb/ocpplugin/ocpplugin.cfg
deleted file mode 100644 (file)
index 815ca29..0000000
--- a/jjb/ocpplugin/ocpplugin.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-DEPENDENCIES: yangtools,controller

diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
deleted file mode 100644 (file)
index 0a4d7a2..0000000
--- a/jjb/odlparent/odlparent.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 7cfa798c273efa2c347447b49932846b9b151ba3..be45ebe6198b375e42e61442b14f8d59592c834e 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -9,21 +9,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
-            branch: 'master'
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'master'
     jdk: openjdk8
     maven:
         - mvn33:
@@ -45,22 +42,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
-            branch: 'stable/beryllium'
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'stable/beryllium'
     jdk:
         - openjdk7
         - openjdk8
@@ -85,21 +78,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'stable/lithium'
     jdk: openjdk7
     maven:
         - mvn33:
@@ -116,14 +106,9 @@
     jobs:
         - '{project-name}-sonar'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'master'
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/of-config/of-config.cfg b/jjb/of-config/of-config.cfg
deleted file mode 100644 (file)
index 57545e0..0000000
--- a/jjb/of-config/of-config.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: controller,yangtools,odlparent,netconf

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
deleted file mode 100644 (file)
index 8a6a388..0000000
--- a/jjb/openflowjava/openflowjava.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-DEPENDENCIES: yangtools,controller

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
deleted file mode 100644 (file)
index b78e736..0000000
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate dependency:tree
-#MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: yangtools,controller,openflowjava
-ARCHIVE_ARTIFACTS: model/*/target/site/**

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 1abb485382314cb6c5cf5fd9f2d18188a76ca536..2fe73a1edec6ca6f107bdc8a5cceba44d83eaf42 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -108,7 +108,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install dependency:tree -V verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
+            goals: 'clean install dependency:tree -V -B verify -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 69a08227c8da53701d5d4f21c4d7f5961141b727..c1e6ae7151561b6640c8426a7d6861223973a9af 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -48,7 +48,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -V -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install dependency:tree -V -B -Dsonar -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'ovsdb-settings'
         settings-type: cfp
@@ -61,7 +61,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'verify -V -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+            goals: 'verify -V -B -Pintegrationtest -Dsonar -Dskip.karaf.featureTest=true -Dovsdb.controller.address=${{CONTROLLER_IP}} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
deleted file mode 100644 (file)
index c9c65b1..0000000
--- a/jjb/ovsdb/ovsdb.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: odlparent,controller,yangtools
-JOB_TEMPLATES: verify

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 724cfd7a1e39ccf8e3f519c603fd123ce6949663..cecee685296ee252ff4c476b092c142f5a4bb3a1 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -9,21 +9,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
-            branch: 'master'
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'ovsdb'
     project-name: 'ovsdb'
+    branch: 'master'
     jdk: openjdk8
     maven:
         - mvn33:
@@ -45,22 +42,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
-            branch: 'stable/beryllium'
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'ovsdb'
     project-name: 'ovsdb'
+    branch: 'stable/beryllium'
     jdk:
         - openjdk7
         - openjdk8
@@ -84,21 +77,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'ovsdb'
     project-name: 'ovsdb'
+    branch: 'stable/lithium'
     jdk: openjdk7
     maven:
         - mvn33:

diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/include-raw-build-rpm.sh
new file mode 100644 (file)
index 0000000..95a4497
--- /dev/null
+++ b/jjb/packaging/include-raw-build-rpm.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+# Install required packages
+virtualenv rpm_build
+source rpm_build/bin/activate
+pip install --upgrade pip
+pip install -r $WORKSPACE/packaging/rpm/requirements.txt
+
+# Build release specified by build params
+$WORKSPACE/packaging/rpm/build.py --major "$VERSION_MAJOR" \
+                                  --minor "$VERSION_MINOR" \
+                                  --patch "$VERSION_PATCH" \
+                                  --rpm "$RPM_RELEASE" \
+                                  --sysd_commit "$SYSD_COMMIT" \
+                                  --codename "$CODENAME" \
+                                  --download_url "$DOWNLOAD_URL" \
+                                  --changelog_date "$CHANGELOG_DATE" \
+                                  --changelog_name "$CHANGELOG_NAME" \
+                                  --changelog_email "$CHANGELOG_EMAIL"

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index f3d1a6a6f9e204e59242c3664f101b90ebc8e2be..11b26319e368b701bb1020bfca39020be09ce690 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -1,11 +1,74 @@
 - project:
     name: packaging
+    project-name: packaging
+
     jobs:
         - '{project-name}-verify-python-{stream}'
+        - '{project-name}-build-rpm-{stream}'
+
+    project: 'integration/packaging'
 
     stream:
         - master:
             branch: 'master'
 
-    project: 'integration/packaging'
-    project-name: 'packaging'
+- job-template:
+    name: '{project-name}-build-rpm-{stream}'
+
+    node: dynamic_verify
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: 'rpm/cache/*.srpm rpm/cache/*.rpm'
+        - string:
+            name: VERSION_MAJOR
+            default: '4'
+            description: 'OpenDaylight major (element) version number to build'
+        - string:
+            name: VERSION_MINOR
+            default: '2'
+            description: 'OpenDaylight minor (SR) version number to build'
+        - string:
+            name: VERSION_PATCH
+            default: '0'
+            description: 'OpenDaylight patch version to build'
+        - string:
+            name: RPM_RELEASE
+            default: '1'
+            description: 'RPM version for the given ODL major.minor.patch'
+        - string:
+            name: SYSD_COMMIT
+            default: 'c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed'
+            description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
+        - string:
+            name: CODENAME
+            default: 'Beryllium-SR2'
+            description: 'Elemental codename for the ODL release, including SR if applicable'
+        - string:
+            name: DOWNLOAD_URL
+            default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz'
+            description: 'URL to ODL tarball artifact to repackage into RPM'
+        - string:
+            name: CHANGELOG_DATE
+            default: 'Wed May 11 2016'
+            description: 'Date this RPM was defined'
+        - string:
+            name: CHANGELOG_NAME
+            default: 'Jenkins'
+            description: 'Name of person who defined RPM'
+        - string:
+            name: CHANGELOG_EMAIL
+            default: 'jenkins-donotreply@opendaylight.org'
+            description: 'Email of person who defined RPM'
+
+    scm:
+        - integration-gerrit-scm:
+            basedir: 'packaging'
+            refspec: '$GERRIT_REFSPEC'
+            branch: 'master'
+
+    builders:
+        - shell: !include-raw: include-raw-build-rpm.sh

diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg
deleted file mode 100644 (file)
index 57322e5..0000000
--- a/jjb/packetcable/packetcable.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: controller,yangtools

diff --git a/jjb/persistence/persistence.cfg b/jjb/persistence/persistence.cfg
deleted file mode 100644 (file)
index 37efb4d..0000000
--- a/jjb/persistence/persistence.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk7,openjdk8
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index b58714f6e96141e8de713d93583eea2dc4a95acb..af725dabc9dc26a3f15beee5dfe007ff09c41739 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -60,8 +60,7 @@
     builders:
         - shell: |
             pip freeze
-            python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test --recursive -o archives/job_output jjb/
+            jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
 
         - releng-check-unicode

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index bbb2cb2402e51bdc0aa4e64b98fbf364d6f762d4..7bd3a04e76657cd10a139ec01720637f42c1c265 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -385,5 +385,7 @@
         - ssh-agent-credentials:
             users:
                 - 'opendaylight-jenkins-ssh'
+        - jclouds:
+            single-use: True
         - openstack:
             single-use: True

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 257a9a3cf6e2a012eae672d6c6023f4a727d8490..a218d511894e69fa311f8c2ce5e45f7080406159 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -195,7 +195,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: '{mvn-settings}'

diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg
deleted file mode 100644 (file)
index 2020e5e..0000000
--- a/jjb/reservation/reservation.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: odlparent,controller,yangtools,groupbasedpolicy

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
deleted file mode 100644 (file)
index 9c41728..0000000
--- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-MVN_GOALS: clean install dependency:tree -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-DEPENDENCIES: odlparent,bgpcep

diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg
deleted file mode 100644 (file)
index c9f68fb..0000000
--- a/jjb/sfc/sfc.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
-DEPENDENCIES: odlparent,yangtools,controller,openflowplugin,ovsdb,lispflowmapping

diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg
deleted file mode 100644 (file)
index 0a4d7a2..0000000
--- a/jjb/snbi/snbi.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
deleted file mode 100644 (file)
index 5eb81ce..0000000
--- a/jjb/snmp/snmp.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false

diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg
deleted file mode 100644 (file)
index f0b6d16..0000000
--- a/jjb/snmp4sdn/snmp4sdn.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg
deleted file mode 100644 (file)
index 4db7c6d..0000000
--- a/jjb/sxp/sxp.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-# MVN_GOALS: clean install javadoc:aggregate dependency:tree -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg
deleted file mode 100644 (file)
index 6f996b1..0000000
--- a/jjb/tcpmd5/tcpmd5.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate dependency:tree
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: odlparent,yangtools,controller
-JDKS: openjdk7,openjdk8

diff --git a/jjb/toolkit/toolkit.cfg b/jjb/toolkit/toolkit.cfg
deleted file mode 100644 (file)
index 709de26..0000000
--- a/jjb/toolkit/toolkit.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-DEPENDENCIES: odlparent,controller
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk7
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
deleted file mode 100644 (file)
index 55dc7fd..0000000
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-DEPENDENCIES: controller,yangtools

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
deleted file mode 100644 (file)
index 97b5c04..0000000
--- a/jjb/tsdr/tsdr.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-MVN_GOALS: clean install javadoc:aggregate dependency:tree -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m

diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg
deleted file mode 100644 (file)
index 0a4d7a2..0000000
--- a/jjb/ttp/ttp.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false

diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg
deleted file mode 100644 (file)
index 16be8f3..0000000
--- a/jjb/unimgr/unimgr.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: odlparent,yangtools,controller,ovsdb

diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg
deleted file mode 100644 (file)
index 351e919..0000000
--- a/jjb/usc/usc.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk8,openjdk7
-    distribution-check: false
-DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/usecplugin/usecplugin.cfg b/jjb/usecplugin/usecplugin.cfg
deleted file mode 100644 (file)
index 6446fd4..0000000
--- a/jjb/usecplugin/usecplugin.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: openflowplugin,odlparent,controller,yangtools

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
deleted file mode 100644 (file)
index 6df23fb..0000000
--- a/jjb/vpnservice/vpnservice.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin,neutron

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
deleted file mode 100644 (file)
index fd9f21b..0000000
--- a/jjb/vtn/vtn.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-    distribution-check: false
-DEPENDENCIES: controller,mdsal,neutron,odlparent,openflowplugin,ovsdb,yangtools
-MVN_GOALS: clean install dependency:tree -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-ARCHIVE_ARTIFACTS: manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**, target/*-javadoc.jar, target/apidocs/**, manager/model/target/site/models/**

diff --git a/jjb/yang-push/yang-push.cfg b/jjb/yang-push/yang-push.cfg
deleted file mode 100644 (file)
index 95012b0..0000000
--- a/jjb/yang-push/yang-push.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/yangide/yangide.cfg b/jjb/yangide/yangide.cfg
deleted file mode 100644 (file)
index 12fded6..0000000
--- a/jjb/yangide/yangide.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    distribution-check: false
-DEPENDENCIES: odlparent,yangtools

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
deleted file mode 100644 (file)
index 339fc33..0000000
--- a/jjb/yangtools/yangtools.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-    autorelease: true
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7,openjdk8
-    distribution-check: false
-DEPENDENCIES: odlparent

diff --git a/packer/README.markdown b/packer/README.markdown
index fef4cea344f81335e17fefcb80c3a09e2bd34b63..f02ace5e9ec2db3ad5ce29b68e66bc719c3e57f0 100644 (file)
--- a/packer/README.markdown
+++ b/packer/README.markdown
@@ -15,7 +15,7 @@ specific build, combine the template for the desired output artifact type with
 a variable file. To build a new java-builder instance the following would be done:
 
 ```
-packer build -var-file=vars/cloud-env.json -var-file/centos.json templates/java-builder.json
+packer build -var-file=vars/cloud-env.json -var-file=vars/centos.json templates/java-builder.json
 ```
 
 **NOTE:** vars/cloud-env.json is a gitignored file as it contains private

diff --git a/packer/provision/robot.sh b/packer/provision/robot.sh
index 90b4e068e91773e517b87bb037f3c7be33e7a0eb..19aee18284b4a988c5492530b7840c7ed0a06400 100644 (file)
--- a/packer/provision/robot.sh
+++ b/packer/provision/robot.sh
@@ -5,10 +5,20 @@
 # Install minimal python requirements to get virtualenv going
 # Additional python dependencies should be installed via JJB configuration
 # inside project jobs using a virtualenv setup.
-yum install -q -y python-{devel,setuptools,virtualenv}
+yum install -q -y python-{devel,setuptools,virtualenv} @development
+
+# Install dependencies for robotframework and robotframework-sshlibrary
+# installed elsewhere
+yum install -y -q yum-utils unzip sshuttle nc libffi-devel openssl-devel
+
+# Install dependencies for matplotlib library used in longevity framework
+yum install -y -q libpng-devel freetype-devel python-matplotlib
+
+# install crudini command line tool for editing config files
+yum install -y -q crudini
 
 # Install `udpreplay` to be used for (lispflowmapping) performance tests
-yum install -q -y @development libpcap-devel boost-devel
+yum install -q -y libpcap-devel boost-devel
 git clone -q https://github.com/ska-sa/udpreplay.git
 cd udpreplay
 make &> /dev/null && cp udpreplay /usr/local/bin