Merge "Add Gate job for netvirt-hwvtep"
authorDaniel Farrell <dfarrell@redhat.com>
Wed, 21 Jun 2017 07:13:01 +0000 (07:13 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 21 Jun 2017 07:13:01 +0000 (07:13 +0000)
229 files changed:
.coafile
docs/cloud-images.rst
jenkins-scripts/builder.sh
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-idmlite.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/armoury/armoury.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/include-raw-autorelease-collect-sar.sh [deleted file]
jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
jjb/autorelease/include-raw-autorelease-release-versions.sh
jjb/autorelease/version-bump.sh
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-pcepy.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap-csit-ac.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel-csit-basic.yaml
jjb/centinel/centinel.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-periodic-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/discovery/discovery.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/docs/docs.yaml [deleted file]
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/include-raw-deploy-archives.sh [deleted file]
jjb/infrautils/infrautils.yaml
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/distribution/distribution.yaml
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
jjb/integration/include-raw-integration-get-slave-addresses.sh
jjb/integration/include-raw-integration-install-robotframework.sh
jjb/integration/include-raw-integration-start-cluster-run-test.sh
jjb/integration/integration-detect-variables.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration4-templates.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml [new file with mode: 0644]
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml [new file with mode: 0644]
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-legacy-csit-clustering.yaml
jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
jjb/netvirt/netvirt-legacy-csit.yaml
jjb/netvirt/netvirt-sonar.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-daily-openstack-beryllium.yaml [deleted file]
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml
jjb/nic/nic-csit-vtnrenderer.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config-csit-basic.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/opendaylight-infra-cleanup-stale-nodes.sh [new file with mode: 0644]
jjb/opendaylight-infra-cleanup-stale-stacks.sh
jjb/opendaylight-infra-copy-ssh-keys.sh
jjb/opendaylight-infra-push-gerrit-patch.sh
jjb/opendaylight-infra-stack.sh
jjb/opendaylight-infra-update-image-list.sh
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-dependencies.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packaging/ansible.yaml [new file with mode: 0644]
jjb/packaging/include-raw-build-rpm-snap.sh
jjb/packaging/include-raw-build-rpm.sh
jjb/packaging/include-raw-test-ansible-deb.sh
jjb/packaging/include-raw-test-ansible-rpm.sh
jjb/packaging/packaging.yaml
jjb/packaging/puppet.yaml
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/releng-templates.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp-csit-basic.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/spectrometer/spectrometer-jobs.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/tcpmd5/tcpmd5.yaml [deleted file]
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr-csit-basic.yaml
jjb/unimgr/unimgr-csit-legato.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc-csit-udp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vpnservice/vpnservice.yaml [deleted file]
jjb/vtn/vtn-csit-3node-manager.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangtools/yangtools.yaml
packer/provision/baseline.sh
packer/provision/java-builder.sh
packer/provision/mininet-ovs-2.5.sh
packer/provision/mininet.sh
packer/templates/baseline.json
packer/templates/devstack-pre-pip-newton.json
packer/templates/devstack-pre-pip-ocata.json [new file with mode: 0644]
packer/templates/devstack.json
packer/templates/docker.json
packer/templates/java-builder.json
packer/templates/robot.json
packer/vars/centos.json
tox.ini

index 5d48e1d318a45b0e5529c077b81b0f406d6727ad..22f7f7b190a99883fe05cb709dc9f36a01fd8cf8 100644 (file)
--- a/.coafile
+++ b/.coafile
@@ -33,7 +33,6 @@ ignore = jenkins-scripts/*-local-env.sh,
     jjb/integration/include-raw-integration-deploy-openstack-run-test.sh,
     jjb/integration/include-raw-integration-distribution-check.sh,
     jjb/integration/include-raw-integration-get-bundle-vars.sh,
-    jjb/integration/include-raw-integration-get-slave-addresses.sh,
     jjb/integration/include-raw-integration-list-jobs.sh,
     jjb/integration/include-raw-integration-multipatch-distribution-test.sh,
     jjb/integration/include-raw-integration-replace-block-text.sh,
index 75631bed7706ca3ed7e36e2efb06974759f18977..59e69c814e82514ff4526673d64280929c4c5f84 100644 (file)
@@ -6,20 +6,33 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - devstack - 20170120-1710
 * CentOS 7 - devstack - 20170210-1356
 * CentOS 7 - devstack - 20170221-1719
+* CentOS 7 - devstack - 20170606-0344
+* CentOS 7 - devstack - 20170609-0220
 * CentOS 7 - devstack - newton - 20170117-0005
 * CentOS 7 - devstack-mitaka - 20170130-0523
 * CentOS 7 - devstack-mitaka - 20170314-2255
 * CentOS 7 - devstack-newton - 20170130-0426
 * CentOS 7 - devstack-newton - 20170314-2256
+* CentOS 7 - devstack-newton - 20170606-0427
+* CentOS 7 - devstack-ocata - 20170606-0821
+* CentOS 7 - devstack-ocata - 20170609-0221
 * CentOS 7 - docker - 20170117-0003
 * CentOS 7 - docker - 20170120-1434
+* CentOS 7 - docker - 20170607-0203
+* CentOS 7 - docker - 20170609-0220
 * CentOS 7 - java-builder - 20170117-0004
 * CentOS 7 - java-builder - 20170126-0058
 * CentOS 7 - java-builder - 20170309-2355
 * CentOS 7 - java-builder - 20170311-0517
+* CentOS 7 - java-builder - 20170606-0427
+* CentOS 7 - java-builder - 20170607-1706
+* CentOS 7 - java-builder - 20170609-0259
 * CentOS 7 - robot - 20170117-0004
 * CentOS 7 - robot - 20170210-1803
 * CentOS 7 - robot - 20170328-0206
+* CentOS 7 - robot - 20170526-2050
+* CentOS 7 - robot - 20170606-0345
+* CentOS 7 - robot - 20170609-0220
 * Fedora 23 (20151030 cloud)
 * Ubuntu 14.04 - devstack - 20170117-0004
 * Ubuntu 14.04 - docker - 20170117-0003
@@ -29,6 +42,9 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 - mininet - 20170130-0425
 * Ubuntu 14.04 - mininet - 20170207-2055
 * Ubuntu 14.04 - mininet - 20170210-0439
+* Ubuntu 14.04 - mininet - 20170606-0534
+* Ubuntu 14.04 - mininet - 20170609-0220
+* Ubuntu 14.04 - mininet - 20170611-0950
 * Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415
@@ -41,4 +57,6 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 16.04 - gbp - 20170308-0321
 * Ubuntu 16.04 - mininet-ovs-25 - 20170308-0230
 * Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740
+* Ubuntu 16.04 - mininet-ovs-25 - 20170606-0534
+* Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 * Ubuntu 16.04 LTS (2016-05-03 cloudimg)
index 7249e01cdd10603fe5dbbc3b43947eb06565cee8..367451f56e414ca0b3d74c26a7a20aae185071f8 100755 (executable)
@@ -3,26 +3,10 @@
 
 yum clean all
 
-#
-# Integration/Packaging
-#
-
-# Install software for building RPMs
-yum install -y fedora-packager
-
-# Install software for building docs
-yum install -y libxslt-devel
-
 # disable the firewall
 /bin/bash ./disable_firewall.sh
 
-# install sshpass
-yum install -y sshpass
-
 cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
 Defaults:jenkins !requiretty
 jenkins     ALL = NOPASSWD: ALL
 EOF
-
-# install crudini command line tool for editing config files
-yum install -y crudini
index 7e9c1c2b4dd7bb73bd926f90aaecc223ab8b20f7..61074842ab8211cd8bbef39987116d8de0406de1 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index b9b99b998998fb76f4907e7185fcfff9346ba674..e4dfde64a00089a9aa8723910a82c6e71875d950 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 4c79a92b9b54d415531ae8361c6f8526c600322c..c5d3acd66c6bc3e9e59ca900f27df91a8d0c0154 100644 (file)
@@ -32,7 +32,7 @@
 
     tools_system_count: '1'
     tools_system_flavor: '4 GB General Purpose v1'
-    tools_system_image: 'CentOS 7 - docker - 20170120-1434'
+    tools_system_image: 'CentOS 7 - docker - 20170609-0220'
 
     # Robot custom options
     robot-options: ''
index 269dc52e6c4c715eeebd5cf945a9cf7124416c90..87d5a899d0ff298b94d05209fea08244108a175d 100644 (file)
           scope: 'only'
 
     # Features to install
-    install-features: odl-restconf,
-        odl-netconf-all,
-        http
+    install-features: odl-ovsdb-southbound-impl-rest
 
     # Robot custom options
     robot-options: ''
 
-    # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
-    tools_system_count: 0
+    # mininet image
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
index 137b7ff43e7f07955c857ed1b0c183db1fbe0350..fac77a518c6c044766621997e0fe7412609da586 100644 (file)
@@ -4,7 +4,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: aaa-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
 - project:
     name: aaa-sonar
     jobs:
index 5042a631608cdb92f3f69f9fa7aeaec7fc01667b..a09aedd89304a7b9cede498187178c6b13d29049 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 8615853d10801b973b256b082f675f724f546e6a..c33dbc79c1c26ea5a71d18f8a31ad3fd88ab295c 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[alto] [l2switch]'
     archive-artifacts: ''
 
-- project:
-    name: alto-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
-
 - project:
     name: alto-sonar
     jobs:
index 85b83efe28243c3d113533362866ca1e0677dd52..c63482519199f375c042d76f47167ccfca1de33c 100644 (file)
     email-upstream: '[armoury]'
     archive-artifacts: ''
 
-- project:
-    name: armoury-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'armoury'
-    project-name: 'armoury'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'armoury-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: ''
-    email-upstream: '[armoury]'
-    archive-artifacts: ''
-
 - project:
     name: armoury-sonar
     jobs:
index f216efb5c1ca59b8a1d6cf538190819cd3e833bf..0e3d822fb3d793d9daeecee1dcaa452334387000 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index 288209521f886aeb5d185b97201354e90ad60e41..00316524b58816eca5a89db3b9e78d39bce1018f 100644 (file)
           files:
             - file-id: 'autorelease-settings'
               variable: 'SETTINGS_FILE'
-            - file-id: 'odl-global-settings'
+            - file-id: 'global-settings'
               variable: 'GLOBAL_SETTINGS_FILE'
 
 - builder:
     name: autorelease-determine-merge-order
     builders:
       - shell: |
-          # TODO: Remove this condition once stable/beryllium is no longer
-          #       officially maintained.
-          if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
-              virtualenv --system-site-packages $WORKSPACE/venv
-              source $WORKSPACE/venv/bin/activate
-              pip install --upgrade pip
-              pip install --upgrade networkx
-              pip freeze
-              ./scripts/determine-merge-order.py
-              deactivate
-              rm -rf $WORKSPACE/venv
-          fi
+          virtualenv --system-site-packages $WORKSPACE/venv
+          source $WORKSPACE/venv/bin/activate
+          PYTHON="$WORKSPACE/venv/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install --upgrade networkx
+          $PYTHON -m pip freeze
+          ./scripts/determine-merge-order.py
+          deactivate
+          rm -rf $WORKSPACE/venv
 
 - builder:
     name: autorelease-maven-deploy
     builders:
       - integration-set-variables
       - shell: |
+          #!/bin/bash
+          set +e  # DO NOT fail build if copying fails.
+
           if [ -d "integration/distribution/distributions" ]; then
               cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distributions/karaf/src/main/assembly/"
           else
               cp -vf "$WORKSPACE/taglist.log" "integration/distribution/$KARAF_ARTIFACT/src/main/assembly/"
           fi
 
+          # DO NOT fail the build if copying failed.
+          exit 0
+
 - builder:
     name: autorelease-generate-release-patches
     builders:
             - shell: !include-raw: include-raw-autorelease-notify-build-failure.sh
           script-only-if-succeeded: 'False'
           script-only-if-failed: 'True'
-
-- publisher:
-    # generate sar accounting summary and copy sar data to archive
-    name: opendaylight-infra-sysstats
-    publishers:
-      - postbuildscript:
-          builders:
-            - shell: !include-raw: include-raw-autorelease-collect-sar.sh
-          script-only-if-succeeded: false
-          script-only-if-failed: false
index c622cd4f4e3e488237b803705bd7fb7610128307..9027657892d3920d20ef497592981b9830964eaa 100644 (file)
@@ -3,6 +3,7 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
+      - autorelease-generate-release-notes-{stream}
       - autorelease-version-bump-{stream}
 
     stream:
           karaf-version: karaf3
           extra-mvn-opts: -Dskip.karaf.featureTest=true
       - boron:
+          # Only run once a week since Boron is in maintenance mode
+          cron: 'H H * * 0'
           next-release-tag: Boron-SR4
           branch: 'stable/boron'
           jdk: 'openjdk8'
           integration-test: boron
           karaf-version: karaf3
-      - beryllium:
-          # Only run once a week since Beryllium is in maintenance mode
-          cron: 'H H * * 0'
-          next-release-tag: Beryllium-SR5
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
-          integration-test: beryllium
-          karaf-version: karaf3
 
     project: 'releng/autorelease'
     archive-artifacts: >
         patches.tar.gz
         error.log.gz
 
-
-- project:
-    name: autorelease-release-notes
-    jobs:
-      - 'autorelease-generate-release-notes-{stream}'
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-
-    project: 'releng/autorelease'
-    archive-artifacts: >
-        **/*.log
-
-
 ###
 # TODO: Remove this job once guava21 testing is complete
 ###
           goals: '-version'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - wipe-local-maven-repo
       - jacoco-nojava-workaround
       - autorelease-determine-merge-order
       - autorelease-cfp:
           autorelease-settings: 'autorelease-settings'
-          odl-global-settings: 'odl-global-settings'
+          global-settings: 'odl-global-settings'
       - autorelease-generate-taglist
       - autorelease-distribute-taglist
       - autorelease-generate-release-patches
             - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
       - autorelease-maven-sources-post-process
       - shell: |
           mkdir -p archives/
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index 4894c2257cf7685d61cd93580ae1705e5f167e24..66ed354f915fef07f32ce6c04906a2bbf0013d37 100644 (file)
@@ -69,7 +69,7 @@
           goals: '-version'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - wipe-local-maven-repo
       - jacoco-nojava-workaround
@@ -77,7 +77,7 @@
       - autorelease-determine-merge-order
       - autorelease-cfp:
           autorelease-settings: 'autorelease-settings'
-          odl-global-settings: 'odl-global-settings'
+          global-settings: 'odl-global-settings'
       - autorelease-generate-taglist
       - autorelease-distribute-taglist
       - distribute-build-url:
             - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
       - autorelease-maven-sources-post-process
       - shell: |
           mkdir -p archives/
 
     publishers:
       - opendaylight-infra-notify-status
-      - opendaylight-infra-sysstats
-      - archive:
-          # Need to archive dependencies.log in Jenkins to provide a simple
-          # way for downstream jobs to pull the latest version of this file
-          # in their builds.
-          artifacts: 'dependencies.log'
       - trigger-parameterized-builds:
           - project: 'autorelease-generate-release-notes-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger
             fail-on-missing: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: autorelease-version-bump-{stream}
 
     scm:
       - lf-infra-gerrit-scm:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           goals: '-version'
           settings: autorelease-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - autorelease-cfp
       - shell: !include-raw-escape:
     name: 'autorelease-generate-release-notes-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-java-builder-2c-4g
 
     properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+      - lf-infra-properties:
+          build-days-to-keep: 7
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
 
     scm:
-      - git:
-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - '$GERRIT_BRANCH'
-          choosing-strategy: 'gerrit'
-          skip-tag: true
-          submodule:
-            recursive: true
+      - lf-infra-gerrit-scm:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-recursive: true
+          choosing-strategy: default
 
     wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '30'
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     triggers:
       - timed: '0 0 * * 0'
 
     builders:
-      # force jenkins install of maven version before any shell scripts use it
+      - lf-maven-install:
+          mvn-version: mvn33
       - maven-target:
-          maven-version: 'mvn33'
-          goals: '-version'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'odl-global-settings'
-          global-settings-type: cfp
-      - maven-target:
-          maven-version: 'mvn33'
+          maven-version: mvn33
           pom: '$WORKSPACE/scripts/release_notes_management/pom.xml'
           goals: |
               clean package
-              -Dcheckstyle.skip=true
-              -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
+          settings: autorelease-settings
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: global-settings
           global-settings-type: cfp
       - autorelease-generate-release-notes
 
     publishers:
-      - opendaylight-infra-sysstats
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
diff --git a/jjb/autorelease/include-raw-autorelease-collect-sar.sh b/jjb/autorelease/include-raw-autorelease-collect-sar.sh
deleted file mode 100644 (file)
index e5af468..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
-##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-
-mkdir -p archives/sar
-cp /var/log/sa/* $_
-# convert sar data to ascii format
-while IFS="" read -r s
-do
-    [ -f "$s" ] && sar -A -f "$s" > archives/sar/sar${s//[!0-9]/}
-done < <(find /var/log/sa -name "sa[0-9]*")
index b90d959a788a8e96db8917d475239a3db424980c..941106e5a8a507a2d06b977dc8bfff0b2b16029a 100644 (file)
@@ -23,6 +23,7 @@ STAGING_REPO_ID=$(grep "Created staging repository with ID" "$WORKSPACE/deploy-s
 BUNDLE_URL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/${KARAF_ARTIFACT}/${VERSION}/${KARAF_ARTIFACT}-${VERSION}.zip"
 echo STAGING_REPO_ID="$STAGING_REPO_ID" >> "$WORKSPACE/variables.prop"
 echo BUNDLE_URL="$BUNDLE_URL" >> "$WORKSPACE/variables.prop"
+echo KARAF_VERSION="$KARAF_VERSION" >> "$WORKSPACE/variables.prop"
 echo "BUNDLE_URL: ${BUNDLE_URL}"
 
 # Copy variables.prop to variables.jenkins-trigger so that the end of build
index e84b8caa2745012980dc62da27377db49b43224e..8369a9fa68b7f4b8fadb5ccc6da081aa6a40b5a9 100644 (file)
@@ -21,7 +21,8 @@ git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 mkdir patches
-mv taglist.log "$PATCH_DIR"
+# TODO: Fix this workaround so that scripts will ensure that taglist.log exists and archived.
+mv taglist.log "$PATCH_DIR" || true
 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
     pushd "$module"
index 15b7c8739ac428bc2865896b8a806be246a410eb..65f106354121758d7c1b9f1c71bb11f0ba10186a 100644 (file)
@@ -22,6 +22,11 @@ set -eu -o pipefail
 git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
 git submodule foreach git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
 
+# Setup Gerrit remove to ensure Change-Id gets set on commit.
+git config --global --add gitreview.username "jenkins-releng"
+git review -s
+git submodule foreach "git review -s"
+
 # Check if git state is clean
 git status
 
@@ -70,9 +75,12 @@ then
     -Dmaven.repo.local=/tmp/r \
     -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 
+    # Clear any changes caused by Maven build
+    git checkout -f
+    git submodule foreach git checkout -f
+
     # Push up patches last, as long as nothing failed.
-    git submodule foreach "git remote add gerrit '$GIT_URL/$PROJECT'"
-    git submodule foreach "git review --yes -t '${RELEASE_TAG}' || true"
+    git submodule foreach git review --yes -t "${RELEASE_TAG}"
 fi
 
 echo "Version bumping complete."
index 6a63da2c891d19f163a12dc57c73f047e42fe77c..22cda72e9947e30ad16a59ed42245a897d5843cf 100644 (file)
               -v REPETITIONS_CHANGE_COUNT_MANY:10
               -v MULTIPLICITY_CHANGE_COUNT_MANY:600
               -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-data-change-counter,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-netconf-connector-all
-          robot-options: >
-              -v USE_NETCONF_CONNECTOR:True
-              -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10
-              -v REPETITIONS_CHANGE_COUNT_SINGLE:3
-              -v CHECK_PERIOD_PREFIX_COUNT_MANY:10
-              -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0
-              -v REPETITIONS_CHANGE_COUNT_MANY:10
-              -v MULTIPLICITY_CHANGE_COUNT_MANY:600
-              -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     install:
       - only:
               -v PREFILL:10
               -v UPDATE:single
               -v TEST_DURATION_MULTIPLIER:4
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-data-change-counter,
-              odl-netconf-connector-all
-          robot-options: >
-              -v USE_NETCONF_CONNECTOR:True
-              -v COUNT:1000000
-              -v INSERT:10
-              -v WITHDRAW:9
-              -v PREFILL:10
-              -v UPDATE:single
-              -v TEST_DURATION_MULTIPLIER:4
 
     install:
       - only:
index 4091f0f639cd337de58519fc5d28466e138994fa..e33a0115349eb658e60ecb6ea03ced1ae4117c97 100644 (file)
           jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology'
 
     install:
       - only:
index 106977fffa830a7c6cb866d8d56df3f391bd0256..1a3580fa35a0f37a04f6f0db92d9763311ce7dc6 100644 (file)
           jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep'
 
     install:
       - only:
index db797632280082a4691cd0d35ee83706b6d51bb2..325969803b808258ad84f22d96046b640addfe27 100644 (file)
               odl-bgpcep-bmp,
               odl-jolokia
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-pcep-all,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-pcep,
-              odl-netconf-connector-all,
-              odl-bgpcep-bmp,
-              odl-jolokia
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     install:
       - only:
index fa5f963c1b9941cb7bde0f94bd703e5922c51504..780ca7050efa2e8311f37b27b8a26f97a0d38a7a 100644 (file)
@@ -8,8 +8,6 @@
       # Pcepy was removed in Carbon.
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     toxdir: 'pcep/pcepy'
     project: 'bgpcep'
index 65fe3a3d85e47288ac918ab32fa859f4f8829a45..a9dcb4ff4bc8e3526f7ffae516e41854b426ad69 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
@@ -22,7 +20,7 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         odlparent-merge-{stream},
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
     archive-artifacts: ''
 
-
-- project:
-    name: bgpcep-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream},
-        tcpmd5-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-8g
-
 - project:
     name: bgpcep-sonar
     jobs:
index f8383a8b8c85e012784d0490a059fab402e5faad..c03dac7777bdabdee4698eb0d5b80301b79b00ac 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index 62294a9451fc0e23bba81c0914debb86a6f97be8..dd8982ace72338cbdfa2b464d3ebe5caa8df07d0 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 139bff0e8e4860fbf1a20fc974e1192463cf4c36..20211a4c311b14777966b34f65ddca4ef6cf768c 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
-- project:
-    name: capwap-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-    archive-artifacts: ''
-
 - project:
     name: capwap
     jobs:
index f1d3fb98caaf6e36bdfb174ec077a08d196d4349..48516638be7ac72407a03dbc0883ae07b48af47d 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index ed02d51247e6f5857078cebc6fb27e9a0ac11103..9393f90475471dfcc0a46bf0359959440848dc97 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 4ac5b1b5a89cd4a6b68e2c3ada8ad3459a66c66d..514f10051f7864a7cbca1459f900fae944b6e65c 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[centinel]'
     archive-artifacts: ''
 
-- project:
-    name: centinel-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-    archive-artifacts: ''
-
 - project:
     name: centinel-sonar
     jobs:
index 4bb7e8f2d6000d649329e6fb90a25ec62899c43c..7ab56420f132f1ccbba27ec741361297a2d4f0ec 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 8778cf5f32e30e5075bd4b4f0741f48023126f3b..c7812c37d6b28525a41c9f86a24fbd8ea8ceafeb 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index af7ff6109449746401fb951094ae56eb5c049672..123704450004694b6237319dfc3d3eb6c151ba17 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 13f7e0be762d8c887c56c2c2e2f4efffe070fb3c..8dc7c6492da776da99950b7a7cf09c35ff835716 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 09869279379f2dd1cc8190c7912d60711f0cac50..ab43f6f7aaa43e8f1f296a1e0b733445551b812a 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 8710a4602bf3a035d75cd6db96df0a52621dc397..1d540ac7bc74fa1a2854e376f345fa8f1560c890 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 8d1679134a7ef33fe83dd34fe05d234da59430be..d1d416c00fe63684cdf5b457d94ce7744e412a25 100644 (file)
@@ -4,7 +4,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: controller-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
-
 - project:
     name: controller-sonar
     jobs:
index 367ca6e7f8d66f2a07f7260e854a5117048e8e15..cd47f88a7a377633f52eb321e225dd80fd884346 100644 (file)
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
 
-- project:
-    name: coretutorials-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    archive-artifacts: ''
-
 - project:
     name: coretutorials-sonar
     jobs:
index 615ce277b5ea9b2eea4e6ba52b0d99c2e71625ab..a580e0e405876a3d87c53c5cbac262a0503bf6cf 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 97d50d454805a4746a86ac014dc88dfdca26a96c..25e69bc5bd4afd1deb137ac3fadb4f9abd243a02 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[didm]'
     archive-artifacts: ''
 
-- project:
-    name: didm-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-    archive-artifacts: ''
-
 - project:
     name: didm-sonar
     jobs:
index b770c2150a1b0283613795003f5cf91e95729984..25dc63a15a572cbf4cd08350d38aaf11ab377583 100644 (file)
     email-upstream: '[discovery]'
     archive-artifacts: ''
 
-- project:
-    name: discovery-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'discovery'
-    project-name: 'discovery'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'discovery-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[discovery]'
-    archive-artifacts: ''
-
 - project:
     name: discovery-sonar
     jobs:
index 30568d2f1366e50e274f803823980ff77c585397..a935ace4848c12b90184fa123a4a3243a3ac676a 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[dlux] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: dlux-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'dlux'
-    project-name: 'dlux'
-    karaf-version: karaf3
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: dlux-sonar
     jobs:
index df544b9f710223d9741ce6c2c247fe25c83dd13c..92bc0160ca436527c6e6046fe875544b870735ac 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'dluxapps'
index 3fd3f3ce263fb676a2d6860e2476f2f7de4481d1..aafbeb3b464841842d3ec053252752d131fb61d6 100644 (file)
           branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     project: docs
     project-name: docs
     rtdproject: opendaylight
-    archive-artifacts: 'docs/_build/html/**'
+    archive-artifacts: ''
 
 - job-template:
     name: 'docs-merge-rtd-{stream}'
@@ -68,8 +66,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[docs]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     # FIXME: Describe this job in docs/jenkins.rst
       - shell: |
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install tox
+          PYTHON="$WORKSPACE/venv/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip freeze
+          $PYTHON -m pip install tox
           tox -edocs
 
+          # Archive generated docs
+          mkdir -p "$WORKSPACE/archives"
+          mv docs/_build/html archives/
+
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[docs]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
deleted file mode 100644 (file)
index c1eaeaf..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- project:
-    name: docs-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'docs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[docs] [odlparent]'
-    archive-artifacts: ''
-
-- project:
-    name: docs-sonar
-    jobs:
-      - '{project-name}-sonar'
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'master'
-    mvn-settings: 'docs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 7ae21fed1a493afa3ce27f881207525d3d954dae..24fd71583b70e7afa0d18bda5a2aa6ebdb48c016 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index ead4febb2d054465ba362937b6112dc2f5b21531..413a20203dec87da714503294335788e7c3028e9 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[faas]'
     archive-artifacts: ''
 
-- project:
-    name: faas-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-    archive-artifacts: ''
-
 - project:
     name: faas-sonar
     jobs:
index 6d8aede2ce0566895c83e3e2ce55fc628d5a2baf..ca2435825f298c343e2d2f6bcfcb51e5c75b5f4c 100644 (file)
@@ -7,8 +7,6 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
-      - '{project-name}-validate-autorelease-{stream}'
 
     project: 'federation'
     project-name: 'federation'
index 68a31279410b8212b3f7ae38ae789dbbf35f54ee..f40e7b0be225c209f182f0430307b3fbf15ffe17 100644 (file)
@@ -38,7 +38,7 @@
 
     # Mininet configuration
     tools_system_count: 2
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     # Features to install
     install-features: 'odl-genius-ui'
index 50659e1460be24a6f5f1fd3fac127df1b6742ca0..b51abe8f581a626ab628871604a79255eb5275e8 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index 307868565936d7a5338e1a76dc8a048d914b29be..129735b3b42874ae1de0d0708e28cde16b615e9e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 307868565936d7a5338e1a76dc8a048d914b29be
+Subproject commit 129735b3b42874ae1de0d0708e28cde16b615e9e
index 1f598940fa10007d71bf9f95bbc4568bdaad8b16..6b428fce658eb7757595836ba370ce3a4c9f27e2 100644 (file)
           jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
 
     openstack:
       - newton:
index 1572c351122858c2ca4b4c32d5eee4a3efd45f0b..4c1f1d26b9f9da0cb7e29817a2cb7b8c457427a9 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index bf8b007676309729e345a084672d0b9a19233c46..b919c85a3f7d2cbaefc494b51407dc7edab603e0 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index c69f567062a8ca2ec17a784d280ff8ecece07e2b..407b8a4b39eec0388d43bd23e6289eae8958f1ed 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 5df80371467eae3e3b9085ab6c874a4559f9e7fa..ee38719a64bf50d30f6ed170e4627e3dac8b0e86 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
-- project:
-    name: groupbasedpolicy-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
-
 - project:
     name: groupbasedpolicy-sonar
     jobs:
index a8729cee54587b40fe7712de6523d23a11e6792d..a85060f15f7f168fe54fb19c3484fd8c8306a140 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
deleted file mode 100644 (file)
index 4f1e6eb..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-
-set +e  # Do not affect the build result if some part of archiving fails.
-
-# Print out git status at the end of the build before we archive if $WORKSPACE
-# is a git repo.
-if [ -d "$WORKSPACE/.git" ]; then
-    echo ""
-    echo "----------> Git Status Report"
-    git status
-fi
-
-echo ""
-echo "----------> Archiving build to logs server"
-# Configure wget to not print download status when we download logs or when
-# Jenkins is installing Maven (To be clear this is the Jenkins Maven plugin
-# using a shell script itself that we are unable to modify directly to affect
-# wget).
-echo "verbose=off" > ~/.wgetrc
-
-ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
-[ "$LOGS_SERVER" ] || LOGS_SERVER="https://logs.opendaylight.org"
-[ "$LOGS_REPO_URL" ] || LOGS_REPO_URL="https://nexus.opendaylight.org/service/local/repositories/logs"
-
-echo "Build logs: <a href=\"$LOGS_SERVER/$SILO/$ARCHIVES_DIR\">$LOGS_SERVER/$SILO/$ARCHIVES_DIR</a>"
-
-mkdir .archives
-cd .archives/ || exit 1
-
-cat > deploy-archives.xml <<EOF
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>logs</groupId>
-  <artifactId>logs</artifactId>
-  <version>1.0.0</version>
-  <packaging>pom</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>maven-upload-plugin</artifactId>
-        <version>0.0.1</version>
-        <executions>
-          <execution>
-            <id>publish-site</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>upload-file</goal>
-            </goals>
-            <configuration>
-              <serverId>opendaylight-log-archives</serverId>
-              <repositoryUrl>$LOGS_REPO_URL/content-compressed</repositoryUrl>
-              <file>archives.zip</file>
-              <repositoryPath>$SILO</repositoryPath>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-EOF
-
-mkdir -p "$ARCHIVES_DIR"
-mkdir -p "$WORKSPACE/archives"
-if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
-    pushd "$WORKSPACE"
-    shopt -s globstar  # Enable globstar to copy archives
-    for f in $ARCHIVE_ARTIFACTS; do
-        [[ -e $f ]] || continue  # handle the case of no files to archive
-        echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log"
-        dir="$(dirname "$f")"
-        mkdir -p "$WORKSPACE/archives/$dir"
-        mv "$f" "$WORKSPACE/archives/$f"
-    done
-    shopt -u globstar  # Disable globstar once archives are copied
-    popd
-fi
-
-
-# Ignore logging if archives doesn't exist
-mv "$WORKSPACE/archives/" "$ARCHIVES_DIR" > /dev/null 2>&1
-touch "$ARCHIVES_DIR/_build-details.txt"
-echo "build-url: ${BUILD_URL}" >> "$ARCHIVES_DIR/_build-details.txt"
-env | grep -v PASSWORD | sort > "$ARCHIVES_DIR/_build-enviroment-variables.txt"
-
-# capture system info
-touch "$ARCHIVES_DIR/_sys-info.txt"
-{
-    echo -e "uname -a:\n $(uname -a) \n"
-    echo -e "df -h:\n $(df -h) \n"
-    echo -e "free -m:\n $(free -m) \n"
-    echo -e "nproc:\n $(nproc) \n"
-    echo -e "lscpu:\n $(lscpu) \n"
-    echo -e "ip addr:\n  $(/sbin/ip addr) \n"
-    echo -e "sar -r:\n  $(sar -r) \n"
-} 2>&1 | tee -a "$ARCHIVES_DIR/_sys-info.txt"
-
-# Magic string used to trim console logs at the appropriate level during wget
-echo "-----END_OF_BUILD-----"
-wget -O "$ARCHIVES_DIR/console.log" "${BUILD_URL}consoleText"
-wget -O "$ARCHIVES_DIR/console-timestamp.log" "$BUILD_URL/timestamps?time=HH:mm:ss&appendLog"
-sed -i '/^-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console.log"
-sed -i '/^.*-----END_OF_BUILD-----$/,$d' "$ARCHIVES_DIR/console-timestamp.log"
-
-gzip "$ARCHIVES_DIR"/*.txt "$ARCHIVES_DIR"/*.log
-# find and gzip any 'text' files
-find "$ARCHIVES_DIR" -type f -print0 \
-                | xargs -0r file \
-                | egrep -e ':.*text.*' \
-                | cut -d: -f1 \
-                | xargs -d'\n' -r gzip
-# Compress Java heap dumps using xz
-find "$ARCHIVES_DIR" -type f -name \*.hprof -print0 | xargs -0 xz -T 0
-
-zip -r archives.zip "$JENKINS_HOSTNAME/" >> "$ARCHIVES_DIR/_archives.log"
-du -sh archives.zip
index 004da6b48f70e7d13781b36bf9adf7a47dbb244b..2cbed833aeb23b06b5014df4cd86e0c1b9854b6c 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index a7faae523294a5a8636a0e0c36573f62b9a5b1fb..e596eabe38dec217228cf9f1a5f2b7811e80f54f 100644 (file)
@@ -3,7 +3,6 @@
     name: distribution-csit-userfeatures
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit4-1node-{functionality}-{install}-nitrogen'
 
     # The project name
     project: 'distribution'
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     # TODO: Add Beryllium when everything is backported there.
 
index 7a6345f074fd4fa4ade0d9b4e9069f7d87faa077..cb8a4113681e81849d0347e4a56ef6b00f0b9776 100644 (file)
@@ -43,7 +43,7 @@
     builders:
       - wipe-org-opendaylight-repo
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
           maven-version: mvn33
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
 
     publishers:
       - findbugs
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
       - wipe-org-opendaylight-repo
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - integration-set-variables
       - distribute-build-url:
       maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
       settings: 'integration-settings'
       settings-type: cfp
-      global-settings: 'odl-global-settings'
+      global-settings: 'global-settings'
       global-settings-type: cfp
 
     postbuilders:
                   - '-Xmx2g'
                 settings: 'integration-settings'
                 settings-type: cfp
-                global-settings: 'odl-global-settings'
+                global-settings: 'global-settings'
                 global-settings-type: cfp
             - maven-target:
                 maven-version: 'mvn33'
                   - '-Xmx2g'
                 settings: 'integration-settings'
                 settings-type: cfp
-                global-settings: 'odl-global-settings'
+                global-settings: 'global-settings'
                 global-settings-type: cfp
       - integration-compare-distributions
     # TODO: the output of the above command is not *friendly* for the reader because the most important info
           unique-version: true
           deploy-unstable: false
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
           script-only-if-succeeded: false
           script-only-if-failed: false
           mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'distribution-deploy-{stream}'
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'distribution-offline-{stream}'
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-# Delete these when Karaf 4 becomes Nitrogen default.
-
-# TODO: Is there a way to de-duplicate with generic template parts?
-
-- job-template:
-    name: 'distribution3-check-nitrogen'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: master
-          refspec: refs/heads/master
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-      - distribution-karaf-version:
-          karaf-version: karaf3
-      - maven-exec:
-          maven-version: mvn33
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: distribution
-          refspec: '$GERRIT_REFSPEC'
-          branch: master
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          # Distro-check jobs typically run within 10 - 30 minutes
-          # with 45 minutes being the occassional edge case.
-          # enforce a 60 minute limit to ensure stuck jobs get
-          # cleared up sooner.
-          # Double that as Karaf 3+4 may take longer.
-          build-timeout: '120'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: '**'
-
-    builders:
-      - distribution-check-wipe
-      - distribution-check-build-project:
-          pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-verify-groupid:
-          gerrit-project: 'integration'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - integration-upload-distribution:
-          dist-pom: distribution/pom.xml
-      - integration-distribution-check
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-- job-template:
-    name: 'distribution3-deploy-nitrogen'
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: false
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts} **/*.hprof'
-      - integration-distribution-branch:
-          branch: 'master'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: karaf3
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
-
-    builders:
-      - distribution-deploy-verify
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
-      - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-- job-template:
-    name: 'distribution3-offline-nitrogen'
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: false
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts} **/*.hprof'
-      - integration-distribution-branch:
-          branch: 'master'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: karaf3
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
-
-    builders:
-      - distribution-deploy-offline
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
-      - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index 17712cca77a9157f568a2fdcc11655534c1cf29a..11aeb60b41a4bd8d3d7eb9de856e9373ea622443 100644 (file)
           script-only-if-succeeded: false
           script-only-if-failed: false
           mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-# Delete these when Karaf 4 becomes Nitrogen default.
-
-# TODO: Is there a way to de-duplicate with generic template parts?
-
-- job-template:
-    name: '{project-name}-distribution3-check-nitrogen'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-      - integration-distribution-git-url:
-          git-url: '{git-url}'
-      - distribution-karaf-version:
-          karaf-version: karaf3
-      - maven-exec:
-          maven-version: mvn33
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: '$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-      - integration-distribution-scm:
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          # Distro-check jobs typically run within 10 - 30 minutes
-          # with 45 minutes being the occassional edge case.
-          # enforce a 60 minute limit to ensure stuck jobs get
-          # cleared up sooner.
-          # Double that as Karaf 3+4 may take longer.
-          build-timeout: '120'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: '**'
-
-    builders:
-      - distribution-check-wipe
-      - distribution-check-build-project:
-          pom: '$GERRIT_PROJECT/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-verify-groupid:
-          gerrit-project: '$GERRIT_PROJECT'
-      - distribution-check-download-deps:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - integration-upload-distribution:
-          dist-pom: distribution/pom.xml
-      - integration-distribution-check
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index 057e71ce5d63d2851cd9e8fcc664506a2154aea0..0504f748a46941fc1deb0e71a5e8a848dadc0179 100644 (file)
@@ -6,16 +6,12 @@
       # {project-name}- is generic template, distribution- is project specific.
       - '{project-name}-clm-{stream}'
       - '{project-name}-sonar'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-tox-{stream}'
       - 'distribution-merge-{stream}'
       - 'distribution-verify-{stream}'
       - 'distribution-deploy-{stream}'
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
-      - 'distribution3-deploy-nitrogen'
-      - 'distribution3-offline-nitrogen'
-      - 'distribution3-check-nitrogen'
 
     project: integration/distribution
     project-name: distribution
@@ -36,6 +32,3 @@
       - boron:
           branch: stable/boron
           karaf-version: karaf3
-      - beryllium:
-          branch: stable/beryllium
-          karaf-version: karaf3
index 7e7ff6791eb1fb429fcaec25d9c846ac6accb7b5..b08af74c471cdda55c5fb653f2c8559778434ce6 100644 (file)
@@ -300,17 +300,26 @@ do
 done
 
 sleep 5
+# FIXME: Unify the copy process between various scripts.
+# TODO: Use rsync.
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     echo "Compressing karaf.log ${i}"
     ssh ${!CONTROLLERIP} gzip --best /tmp/${BUNDLEFOLDER}/data/log/karaf.log
     echo "Fetching compressed karaf.log ${i}"
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz"
     # TODO: Should we compress the output log file as well?
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+    echo "Fetch GC logs"
+    # FIXME: Put member index in filename, instead of directory name.
+    mkdir -p "gclogs-${i}"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/*.log" "gclogs-${i}/" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/*.log"
 done
 
+echo "Examine copied files"
+ls -lt
+
 true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index a3a38778e844138469ffce1eb164b7aa7282c312..ce35882ff7b049b10bd1e07b1a4c660b19e8ace3 100644 (file)
@@ -3,10 +3,11 @@
 # ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
 # script.
 source ${ROBOT_VENV}/bin/activate
+PYTHON="${ROBOT_VENV}/bin/python"
 
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
 echo "showing recent changes that made it in to the distribution used by this job"
-pip install --upgrade urllib3
+$PYTHON -m pip install --upgrade urllib3
 python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folder \
                   -u ${ACTUAL_BUNDLE_URL} -b ${DISTROBRANCH} \
                   -r ssh://jenkins-${SILO}@git.opendaylight.org:29418 || true
index d41e88dfc68520979c23e33eafb5b89b3202d712..22d35bcf6fb93819987ad78eff7813e813bd5bac 100644 (file)
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Get the Controller and Tools VM slave addresses
 
 ODL_SYSTEM=()
@@ -5,15 +6,16 @@ TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 [ "$NUM_OPENSTACK_SITES" ] || NUM_OPENSTACK_SITES=1
 
-source $WORKSPACE/.venv-openstack/bin/activate
-ADDR=(`openstack stack show -f json -c outputs $STACK_NAME | \
-       jq -r '.outputs[] | \
-              select(.output_key | match("^vm_[0-9]+_ips$")) | \
-              .output_value | .[]'`)
+OPENSTACK_VENV="/tmp/v/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source $OPENSTACK_VENV/bin/activate
+
+ADDR=($(openstack stack show -f json -c outputs "$STACK_NAME" | \
+       jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]'))
 
 for i in "${ADDR[@]}"
 do
-    REMHOST=`ssh ${i} hostname`
+    REMHOST=$(ssh "${i}" hostname)
     case ${REMHOST} in
     *java*)
        ODL_SYSTEM=( "${ODL_SYSTEM[@]}" "${i}" )
@@ -32,7 +34,7 @@ echo "NUM_TOOLS_SYSTEM=${#TOOLS_SYSTEM[@]}" >> slave_addresses.txt
 #if HA Proxy is requested the last devstack node will be configured as haproxy
 if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
    # HA Proxy is installed on one OPENSTACK_SYSTEM VM on each site
-   NUM_OPENSTACK_SYSTEM=$(( ${#OPENSTACK_SYSTEM[@]} - ${NUM_OPENSTACK_SITES} ))
+   NUM_OPENSTACK_SYSTEM=$(( ${#OPENSTACK_SYSTEM[@]} - NUM_OPENSTACK_SITES ))
 else
    NUM_OPENSTACK_SYSTEM=${#OPENSTACK_SYSTEM[@]}
 fi
@@ -40,14 +42,14 @@ echo "NUM_OPENSTACK_SYSTEM=${NUM_OPENSTACK_SYSTEM}" >> slave_addresses.txt
 
 # Add alias for ODL_SYSTEM_1_IP as ODL_SYSTEM_IP
 echo "ODL_SYSTEM_IP=${ODL_SYSTEM[0]}" >> slave_addresses.txt
-for i in `seq 0 $(( ${#ODL_SYSTEM[@]} - 1 ))`
+for i in $(seq 0 $(( ${#ODL_SYSTEM[@]} - 1 )))
 do
     echo "ODL_SYSTEM_$((i+1))_IP=${ODL_SYSTEM[${i}]}" >> slave_addresses.txt
 done
 
 # Add alias for TOOLS_SYSTEM_1_IP as TOOLS_SYSTEM_IP
 echo "TOOLS_SYSTEM_IP=${TOOLS_SYSTEM[0]}" >> slave_addresses.txt
-for i in `seq 0 $(( ${#TOOLS_SYSTEM[@]} - 1 ))`
+for i in $(seq 0 $(( ${#TOOLS_SYSTEM[@]} - 1 )))
 do
     echo "TOOLS_SYSTEM_$((i+1))_IP=${TOOLS_SYSTEM[${i}]}" >> slave_addresses.txt
 done
@@ -56,7 +58,7 @@ openstack_index=0
 # Assuming number of openstack control nodes equals number of openstack sites
 NUM_OPENSTACK_CONTROL_NODES=$(( NUM_OPENSTACK_SITES ))
 echo "NUM_OPENSTACK_CONTROL_NODES=${NUM_OPENSTACK_CONTROL_NODES}" >> slave_addresses.txt
-for i in `seq 0 $((NUM_OPENSTACK_CONTROL_NODES - 1))`
+for i in $(seq 0 $((NUM_OPENSTACK_CONTROL_NODES - 1)))
 do
     echo "OPENSTACK_CONTROL_NODE_$((i+1))_IP=${OPENSTACK_SYSTEM[$((openstack_index++))]}" >> slave_addresses.txt
 done
@@ -64,7 +66,7 @@ done
 # The rest of the openstack nodes until NUM_OPENSTACK_SYSTEM are computes
 NUM_OPENSTACK_COMPUTE_NODES=$(( NUM_OPENSTACK_SYSTEM - NUM_OPENSTACK_CONTROL_NODES ))
 echo "NUM_OPENSTACK_COMPUTE_NODES=${NUM_OPENSTACK_COMPUTE_NODES}" >> slave_addresses.txt
-for i in `seq 0 $((NUM_OPENSTACK_COMPUTE_NODES - 1))`
+for i in $(seq 0 $((NUM_OPENSTACK_COMPUTE_NODES - 1)))
 do
     echo "OPENSTACK_COMPUTE_NODE_$((i+1))_IP=${OPENSTACK_SYSTEM[$((openstack_index++))]}" >> slave_addresses.txt
 done
@@ -72,7 +74,7 @@ done
 # The remaining openstack nodes are haproxy nodes (for ODL cluster)
 NUM_OPENSTACK_HAPROXY_NODES=$(( ${#OPENSTACK_SYSTEM[@]} - NUM_OPENSTACK_SYSTEM ))
 echo "NUM_OPENSTACK_HAPROXY_NODES=${NUM_OPENSTACK_HAPROXY_NODES}" >> slave_addresses.txt
-for i in `seq 0 $((NUM_OPENSTACK_HAPROXY_NODES - 1))`
+for i in $(seq 0 $((NUM_OPENSTACK_HAPROXY_NODES - 1)))
 do
     echo "OPENSTACK_HAPROXY_$((i+1))_IP=${OPENSTACK_SYSTEM[$((openstack_index++))]}" >> slave_addresses.txt
 done
index be6b965f39f1448609f9f426df605be26cfa5a94..ddef09f5122fc4a74b53d42325a499a1720efb58 100644 (file)
@@ -10,7 +10,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-ROBOT_VENV=$(mktemp -d --suffix=robot_venv)
+ROBOT_VENV="/tmp/v/robot"
 echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 
 # The --system-site-packages parameter allows us to pick up system level
@@ -27,6 +27,7 @@ pip install --upgrade pip
 
 pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon
 pip install --upgrade robotframework-httplibrary \
+    requests==2.15.1 \
     robotframework-requests \
     robotframework-sshlibrary \
     robotframework-selenium2library \
@@ -39,10 +40,10 @@ pip install --upgrade jsonpath-rw
 pip install --upgrade elasticsearch elasticsearch-dsl
 
 # Module for pyangbind used by lispflowmapping project
-pip install pyangbind
+pip install --upgrade pyangbind
 
 # Module for iso8601 datetime format
-pip install isodate
+pip install --upgrade isodate
 
 # Modules for tornado and jsonpointer used by client libraries of IoTDM project
 # Note: Could be removed when client running on tools VM is used instead
@@ -53,7 +54,7 @@ pip install --upgrade tornado jsonpointer
 pip install --upgrade jmespath
 
 # Module for backup-restore support library
-pip install jsonpatch
+pip install --upgrade jsonpatch
 
 # Print installed versions.
 pip freeze
index 997a6bd1d9d2e84a33195793a500208919e1e6ec..da99d6247bf60d725a6b120398d88cc674341faa 100644 (file)
@@ -145,10 +145,18 @@ do
     echo "Compressing karaf.log ${i}"
     ssh ${!CONTROLLERIP} gzip --best /tmp/${BUNDLEFOLDER}/data/log/karaf.log
     echo "Fetching compressed karaf.log ${i}"
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz"
-    # TODO: Gzip also these?
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz"
+    # TODO: Should we compress the output log file as well?
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+    echo "Fetch GC logs"
+    # FIXME: Put member index in filename, instead of directory name.
+    mkdir -p "gclogs-${i}"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/*.log" "gclogs-${i}/" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/*.log"
 done
+
+echo "Examine copied files"
+ls -lt
+
 true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index 78067e9bd6a88203f7d70be3c6f64e51fbb41bb0..f28711cd8b736bf32b786c9500b0135639842280 100644 (file)
@@ -20,16 +20,12 @@ if [ ${BUNDLE_URL} == 'last' ]; then
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
     ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-elif [[ "${BUNDLE_URL}" == *"jenkins"* ]]; then
-    ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
-    BUNDLE="${BUNDLE_URL##*/}"
-    BUNDLEFOLDER="${BUNDLE//.zip}"
-    BUNDLEVERSION="${BUNDLEFOLDER//$KARAF_ARTIFACT-}"
 else
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
+    ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"
     BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
-    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+    BUNDLEFOLDER="${ARTIFACT}-${BUNDLEVERSION}"
 fi
 
 echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}"
index 4c22732f8158c58e061c569100a0f0b077226fd4..6b48c8847ab6869c80866925d690414b57fc187f 100644 (file)
     builders:
       - config-file-provider:
           files:
-            - file-id: odl-global-settings
+            - file-id: global-settings
               variable: GLOBAL_SETTINGS_FILE
             - file-id: integration-settings
               variable: SETTINGS_FILE
index 40cd2f1114a3667a2f5b189b92b781ca72a0f765..47c11a99d7b3cb94ad273adf09d18d6470ae7e91 100644 (file)
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
-          karaf-version: 'karaf3'
+          karaf-version: '{karaf-version}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
           maven-version: mvn33
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
index 75719880084a0d32bd329fa40aced5a38287e299..4fe0d81ee7873bc854fbbb16243bd951e737c56d 100644 (file)
@@ -18,7 +18,6 @@
     stream:
       - nitrogen:
           branch: 'master'
-          karaf-version: karaf3
           jre: 'openjdk8'
           csit-list: '{csit-list-nitrogen}'
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-high-frequency-list: ''
           schedule-high-frequency: ''
 
-      - beryllium:
-          branch: 'stable/beryllium'
-          karaf-version: karaf3
-          jdk: 'openjdk7'
-          jre: 'openjdk7'
-          csit-list: '{csit-list-beryllium}'
-          csit-sanity-list: ''
-          csit-weekly-list: ''
-          schedule-weekly: 'H 12 * * 0'
-          csit-high-frequency-list: ''
-          schedule-high-frequency: ''
-
     # tools system image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
           maven-version: 'mvn33'
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
           maven-version: mvn33
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
               KARAF_VERSION=$KARAF_VERSION
 
     publishers:
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[$GERRIT_PROJECT]'
       - wipe-org-opendaylight-repo
       - integration-multipatch-builder
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'yangtools-settings'
       - maven-target:
           maven-version: mvn33
             - '-Xmx7168m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
                     KARAF_VERSION=$KARAF_VERSION
 
     publishers:
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
index 3591d82bf77f846e66281e73994ab85a393e1369..942cbfaaa39181ffc66a6537bfdeca2b818803ce 100644 (file)
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
+      - lf-infra-publish
index 5c81767b215811ffb8967f3c827aa0fb45fcf56d..7e2976cc63b1ad0039236d3708da7ac5a71c3d6e 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[iotdm] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: iotdm-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
-
 - project:
     name: iotdm-sonar
     jobs:
diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
new file mode 100644 (file)
index 0000000..07dabe4
--- /dev/null
@@ -0,0 +1,50 @@
+---
+- project:
+    name: jsonrpc-csit-basic
+    jobs:
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'jsonrpc'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Set trigger
+    trigger-jobs: '{project}-merge-{stream}'
+
+    # Project branches
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+          # yamllint disable-line rule:line-length
+          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip'
+
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+          # yamllint disable-line rule:line-length
+          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip'
+
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+          # yamllint disable-line rule:line-length
+          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-boron/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/0.9.0-SNAPSHOT/jsonrpc-karaf-0.9.0-SNAPSHOT.zip'
+
+    install:
+      - only:
+          scope: 'only'
+
+    # no mininet required
+    tools_system_count: 0
+
+    # Features to install
+    install-features: 'odl-jsonrpc'
+
+    # Robot custom options
+    robot-options: ''
index 169577e4e65638451183a78645830f262adf8520..807e498377e3163ca96aa31a4efa65e98e3e3aec 100644 (file)
@@ -6,6 +6,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: nitrogen
@@ -30,6 +31,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: carbon
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
     archive-artifacts: ''
 
+- project:
+    name: jsonrpc-boron
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: boron
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+    archive-artifacts: ''
+
 - project:
     name: jsonrpc-sonar
     jobs:
index 2d14a29de80b62f6934c26b10c2492d72bb65718..65f36f3bd774356d4b0f36b4b292245b171573c8 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index bb1fe3955f915de72cbd0639e141013c373fc2ad..09e1051e18c2aa181bd16cfa79b65b062fc0a868 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index e899f68b8d9e03998df71c8d743e1e9e5d2870fe..f7c429d5cadd993a4a12392547cccd21a3fa9791 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 5bd174ee1f640d35ee14f1d7cd13436a82e74dcf..bc670259facd279970b68dea30bff26cb1c69556 100644 (file)
           branch: 'stable/boron'
           jdk: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
-          karaf-version: karaf3
 
     feature:
       - all:
index 0dd6f35d6b0d683d35b89e35f3f82a8a563a2e61..9950e0a931dc54d6d44a4430bf5fa86d40f8c02c 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: l2switch-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
-
 - project:
     name: l2switch-sonar
     jobs:
index db0539a769ab98ed046ea6239253b198d167faed..72049dff2534e8593daa1c6dbae1cc4e461c100e 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
@@ -35,7 +31,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     # Features to install
     install-features: 'odl-lacp-ui'
index 83a935f3eae14a546a7e7d68e754737c81001bc0..dd1233505b2fbf2ee7521b02a080196e19d97848 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: lacp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
-
 - project:
     name: lacp-sonar
     jobs:
diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
new file mode 100644 (file)
index 0000000..800835f
--- /dev/null
@@ -0,0 +1,26 @@
+---
+- project:
+    name: lf-infra-global-jjb
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-global-jjb
+    project: releng/global-jjb
+    build-node: centos7-java-builder-2c-4g
+    stream: master
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+
+- project:
+    name: lf-infra-lftools
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-lftools
+    project: releng/lftools
+    build-node: centos7-java-builder-2c-4g
+    stream: master
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
index 018ea27a32c53633d8002293436ae1958a39a259..7939eca4edf94233231e2fa91114e5fdf02f7e97 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 3d1f1ae4b6eb44cef4793cdc916b23ff0dea06d7..32e42cd963c4dfe0b0bb82962e5f811f1ac7f34a 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
 
     install:
       - only:
index 2ed9868a9cf6bb1d0eb6bb56e7b152c8aa62ce37..bf5cad4d7cb1874e4b13e794e3b3065a212544df 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     archive-artifacts: ''
     build-node: centos7-java-builder-4c-8g
 
-- project:
-    name: lispflowmapping-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-8g
-
 - project:
     name: lispflowmapping-sonar
     jobs:
index f2987c5f8ba24a0adee2905dd42cd13ad6d2efe4..22f9ea8745e556059bcbc959a8ccbf8a22bda268 100644 (file)
           jre: 'openjdk8'
           karaf-version: karaf3
           robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_7_OPTIONS:-Xmx6144m@-XX:MaxPermSize=512m --escape space:@'
 
     install:
       - only:
index b73996b0e43d7ad195f5f0aff74fa287cfda7ec8..f5b197b599491d95098c75f6194c583c32be241b 100644 (file)
@@ -4,7 +4,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: mdsal-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: mdsal-sonar
     jobs:
index a2b2009b309ae71bd51c5b28f34ebe35f47937ee..8017793965e14c36e7d5c56298e728b7cc88ea03 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index f717d6a9f226757a413b2acece4d5e2d48beed0f..77b1bb7943410971b381101b045f87e22fbba41f 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[messaging4transport]'
     archive-artifacts: ''
 
-- project:
-    name: messaging4transport-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
-
 - project:
     name: messaging4transport-sonar
     jobs:
index 59e13535d5b01efd64fa61d546fb427d8c1c11e1..0099f203d75454301b3ad0ba24605222f867b752 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index d48097dfd9344934c989136b027f2f013a195cfb..250277f1011f40192ce9592844e9b1a20088c032 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index d39b71b0f19bf04f3503af474e9c46b7724c043b..200136113b391c69133c63e66db904462a6f469b 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
-- project:
-    name: nemo-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[nemo]'
-    archive-artifacts: ''
-
 - project:
     name: nemo-sonar
     jobs:
index 1347af9cefd56ac75c04d252ad97a9ccc0bb8538..46b1935368d8a0c7207192fd667e7119afb3334a 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 429f207e5c0bf742404901b0bbb74c2940ea571a..6bc1e94c1574624b0e86c6a448a7b1c6fce01fc8 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 4c7763258d7f8c8953449bc9b377f6d3902b6975..7ea02b322b9f82c74f932ee3e7b2d074f8e92cab 100644 (file)
               odl-netconf-connector-all,
               odl-netconf-topology
           robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-clustering-test-app,
-              odl-netconf-mdsal,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     install:
       - only:
index 2b4c903d40e5019eb9b80635e5cfd8c8a602381c..811c8450fa54dd291034a00bb9721ade2ecf2cd7 100644 (file)
               odl-netconf-connector-all,
               odl-netconf-topology
           robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-netconf-mdsal,
-              odl-mdsal-apidocs,
-              odl-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
 
     install:
       - only:
index aeaa6bf468bc96db7496dd985dcc2724832b1b69..232ea9a5a41df403deac0b09994ffb41e78d3548 100644 (file)
@@ -4,7 +4,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: netconf-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: netconf-sonar
     jobs:
index 26f190b87781545f04c8cfb14c2e44e33eea4e3a..365c36f639edb7df12cf09d4497b304fb0b6e1a1 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index b61bd457f5e55a4537feafe125e9fc499a679d47..2b6acdfa688d8b9dd85d04a4515d99c853539b40 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[netide] [openflowjava]'
     archive-artifacts: ''
 
-- project:
-    name: netide-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
-
 - project:
     name: netide-sonar
     jobs:
index dd8831088aa41f58663c7909c88e9638591ec8df..06abe2c24419ffe9a5b39239f94612778e4e7349 100644 (file)
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
 
     tools_system_count: 2
 
index 4e1ba2f688a4f4ae2ff9a96e30e6b2aadc1dd82d..a5cc373274c386b50a4cadfeae4bc6f8eb06f43d 100644 (file)
@@ -1,6 +1,7 @@
 ---
+
 - project:
-    name: netvirt-csit-openstack-integration
+    name: netvirt-csit-openstack-integration-nitrogen
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
           schedule: ''
           sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: ''
+          schedule: '@daily'
           sg-mode: 'stateful'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/netvirt/job/netvirt-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.netvirt$vpnservice-karaf/artifact/org.opendaylight.netvirt/vpnservice-karaf/0.5.0-SNAPSHOT/vpnservice-karaf-0.5.0-SNAPSHOT.zip'
       - upstream-stateful-snat-conntrack:
           schedule: ''
           sg-mode: 'stateful'
       - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+
+    openstack:
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+      - newton-nodl-v2:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+
+    security-group-mode: '{sg-mode}'
+
+- project:
+    name: netvirt-csit-openstack-integration
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
+
+    topology:
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system_count: 4
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
+    functionality:
+      - upstream-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+      - upstream-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - upstream-learn:
+          schedule: ''
+          sg-mode: 'learn'
+      - gate-learn:
+          schedule: ''
+          sg-mode: 'learn'
+      - gate-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+      - gate-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - gate-minimal-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      - gate-tempest-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+          testplan: '{project}-{topology}-tempest-openstack.txt'
+
+    stream:
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
 
     security-group-mode: '{sg-mode}'
 
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
 
     security-group-mode: 'stateful'
index c2665f0dcee1e138fab8b09d66889308b81cc750..911e0eb0870ec2e78a0b4084a4f85bbee7855b6e 100644 (file)
           jdks:
             - openjdk8
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
@@ -52,7 +46,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -77,7 +71,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
       - shell: |
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip install docker-compose
+          PYTHON="$WORKSPACE/venv/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install docker-compose
 
 
 - builder:
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       # skip 2.4.0 until we figure out conntrack
       # - run-netvirt-it:
           succeed-if-found: false
           unstable-if-found: true
           also-check-console-output: false
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index 7390064d9db0fdb9d91a3b0101004a4a71e4b1c7..b9f23fc7f7d38a20f0e3a880a22d98326b8223df 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index e72b2ade41ca51ca913d5315588327b25e5961f9..b255922bfde674e930d601c6ffb52c3c3379ce40 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     openstack:
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
 
     public-bridge: 'br-ex'
index c1edd3842de9929cf28f35c138c5203d87e274b0..3e94b1f831835761a704c006a13e48184626de02 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 76f5cf82bab08fef0d8cd0777418ed9787270e70..8d274b9e27fc3439acd63d9b8e9b075ec173a315 100644 (file)
@@ -14,8 +14,9 @@
       - shell: |
           virtualenv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip install docker-compose
+          PYTHON="$WORKSPACE/venv/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install docker-compose
 
 - job-template:
     name: 'netvirt-sonar'
@@ -67,7 +68,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - inject:
           properties-file: env.properties
@@ -86,7 +87,7 @@
             - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
             - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: !include-raw-escape: include-raw-setup-docker.sh
       - inject:
             - 'ovsdb.userspace.enabled=yes'
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
               -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           settings: 'netvirt-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: !include-raw-escape: include-raw-cleanup-docker.sh
       - jacoco-nojava-workaround
           email-prefix: '[netvirt]'
       - jacoco-report
       - findbugs
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index e2a79df84bd021e23b47dd5ae738e32ba114bdf3..a3b511dae4eca5e255a7dc24ac1aad8bbad368cb 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
 
-- project:
-    name: netvirt-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'netvirt'
-    project-name: 'netvirt'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    dependencies: >
-        neutron-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
-    archive-artifacts: ''
-
 - project:
     name: netvirt-vpp
     jobs:
diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
deleted file mode 100644 (file)
index 52282f9..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- project:
-    name: neutron-daily-openstack
-    jobs:
-      # TODO: Do we want boron job too?
-      - 'neutron-daily-openstack-beryllium'
-
-    project: 'neutron'
-
-- job-template:
-    name: 'neutron-daily-openstack-beryllium'
-
-    project-type: freestyle
-    node: centos7-devstack-2c-4g
-    description: 'Jenkins job to run Tempest tests for the ODL ML2 MechanismDriver on Neutron dummy provider. '
-    concurrent: true
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '198'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '90'
-      - ssh-agent-credentials:
-          users:
-            - 'openstack-gerrit-ssh'
-
-    triggers:
-      - timed: '@daily'
-
-    builders:
-      - inject:
-          properties-content: |
-            # FIXME: Should *-beryllium job set lithium version? Add a comment why.
-            ODL_VERSION=lithium-latest
-            TEMPEST_REGEX=tempest.api.network
-            KARAFFEATURE=odl-neutron-dummyprovider-test
-      - shell: !include-raw-escape: include-raw-openstack-ci.sh
-
-    publishers:
-      - archive:
-          artifacts: 'logs/**'
-          fingerprint: false
-      - email-ext:
-          subject: '[neutron] $DEFAULT_SUBJECT'
-          attach-build-log: false
-          failure: false
-          unstable: false
-          fixed: false
index 4f44276fe95d323933628be23f36b4d6db825fa6..233abe0a47ed199670338b5fbb75fe01f987e835 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
-- project:
-    name: neutron-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
-
 - project:
     name: neutron-sonar
     jobs:
index b34994c21dc9a0f9a14a4014bacc45fcada430ed..dc0d3392d0012e3d19aa949b736323dff8adc6da 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[next]'
     archive-artifacts: ''
 
-- project:
-    name: next-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-    archive-artifacts: ''
-
 - project:
     name: next-sonar
     jobs:
index 3f92dc6c45305260c84a91ef9a2d9939e36341fe..fffb923a4469a37bc135a7afd366683650b8f58c 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 61ef22ebf0c857b31131abf2891e72c031697b65..be113283a07252ccce9430f5321a0c8b96bffdc4 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 3ec53dc2e9ff8244f788f67bfa9f5be2116571ee..8b1a393cbe5ed2e2f417c4eb4d405996dddfc329 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
-- project:
-    name: nic-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
-
 - project:
     name: nic-sonar
     jobs:
index 7a766aefba43ba27f5ac19ca1fe8058819a4dbaf..4f8e7e28a54988740852cc03c6b97c1b61b9adbf 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
index 7076499bd90d133452dfc71bcf7d313acef69b44..9f645330341ca7201ccf4895564786b4b479970a 100644 (file)
@@ -4,12 +4,11 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
 
     stream: nitrogen
     project: 'odlparent'
       - openjdk8
     maven:
       - mvn33:
-          mvn-version: 'mvn33'
+          mvn-version: mvn33
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
     dependencies: ''
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    settings-file: odlparent-settings
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-carbon
     jobs:
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: odlparent-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: odlparent-sonar
     jobs:
index b8222a6a0c60f6c83c53d53d27276324c0562920..32d435eda5236cb241336dfd5cd72c164f46be2c 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index d78a9bef35fa936baf09c8b7a700c496a97917e6..30a5df714b0d988afda124565ff0a4882339ccfc 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
-- project:
-    name: of-config-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: netconf-merge-{stream}'
-    email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
-
 - project:
     name: of-config-sonar
     jobs:
index ca6bcac41c9b1f0ee584792740ef2ae8eb623d2d..8775028260cf4ab89a39e49cceaa148b658929e1 100644 (file)
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
-- project:
-    name: circuitsw-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[circuitsw]'
-    archive-artifacts: ''
-
 - project:
     name: circuitsw-sonar
     jobs:
diff --git a/jjb/opendaylight-infra-cleanup-stale-nodes.sh b/jjb/opendaylight-infra-cleanup-stale-nodes.sh
new file mode 100644 (file)
index 0000000..e8f1c83
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Todo: As a safe check we could obtain the list of active jobs from Jenkins and
+# compute the checksum from $JOB_NAME to check if any active nodes exist and
+# skip deleting those nodes. This step may not be required since there is already
+# 24H timeout in place for all jobs therefore all jobs are expected to complete
+# within the timeout.
+
+lftools openstack --os-cloud rackspace \
+    server list --days=1
+lftools openstack --os-cloud rackspace \
+    server cleanup --days=1
index d99938b3444dbbc09a741e9dc4305eba0c4334f9..6c3289a060ae62a1e19d1e730948bd58dc7bfeb9 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
-virtualenv "$WORKSPACE/.venv"
-# shellcheck disable=SC1090
-source "$WORKSPACE/.venv/bin/activate"
+virtualenv "/tmp/v/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
 pip install --upgrade pip
 pip install --upgrade python-openstackclient python-heatclient
 pip freeze
@@ -36,14 +36,13 @@ done
 # delete them.
 for STACK_NAME in "${OS_STACKS[@]}"; do
     STACK_STATUS=$(openstack stack show -f json -c "stack_status" "$STACK_NAME" | jq -r '."stack_status"')
-    if [[ "${ACTIVE_BUILDS[@]}" =~ $STACK_NAME ]]; then
+    if [[ "${ACTIVE_BUILDS[*]}" =~ $STACK_NAME ]]; then
         # No need to delete stacks if there exists an active build for them
         continue
     else
-        OS_STATUS=$(openstack stack show -f json -c stack_status "$stack" | jq -r '.stack_status')
-        case "$OS_STATUS" in
+        case "$STACK_STATUS" in
             DELETE_IN_PROGRESS)
-                echo "skipping delete, $stack is already DELETE in progress."
+                echo "skipping delete, $STACK_NAME is already DELETE in progress."
                 continue
             ;;
             DELETE_FAILED)
@@ -62,8 +61,8 @@ for STACK_NAME in "${OS_STACKS[@]}"; do
                 continue
             ;;
             CREATE_COMPLETE|CREATE_FAILED)
-                echo "Deleting orphaned stack: $stack"
-                openstack stack delete --yes "$stack"
+                echo "Deleting orphaned stack: $STACK_NAME"
+                openstack stack delete --yes "$STACK_NAME"
                 continue
             ;;
             *)
index d6801239f6b0b843889608bd2fda9c8e95584916..7e3d8b0caf78f062f66d04d200e38ad223c74ef0 100644 (file)
@@ -1,8 +1,8 @@
 #!/bin/bash
 echo "----------> Copy ssh public keys to csit lab"
 
-# shellcheck disable=SC1090
-source "$WORKSPACE/.venv-openstack/bin/activate"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
 
 function copy-ssh-keys-to-slave() {
     RETRIES=60
index 9e0266ea96977eb38d1dee1d2fef3c9ad1dac91c..a75710b2c463bcacb4062316bcd35573cf9eb1b3 100644 (file)
@@ -1,8 +1,15 @@
 #!/bin/bash
 
-# upgrade git-review to a version that will have the --reviewers option. existing minion
-# image has a version that does not have it.
-sudo pip install git-review --upgrade
+# Install git-review using virtualenv to the latest version that supports
+# --reviewers option, available through pip install. Existing minion image has a
+# version that does not have it.
+virtualenv "/tmp/v/git-review"
+# shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
+source "/tmp/v/git-review/bin/activate"
+pip install --upgrade pip
+pip install --upgrade git-review
+pip install --upgrade pipdeptree
+pipdeptree
 
 # shellcheck disable=SC1083
 CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \
index 18766ea46c27ce506db3e83c10af25a7a68356aa..dd731f1ac4b034609f0b153ce0a7d9f213f092d9 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
-virtualenv "$WORKSPACE/.venv-openstack"
-# shellcheck disable=SC1090
-source "$WORKSPACE/.venv-openstack/bin/activate"
+virtualenv "/tmp/v/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
 pip install --upgrade pip
 pip install --upgrade python-openstackclient python-heatclient
 pip freeze
index 871bdd5aa58db2ae327515e2dadc68bd736f3df7..8f2c7f46ba77091138e9ea121812f6728fc25fb5 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
-virtualenv "$WORKSPACE/.venv"
-# shellcheck disable=SC1090
-source "$WORKSPACE/.venv/bin/activate"
+virtualenv "/tmp/v/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
 pip install --upgrade --quiet pip
 pip install --upgrade --quiet python-openstackclient python-heatclient
 pip freeze
index 9485b8bb10691a28ff4bd9f83cfd969f9832657b..abefc27b0a68daba0002b8a47b3a55c5d295d994 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
-- project:
-    name: openflowjava-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
 - project:
     name: openflowjava-sonar
     jobs:
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
deleted file mode 100644 (file)
index f4278fb..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-daily-old
-    jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
deleted file mode 100644 (file)
index 95e6917..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-perf-daily-old
-    jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: '8 GB General Purpose v1'
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count_per_switch:2000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Java Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Java Performance'
-    02-plot-data-file: 'time.csv'
index 3d751e6ec69c4ec9c858d6aa07ce73a5bf3c2ac9..af66155f802dd6172e0d9ffeddbcc2d3a968a3db 100644 (file)
@@ -32,7 +32,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221'
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
deleted file mode 100644 (file)
index baf8cf0..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-bulkomatic-perf-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: 8 GB General Purpose v1
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-openflowplugin-app-bulk-o-matic,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count_per_switch:2000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Java Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Java Performance'
-    02-plot-data-file: 'time.csv'
index 8400e9bd909683641414659c2469fc029acbd0a3..75650277b6a334802d4fef0d1d01294526c9ed1b 100644 (file)
@@ -32,7 +32,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
deleted file mode 100644 (file)
index 9c01b85..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-cbench-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
-
-    # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
deleted file mode 100644 (file)
index d2aca6b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-clustering-old
-    jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'clustering'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'
index b308f19335230cd314215a9bed043580170324de..7445a0841583434e016535e1e603395fc4f0d25d 100644 (file)
@@ -37,4 +37,4 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221'
index 29d2077453b17b9f82ebe5964858d5ec842d4748..6f9610a22f1fe9490397aed9484f19249a32e074 100644 (file)
@@ -41,4 +41,4 @@
     robot-options: '-v flow_update_time:30s'
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
deleted file mode 100644 (file)
index 1b29b0b..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-flow-services-old
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
-
-    # Robot custom options
-    robot-options: ''
-
-    # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
index deba1fa0636ac502d4df5dd82920b9c21cf0c2a4..28ce5f977dd38f60fa773352ca2a0a89d40e8651 100644 (file)
@@ -39,4 +39,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
deleted file mode 100644 (file)
index ac1a48a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-link-scalability-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'link-scalability-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: ''
-
-    # Plot Info
-    01-plot-title: 'Maxmum Links Full Mesh Topology'
-    01-plot-yaxis: 'Links'
-    01-plot-group: 'Link Scalability'
-    01-plot-data-file: 'links.csv'
-    02-plot-title: 'Topology Discover Time'
-    02-plot-yaxis: 'Seconds'
-    02-plot-group: 'Link Scalability'
-    02-plot-data-file: 'time.csv'
index f5a2f9c0525031b2d1e8ad3567532b814e906628..a145371181368ef5d13b01cf88d6fc6fb50743ea 100644 (file)
@@ -39,7 +39,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
deleted file mode 100644 (file)
index 70049cd..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-longevity-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-    build-timeout: 1440
-
-    # The functionality under test
-    functionality: 'longevity'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TEST_LENGTH:23h'
index 2305d82752e5285d31953f51e419cab25a55a5da..d49d62bc9cf3d7920d2aa50f96f804fe04c2b738 100644 (file)
@@ -40,7 +40,7 @@
     robot-options: '-v TEST_LENGTH:23h'
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     # Trigger jobs (on saturday)
     schedule: 'H H * * 6'
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
deleted file mode 100644 (file)
index 4345cf5..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-restconf-clustering-perf-daily-old
-    jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'restconf-clustering-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: 8 GB General Purpose v1
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count:64000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'REST Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'REST Performance'
-    02-plot-data-file: 'time.csv'
index 5a93945e0251dc71f5d1ac58664b2e45d68284cc..46eef6bf899fe3dbb4b8e26e86ab046ed5889c8e 100644 (file)
@@ -30,7 +30,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     # Features to install
     install-features: >
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
deleted file mode 100644 (file)
index 2a5daf2..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-restconf-perf-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'restconf-perf-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: '8 GB General Purpose v1'
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-ui,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count:64000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'REST Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'REST Performance'
-    02-plot-data-file: 'time.csv'
index b7381d7820085e2a3362fff6b257b21cc08bd5cc..8021ee2aee459621f5bc3a210ae1e169b9ae7edb 100644 (file)
@@ -30,7 +30,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221'
 
     # Features to install
     # yamllint disable-line rule:line-length
index bcc131407f5b14120cf34db93a96fbe89936993c..51b6efcd0b94d521ef4f52f6c07000c9b6104d82 100644 (file)
@@ -36,4 +36,4 @@
     robot-options: '-v SWITCHES:3'
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
deleted file mode 100644 (file)
index 8d77c05..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-scalability-old
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
deleted file mode 100644 (file)
index ffc19f4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-scale-stats-collection-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scale-stats-collection-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: '8 GB General Purpose v1'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
-
-    # Robot custom options
-    robot-options: '-v flnr:64000 -v swnr:32 -v fpr:200'
-
-    # Plot Info
-    01-plot-title: 'Stats Collection Rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Stats Collection Performance'
-    01-plot-data-file: 'stats_rate.csv'
-    02-plot-title: 'Stats Collection Time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Stats Collection Performance'
-    02-plot-data-file: 'stats_time.csv'
index f35f5af711f64f81aa0174ad0a417b1de7d0a169..c79b5cdcddcbfa84eade604fd8d91ff69976a8ff 100644 (file)
@@ -32,7 +32,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui'
diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
deleted file mode 100644 (file)
index 72e2889..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-scalability-daily-old
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'sw-scalability-daily'
-
-    # Project branches
-    stream:
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Plot Info
-    01-plot-title: 'Maximum Switches Linear Topology'
-    01-plot-yaxis: 'Switches'
-    01-plot-group: 'Switch Scalability'
-    01-plot-data-file: 'switches.csv'
-    02-plot-title: 'Topology Discover Time'
-    02-plot-yaxis: 'Seconds'
-    02-plot-group: 'Switch Scalability'
-    02-plot-data-file: 'time.csv'
index 59af112c358b504608a26eb8e3132dd79ca477a0..0762dce39951f60c2c9c36b68dd5d369318364f6 100644 (file)
@@ -38,7 +38,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
index 084bb62740843cbed2162f98a96507696531d8af..7ae1a4d9850ae2591feae0806b146bebc609e7f1 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
     archive-artifacts: 'model/*/target/site/**'
 
-- project:
-    name: openflowplugin-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    archive-artifacts: 'model/*/target/site/**'
-
 - project:
     name: openflowplugin-sonar
     jobs:
index a952b8a7bf9ec84d4fcf8933bcc92ec63c148bc0..fb2c643ce36dd9bd8ee3d804709464f51b41c153 100644 (file)
@@ -15,9 +15,6 @@
       - boron:
           branch: 'stable/boron'
           jdk: openjdk8
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
@@ -85,8 +82,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[opflex]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'opflex-merge-{stream}'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[opflex]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index a962234065f7c1b663e08528f0dbdacbd509ddb8..1b49ffd13db1ee68797255b4f2ded047aa993c4d 100644 (file)
           rapidjson-scm: v1
           openvswitch-build: v1
           openvswitch-scm: v1
-      - beryllium:
-          branch: 'stable/beryllium'
-          libuv-build: v1
-          libuv-scm: v1
-          rapidjson-build: v1
-          rapidjson-scm: v1
-          openvswitch-build: v1
-          openvswitch-scm: v1
 
     project: 'opflex'
 
index 974c83fd05e776f753e5a22d1b9537264bccb45e..a101c014c0760671c7802d802e8a4e57860b0906 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index a55e9f8d067e53d912ce545ae3747eeccf8d7697..48ff9f27e52f70e2cd9633044c0fcb70d2020410 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 87fee427ed361f89e18d70e13a404d6937df21f1..c5711b65f08d12dd55137aa42642c5caad196694 100644 (file)
           jdks:
             - openjdk8
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: openjdk8
-          jdks:
-            - openjdk8
-          karaf-version: karaf3
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -51,7 +45,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - run-ovsdb-it:
           maven-version: 'mvn33'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index 96ef8d750367efaa02d87a634ce111ba2cd61e3c..f669024a6467ad00903f610462411fd6aa54fcb6 100644 (file)
@@ -57,7 +57,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - inject:
           properties-file: env.properties
@@ -75,7 +75,7 @@
             - 'ovsdb.userspace.enabled=yes'
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
@@ -88,7 +88,7 @@
               -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           settings: 'ovsdb-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: !include-raw-escape: include-raw-cleanup-docker.sh
       - jacoco-nojava-workaround
@@ -98,5 +98,4 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[ovsdb]'
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index bc243cd2fc4cf4967408c9d3ee3cc608cee19fbc..12798dde4e19b7bc62ba7076cdf04c4e82bfd8fc 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
-
-- project:
-    name: ovsdb-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
new file mode 100644 (file)
index 0000000..608c487
--- /dev/null
@@ -0,0 +1,101 @@
+---
+- project:
+    name: ansible
+    project-name: ansible
+
+    jobs:
+      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-test-rpm-{stream}'
+      - '{project-name}-test-deb-{stream}'
+
+    project: 'integration/packaging/ansible-opendaylight'
+
+    stream:
+      - master:
+          branch: 'master'
+
+- job-template:
+    name: '{project-name}-test-rpm-{stream}'
+
+    node: centos7-java-builder-2c-4g
+
+    project-type: freestyle
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '{project-name}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: !include-raw: include-raw-test-ansible-rpm.sh
+
+    triggers:
+      - timed: '@daily'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-test-deb-{stream}'
+
+    node: ubuntu1604-mininet-ovs-25-2c-4g
+
+    project-type: freestyle
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: '{project-name}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: !include-raw: include-raw-test-ansible-deb.sh
+
+    triggers:
+      - timed: '@daily'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    publishers:
+      - lf-infra-publish
index 16328f3ff376be09757957e8ca4f5694e742e28e..9626346631a3fe7777d7d49a3eac2262075f1774 100644 (file)
@@ -10,8 +10,9 @@ set -ex -o pipefail
 virtualenv rpm_build
 # shellcheck disable=SC1091
 source rpm_build/bin/activate
-pip install --upgrade pip
-pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
+PYTHON="rpm_build/bin/python"
+$PYTHON -m pip install --upgrade pip
+$PYTHON -m pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
 
 # Build the latest snapshot matching the given major minor version
 "$WORKSPACE/packaging/rpm/build.py" --build-latest-snap \
index e8fcab79adfc9b6dc12a9e15ebc793be496a12f6..bd63c9555881c4b816f8df9f1b18601bad45fec9 100644 (file)
@@ -10,8 +10,9 @@ set -ex -o pipefail
 virtualenv rpm_build
 # shellcheck disable=SC1091
 source rpm_build/bin/activate
-pip install --upgrade pip
-pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
+PYTHON="rpm_build/bin/python"
+$PYTHON -m pip install --upgrade pip
+$PYTHON -m pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
 
 # Make a URL for the tarball artifact from DOWNLOAD_URL (a zip)
 # shellcheck disable=SC2154
index 31c0dcfc64387241edc0db811a9b63dcc4ddcba5..885139e8ca572f0fbb6aaa906a9404ce06486f3e 100644 (file)
@@ -9,7 +9,8 @@ set -ex -o pipefail
 # Install required packages
 virtualenv deb_build
 source deb_build/bin/activate
-pip install --upgrade pip
+PYTHON="deb_build/bin/python"
+$PYTHON -m pip install --upgrade pip
 
 # Wait for any background apt processes to finish
 # There seems to be a backgroud apt process that locks /var/lib/dpkg/lock
index 32ee5cd880c652c096f182f334cb1eaf386e075e..b2c55a43dc06295bcaa593b74ec7c13f78f1c360 100644 (file)
@@ -9,7 +9,8 @@ set -ex -o pipefail
 # Install required packages
 virtualenv rpm_build
 source rpm_build/bin/activate
-pip install --upgrade pip
+PYTHON="rpm_build/bin/python"
+$PYTHON -m pip install --upgrade pip
 sudo yum install -y ansible
 
 git clone https://github.com/dfarrell07/ansible-opendaylight.git
index 8e1ef5c232e338cd714845a5fed8fd97f60c2918..27449427ceb5b96044fa60d6b87055f24df3e629 100644 (file)
@@ -10,8 +10,6 @@
       - 'packaging-build-deb-{stream}'
       - 'packaging-test-rpm-{stream}'
       - 'packaging-test-deb-{stream}'
-      - 'packaging-test-ansible-rpm-{stream}'
-      - 'packaging-test-ansible-deb-{stream}'
 
     project: 'integration/packaging'
 
@@ -67,6 +65,8 @@
     publishers:
       - archive-artifacts:
           artifacts: '**/*.rpm'
+      - lf-infra-publish
+
 
 - job-template:
     name: 'packaging-build-rpm-snap-{stream}'
@@ -88,7 +88,7 @@
           artifacts: '{archive-artifacts}'
       - string:
           name: VERSION_MAJOR
-          default: '6'
+          default: '7'
           description: 'OpenDaylight major (element) version number to build'
       - string:
           name: VERSION_MINOR
     builders:
       - shell: !include-raw: include-raw-build-rpm-snap.sh
 
+    triggers:
+      - timed: '@daily'
+
     publishers:
       - archive-artifacts:
           artifacts: '**/*.rpm'
+      - lf-infra-publish
 
-    triggers:
-      - timed: '@daily'
 
 - job-template:
     name: 'packaging-test-rpm-{stream}'
     publishers:
       - archive-artifacts:
           artifacts: '**'
+      - lf-infra-publish
+
 
 - job-template:
     name: 'packaging-test-deb-{stream}'
     publishers:
       - archive-artifacts:
           artifacts: '**'
-
-- job-template:
-    name: 'packaging-test-ansible-rpm-{stream}'
-
-    node: centos7-java-builder-2c-4g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell: !include-raw: include-raw-test-ansible-rpm.sh
-
-    triggers:
-      - timed: '@daily'
-
+      - lf-infra-publish
 
 - job-template:
     name: 'packaging-build-deb-{stream}'
 
-    node: ubuntu1404-mininet-2c-2g
+    node: ubuntu1604-mininet-ovs-25-2c-4g
 
     project-type: freestyle
 
     publishers:
       - archive-artifacts:
           artifacts: 'packaging/deb/opendaylight/*.deb'
-
-
-- job-template:
-    name: 'packaging-test-ansible-deb-{stream}'
-
-    node: ubuntu1604-mininet-ovs-25-2c-4g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'packaging'
-          refspec: '$GERRIT_REFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - shell: !include-raw: include-raw-test-ansible-deb.sh
-
-    triggers:
-      - timed: '@daily'
+      - lf-infra-publish
index 5f5e046bce449286a38958a4974f6db8fd806bf6..5d82cf063bb5554ac0d43d1fbbc83eb8d495a2c6 100644 (file)
@@ -5,17 +5,21 @@
 
     jobs:
       - '{project-name}-verify-tox-{stream}'
-      - 'puppet-test-sanity-{stream}'
-      - 'puppet-test-full-{stream}'
+      - '{project-name}-test-sanity-{stream}'
+      - '{project-name}-test-full-{stream}'
 
     project: 'integration/packaging/puppet-opendaylight'
 
     stream:
       - master:
           branch: 'master'
+      - carbon:
+          branch: 'stable/carbon'
+      - boron:
+          branch: 'stable/boron'
 
 - job-template:
-    name: 'puppet-test-sanity-{stream}'
+    name: '{project-name}-test-sanity-{stream}'
 
     node: centos7-docker-2c-4g
 
           branch: '{branch}'
           files: '**'
 
+    publishers:
+      - lf-infra-publish
+
 - job-template:
-    name: 'puppet-test-full-{stream}'
+    name: '{project-name}-test-full-{stream}'
 
     node: centos7-docker-2c-4g
 
             failed: true
             unstable: true
             notbuilt: true
+
+    publishers:
+      - lf-infra-publish
index e6941bf99e022a22585c6fd0210cd439fe4b2360..488e148568f3357852b9117db2a5b8e8cc777aea 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 4157f74d39e507b2e184aa36ebd24954d9a42a86..ed449e6d5be17b8a8ed83ec1e5c25dffe5821113 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[packetcable]'
     archive-artifacts: ''
 
-- project:
-    name: packetcable-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
-    archive-artifacts: ''
-
 - project:
     name: packetcable-sonar
     jobs:
index c84352ed9ec79406870c48a7727e68187f845d07..06ba70a8a7ab486253ff9c9dcc55e602d1f36d4c 100644 (file)
     email-upstream: '[persistence]'
     archive-artifacts: ''
 
-- project:
-    name: persistence-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[persistence]'
-    archive-artifacts: ''
-
 - project:
     name: persistence-sonar
     jobs:
index 54ae11bbc300de0e67b4a5337c38650d0b74bb10..a558877bdc894cd094eb873630ff6447fc003299 100644 (file)
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
     docker_system_flavor: 4 GB General Purpose v1
-    docker_system_image: CentOS 7 - docker - 20170120-1434
+    docker_system_image: CentOS 7 - docker - 20170609-0220
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170311-0517
+    odl_system_image: CentOS 7 - java-builder - 20170609-0259
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
-    openstack_system_image: CentOS 7 - devstack - 20170221-1719
+    openstack_system_image: CentOS 7 - devstack - 20170609-0220
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439
+    tools_system_image: Ubuntu 14.04 - mininet - 20170609-0220
 
     # Default Robot framework options
     robot-options: ''
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
-        distribution4-deploy-carbon,
-        distribution4-offline-carbon,
         openflowplugin-csit-1node-periodic-longevity-only-carbon
     csit-weekly-list-boron: >
         distribution-deploy-boron,
     # CSIT Test List Variables
     # Space seperated strings to exclude from
     # auto generated CSIT job lists
-    csit-list-blacklist: 'longevity gate sanity daexim'
+    csit-list-blacklist: 'longevity gate sanity daexim jsonrpc'
 
     # Auto Generated CSIT job lists used
     # in regular distribution test jobs
         didm-csit-1node-discovery-only-nitrogen,
         distribution-csit-1node-userfeatures-all-nitrogen,
         distribution-csit-1node-userfeatures-only-nitrogen,
-        distribution-csit4-1node-userfeatures-all-nitrogen,
-        distribution-csit4-1node-userfeatures-only-nitrogen,
         dluxapps-csit-1node-yangman-all-nitrogen,
         dluxapps-csit-1node-yangman-only-nitrogen,
         genius-csit-1node-upstream-all-nitrogen,
         vtn-csit-1node-openstack-newton-neutron-boron,
         vtn-csit-3node-manager-all-boron,
         vtn-csit-3node-manager-only-boron
-    csit-list-beryllium: >
-        aaa-csit-1node-authn-all-beryllium,
-        aaa-csit-1node-authn-only-beryllium,
-        aaa-csit-1node-idmlite-all-beryllium,
-        aaa-csit-1node-idmlite-only-beryllium,
-        alto-csit-1node-setup-all-beryllium,
-        alto-csit-1node-setup-only-beryllium,
-        bgpcep-csit-1node-periodic-bgp-ingest-all-beryllium,
-        bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-beryllium,
-        bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-beryllium,
-        bgpcep-csit-1node-periodic-bgp-ingest-only-beryllium,
-        bgpcep-csit-1node-periodic-throughpcep-all-beryllium,
-        bgpcep-csit-1node-periodic-throughpcep-only-beryllium,
-        bgpcep-csit-1node-userfeatures-all-beryllium,
-        bgpcep-csit-1node-userfeatures-only-beryllium,
-        bgpcep-csit-3node-periodic-bgpclustering-all-beryllium,
-        bgpcep-csit-3node-periodic-bgpclustering-only-beryllium,
-        capwap-csit-1node-ac-all-beryllium,
-        capwap-csit-1node-ac-only-beryllium,
-        centinel-csit-1node-basic-all-beryllium,
-        centinel-csit-1node-basic-only-beryllium,
-        controller-csit-1node-akka1-all-beryllium,
-        controller-csit-1node-akka1-only-beryllium,
-        controller-csit-1node-periodic-benchmark-all-beryllium,
-        controller-csit-1node-periodic-benchmark-only-beryllium,
-        controller-csit-1node-rest-cars-perf-all-beryllium,
-        controller-csit-1node-rest-cars-perf-only-beryllium,
-        controller-csit-3node-clustering-all-beryllium,
-        controller-csit-3node-clustering-only-beryllium,
-        controller-csit-3node-periodic-benchmark-all-beryllium,
-        controller-csit-3node-periodic-benchmark-only-beryllium,
-        controller-csit-3node-rest-clust-cars-perf-only-beryllium,
-        didm-csit-1node-discovery-only-beryllium,
-        distribution-csit-1node-userfeatures-all-beryllium,
-        distribution-csit-1node-userfeatures-only-beryllium,
-        groupbasedpolicy-csit-1node-3-node-all-beryllium,
-        groupbasedpolicy-csit-1node-3-node-only-beryllium,
-        groupbasedpolicy-csit-1node-6node-all-beryllium,
-        groupbasedpolicy-csit-1node-6node-only-beryllium,
-        groupbasedpolicy-csit-1node-openstack-newton-openstack-beryllium,
-        groupbasedpolicy-csit-3node-clustering-all-beryllium,
-        groupbasedpolicy-csit-3node-clustering-only-beryllium,
-        l2switch-csit-1node-periodic-host-scalability-daily-only-beryllium,
-        l2switch-csit-1node-scalability-all-beryllium,
-        l2switch-csit-1node-scalability-only-beryllium,
-        l2switch-csit-1node-switch-all-beryllium,
-        l2switch-csit-1node-switch-only-beryllium,
-        lacp-csit-1node-lacp-all-beryllium,
-        lacp-csit-1node-lacp-only-beryllium,
-        lispflowmapping-csit-1node-msmr-all-beryllium,
-        lispflowmapping-csit-1node-msmr-only-beryllium,
-        lispflowmapping-csit-1node-performance-only-beryllium,
-        lispflowmapping-csit-3node-msmr-all-beryllium,
-        lispflowmapping-csit-3node-msmr-only-beryllium,
-        mdsal-csit-1node-periodic-bindingv1-only-beryllium,
-        messaging4transport-csit-1node-basic-all-beryllium,
-        messaging4transport-csit-1node-basic-only-beryllium,
-        nemo-csit-1node-engine-all-beryllium,
-        nemo-csit-1node-engine-only-beryllium,
-        netconf-csit-1node-periodic-scale-all-beryllium,
-        netconf-csit-1node-periodic-scale-only-beryllium,
-        netconf-csit-1node-userfeatures-all-beryllium,
-        netconf-csit-1node-userfeatures-only-beryllium,
-        netconf-csit-3node-clustering-all-beryllium,
-        netconf-csit-3node-clustering-only-beryllium,
-        netconf-csit-3node-periodic-clustering-scale-all-beryllium,
-        netconf-csit-3node-periodic-clustering-scale-only-beryllium,
-        netide-csit-1node-basic-all-beryllium,
-        netide-csit-1node-basic-only-beryllium,
-        netvirt-legacy-csit-1node-openstack-basic-all-beryllium,
-        netvirt-legacy-csit-1node-openstack-basic-only-beryllium,
-        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-beryllium,
-        netvirt-legacy-csit-1node-openstack-newton-upstream-beryllium,
-        netvirt-legacy-csit-1node-openstack-ocata-upstream-beryllium,
-        netvirt-legacy-csit-3node-clustering-only-beryllium,
-        netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-beryllium,
-        netvirt-legacy-csit-3node-openstack-newton-upstream-beryllium,
-        netvirt-legacy-csit-3node-openstack-ocata-upstream-beryllium,
-        nic-csit-1node-basic-all-beryllium,
-        nic-csit-1node-basic-only-beryllium,
-        nic-csit-1node-vtnrenderer-all-beryllium,
-        nic-csit-1node-vtnrenderer-only-beryllium,
-        of-config-csit-1node-basic-all-beryllium,
-        of-config-csit-1node-basic-only-beryllium,
-        openflowplugin-csit-1node-flow-services-all-beryllium,
-        openflowplugin-csit-1node-flow-services-only-beryllium,
-        openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-beryllium,
-        openflowplugin-csit-1node-periodic-cbench-daily-only-beryllium,
-        openflowplugin-csit-1node-periodic-link-scalability-daily-only-beryllium,
-        openflowplugin-csit-1node-periodic-restconf-perf-daily-only-beryllium,
-        openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-beryllium,
-        openflowplugin-csit-1node-periodic-sw-scalability-daily-only-beryllium,
-        openflowplugin-csit-1node-scalability-only-beryllium,
-        openflowplugin-csit-3node-clustering-only-beryllium,
-        openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-beryllium,
-        openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-beryllium,
-        openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-beryllium,
-        ovsdb-csit-1node-upstream-southbound-all-beryllium,
-        ovsdb-csit-1node-upstream-southbound-only-beryllium,
-        ovsdb-csit-3node-upstream-clustering-only-beryllium,
-        packetcable-csit-1node-pcmm-all-beryllium,
-        packetcable-csit-1node-pcmm-only-beryllium,
-        sdninterfaceapp-csit-1node-basic-only-beryllium,
-        sfc-csit-3node-rest-basic-all-beryllium,
-        sfc-csit-3node-rest-basic-only-beryllium,
-        snmp-csit-1node-basic-all-beryllium,
-        snmp-csit-1node-basic-only-beryllium,
-        sxp-csit-1node-basic-all-beryllium,
-        sxp-csit-1node-basic-only-beryllium,
-        sxp-csit-1node-filtering-all-beryllium,
-        sxp-csit-1node-filtering-only-beryllium,
-        sxp-csit-1node-topology-all-beryllium,
-        sxp-csit-1node-topology-only-beryllium,
-        topoprocessing-csit-1node-topology-operations-all-beryllium,
-        topoprocessing-csit-1node-topology-operations-only-beryllium,
-        tsdr-csit-1node-cassandra-datastore-only-beryllium,
-        tsdr-csit-1node-hbase-datastore-all-beryllium,
-        tsdr-csit-1node-hbase-datastore-only-beryllium,
-        tsdr-csit-1node-hsqldb-datastore-all-beryllium,
-        tsdr-csit-1node-hsqldb-datastore-only-beryllium,
-        unimgr-csit-1node-basic-all-beryllium,
-        unimgr-csit-1node-basic-only-beryllium,
-        usc-csit-1node-channel-all-beryllium,
-        usc-csit-1node-channel-only-beryllium,
-        usc-csit-1node-tcp-all-beryllium,
-        usc-csit-1node-tcp-only-beryllium,
-        usc-csit-1node-udp-all-beryllium,
-        usc-csit-1node-udp-only-beryllium,
-        usecplugin-csit-1node-basic-all-beryllium,
-        usecplugin-csit-1node-basic-only-beryllium,
-        vtn-csit-1node-coordinator-only-beryllium,
-        vtn-csit-1node-manager-all-beryllium,
-        vtn-csit-1node-manager-only-beryllium,
-        vtn-csit-1node-openstack-newton-neutron-beryllium
 # CSIT TESTS END SED MARKER
index e139fc0749fc612b3c2dbdd2a1fc94c60bff4479..caf99a049504cbff695f77928976d7bfd766de8e 100644 (file)
@@ -5,15 +5,36 @@
       - '{project-name}-ci-jobs'
       - '{project-name}-verify-tox-{stream}'
       - 'builder-check-poms'
-      - 'builder-verify-packer'
-      - 'builder-merge-packer-{platforms}-{templates}'
       # OpenStack Related
       - 'builder-cleanup-old-images'
+      - 'builder-delete-stale-nodes'
       - 'builder-delete-stale-stacks'
       # Automation for docs and jobs
       - 'builder-update-csit-tests'
       - 'builder-update-image-list'
 
+    # The following values are only specified here
+    # so that code blocks look similar to other projects.
+    project: 'releng/builder'
+    project-name: builder
+    stream: master
+    branch: master
+    build-node: centos7-java-builder-2c-4g
+    archive-artifacts: '**/*.log'
+    build-timeout: 10
+
+- project:
+    name: builder-packer-jobs
+    jobs:
+      - 'builder-merge-packer-{platforms}-{templates}'
+      - 'builder-verify-packer'
+
+    project: 'releng/builder'
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+    build-timeout: 90
+
     platforms:
       - centos
       - ubuntu-14.04
@@ -22,6 +43,7 @@
     templates:
       - devstack
       - devstack-pre-pip-newton
+      - devstack-pre-pip-ocata
       - docker
       - gbp
       - java-builder
@@ -42,6 +64,8 @@
         templates: robot
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-newton
+      - platforms: ubuntu-14.04
+        templates: devstack-pre-pip-ocata
       - platforms: ubuntu-14.04
         templates: devstack
       - platforms: ubuntu-14.04
@@ -54,6 +78,8 @@
         templates: robot
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-newton
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-ocata
       - platforms: ubuntu-16.04
         templates: devstack
       - platforms: ubuntu-16.04
         templates: mininet
       - platforms: ubuntu-16.04
         templates: gbp
+      - platforms: ubuntu-16.04
+        templates: baseline
+      - platforms: centos
+        templates: baseline
 
 
-    project-type: freestyle
-    archive-artifacts: '**/*.log'
-    build-timeout: '60'
-
-    # The following values are only specified here
-    # so that code blocks look similar to other projects.
-    project: 'releng/builder'
-    project-name: builder
-    stream: master
-    branch: master
-    build-node: centos7-java-builder-2c-4g
-
 - job-template:
     name: builder-check-poms
     node: centos7-java-builder-2c-4g
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
+
 
 - job-template:
-    name: 'builder-delete-stale-stacks'
+    name: 'builder-cleanup-old-images'
     project-type: freestyle
     node: centos7-java-builder-2c-4g
 
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
 
+    scm:
+      - git-scm:
+          branch: '{branch}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
+      # Listed after to override openstack-infra-wrappers clouds.yaml definition
+      - config-file-provider:
+          files:
+            - file-id: opendaylight-private-clouds-yaml
+              target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
-      - timed: '0,30 * * * *'
+      # Cleanup images on a weekly schedule
+      - timed: '@weekly'
 
     builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh
+      - shell: !include-raw-escape:
+          - global-jjb/shell/lftools-install.sh
+          - opendaylight-infra-cleanup-old-images.sh
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
+
 
 - job-template:
-    name: 'builder-cleanup-old-images'
+    name: 'builder-delete-stale-nodes'
     project-type: freestyle
     node: centos7-java-builder-2c-4g
 
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
 
-    scm:
-      - git-scm:
-          branch: '{branch}'
-
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
-      # Listed after to override openstack-infra-wrappers clouds.yaml definition
-      - config-file-provider:
-          files:
-            - file-id: opendaylight-private-clouds-yaml
-              target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Cleanup images on a weekly schedule
-      - timed: '@weekly'
+      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
+      - timed: '0,30 * * * *'
 
     builders:
       - shell: !include-raw-escape:
           - global-jjb/shell/lftools-install.sh
-          - opendaylight-infra-cleanup-old-images.sh
+          - opendaylight-infra-cleanup-stale-nodes.sh
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
+
+
+- job-template:
+    name: 'builder-delete-stale-stacks'
+    project-type: freestyle
+    node: centos7-java-builder-2c-4g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
+      - timed: '0,30 * * * *'
+
+    builders:
+      - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - lf-infra-publish
+
 
 - job-template:
     name: 'builder-update-image-list'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-verify-packer'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-merge-packer-{platforms}-{templates}'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: 'builder-update-csit-tests'
           search_string: "csit"
           stream: "boron"
           jobs-filename: "csit_jobs_boron.lst"
-      - integration-list-jobs:
-          blacklist: '{csit-list-blacklist}'
-          search_string: "csit"
-          stream: "beryllium"
-          jobs-filename: "csit_jobs_beryllium.lst"
       - integration-replace-block-text:
           starting-regex: "'csit-list-nitrogen: >'"
           ending-regex: "'csit-list-carbon: >'"
           file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text:
           starting-regex: "'csit-list-boron: >'"
-          ending-regex: "'csit-list-beryllium: >'"
-          file-with-changes-to-insert: "'csit_jobs_boron.lst'"
-          file-to-change: "'jjb/releng-defaults.yaml'"
-      - integration-replace-block-text:
-          starting-regex: "'csit-list-beryllium: >'"
           ending-regex: "'# CSIT TESTS END SED MARKER'"
-          file-with-changes-to-insert: "'csit_jobs_beryllium.lst'"
+          file-with-changes-to-insert: "'csit_jobs_boron.lst'"
           file-to-change: "'jjb/releng-defaults.yaml'"
       - shell: |
           git status
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index f7d78e20b77fd6311fc20fbd1b9bc5d88ee43bdb..4732423d7c8cf72185644ec2e08c8d3bbd5be3a7 100644 (file)
@@ -76,7 +76,8 @@
       - string:
           name: PATCHES_TO_BUILD
           default: ''
-          description: 'csv list of patches in project:changeset format to build distribution with'
+          description: |
+            Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)
 
 - parameter:
     name: run-test-parameter
                 healthy: 50
                 unhealthy: 40
 
-- publisher:
-    name: opendaylight-infra-shiplogs
-    # To archive things the job will need to create a "archives" directory in
-    # the workspace and this macro will handle copying the contents of the
-    # archives directory.
-    #
-    # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files
-    # to archive. You can pass globstar patterns for example "**/*.xml **/*.log"
-    # as the archive pattern. This is a space separated list of files to archive.
-    #
-    # Also ensure that the workspace is cleaned up at the end of the build.
-    publishers:
-      - postbuildscript:
-          builders:
-            - shell: !include-raw: include-raw-stack-delete.sh
-            - shell: !include-raw-escape: include-raw-deploy-archives.sh
-            - maven-target:
-                maven-version: '{maven-version}'
-                pom: '.archives/deploy-archives.xml'
-                goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
-                settings: 'jenkins-log-archives-settings'
-                settings-type: cfp
-                global-settings: 'odl-global-settings'
-                global-settings-type: cfp
-            - description-setter:
-                regexp: '^Build logs: .*'
-            # Cleanup after ourselves
-            - wipe-org-opendaylight-repo
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - workspace-cleanup:
-          exclude:
-            # Do not clean up *.jenkins-trigger files for jobs that use a
-            # properties file as input for triggering another build.
-            - '**/*.jenkins-trigger'
-          fail-build: false
-
 - builder:
     name: opendaylight-infra-stack
     # opendaylight-infra-stack.sh has a required variable {stack-template} that
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
     builders:
-      - shell: 'echo "$BUILD_URL" > {path}/build.url'
+      - shell: |
+          #!/bin/bash
+          set +e  # DO NOT fail script if command returns non-zero.
+
+          echo "$BUILD_URL" > {path}/build.url
+
+          # DO NOT fail the build if the echo failed.
+          exit 0
 
 - builder:
     name: wipe-org-opendaylight-repo
                   fi
               done
           done
-          for p in $provision; do
-              /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
-          done
-
 
 - builder:
     name: packer-build
           export PACKER_LOG_PATH="packer-build.log" && \
                       packer.io build -color=false -var-file=$CLOUDENV \
                        -var-file=../packer/vars/{platform}.json \
-                       -parallel=false \
                        ../packer/templates/{template}.json
 
 - builder:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
index 80783eaa287c1143d882bce5f7d8d5f1d263c2ef..ee30c6ba9be8e697b57efb216f70d366eb21891e 100644 (file)
@@ -39,7 +39,7 @@
 
     builders:
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
@@ -52,7 +52,7 @@
             - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
       - check-clm:
@@ -62,8 +62,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-integration-{stream}'
     builders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
           email-prefix: '{email-upstream}'
       - findbugs
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-merge-{stream}'
     prebuilders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
       maven-opts: '{mvn-opts}'
       settings: '{mvn-settings}'
       settings-type: cfp
-      global-settings: 'odl-global-settings'
+      global-settings: 'global-settings'
       global-settings-type: cfp
       post-step-run-condition: UNSTABLE
 
                   - '-Xmx2g'
                 settings: '{mvn-settings}'
                 settings-type: cfp
-                global-settings: 'odl-global-settings'
+                global-settings: 'global-settings'
                 global-settings-type: cfp
             - maven-target:
                 maven-version: 'mvn33'
                   - '-Xmx2g'
                 settings: '{mvn-settings}'
                 settings-type: cfp
-                global-settings: 'odl-global-settings'
+                global-settings: 'global-settings'
                 global-settings-type: cfp
 
     reporters:
           unique-version: true
           deploy-unstable: false
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
       - trigger:
           project: 'distribution-merge-{stream}'
           threshold: SUCCESS
     builders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
           email-prefix: '[{project-name}]'
       - jacoco-report
       - findbugs
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
             - '-Xmx8g'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[autorelease] [{project-name}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
     builders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: '{mvn-version}'
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: '{mvn-version}'
+      - lf-infra-publish
index e1ba3f8c6e8dc146d2374bf98a7db4215b0ce620..422c8690dace1a0968c83c4254542b4c8bad98e2 100644 (file)
@@ -42,7 +42,7 @@
       - wipe-org-opendaylight-repo
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'autorelease-settings'
       - maven-target:
           maven-version: 'mvn33'
@@ -57,7 +57,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-stage-release
 
@@ -65,8 +65,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 
 - job-template:
@@ -97,7 +96,7 @@
       - releng-fetch-p2zip-if-necessary:
           maven-version: 'mvn33'
           settings: '{mvn-settings}'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
       - releng-generate-p2pom
       - maven-target:
           maven-version: 'mvn33'
           goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-update-p2composite-metadata:
           maven-version: 'mvn33'
           settings: '{mvn-settings}'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 # Generic tox-based verify action
 
       - shell: |
           virtualenv $WORKSPACE/venv-tox
           source $WORKSPACE/venv-tox/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade tox argparse
-          pip freeze
+          PYTHON="$WORKSPACE/venv-tox/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install --upgrade tox argparse
+          $PYTHON -m pip freeze
           cd $WORKSPACE/repo/{toxdir}
           tox
 
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-verify-tox-{stream}'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 # Node related
 
           # Prepare Python
           virtualenv $WORKSPACE/venv-python
           source $WORKSPACE/venv-python/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade tox argparse nodeenv
-          pip freeze
+          PYTHON="$WORKSPACE/venv-python/bin/python"
+          $PYTHON -m pip install --upgrade pip
+          $PYTHON -m pip install --upgrade tox argparse nodeenv
+          $PYTHON -m pip freeze
 
           # Prepare node
           nodeenv --node={nodever} --prebuilt $WORKSPACE/venv-node
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
index 37e2e66a0b7a9abd9faa9acf180c6e53c5f0efed..a846568d8cd92124ec9bdf406a80488733cdc0aa 100644 (file)
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
-- project:
-    name: reservation-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[reservation]'
-    archive-artifacts: ''
-
 - project:
     name: reservation-sonar
     jobs:
index 8b31738bfa50ae14eace5fb8a55895d7249b384c..2afb1f5a93d0b1e34d0fab957480320d43a21fea 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 73ef1eed08880ce53485f1793fa0cb74eea0a092..fe73b3e3cd835ac09967c6b8d4935a6edf9415bd 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[sdninterfaceapp] [bgpcep]'
     archive-artifacts: ''
 
-- project:
-    name: sdninterfaceapp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
-
 - project:
     name: sdninterfaceapp-sonar
     jobs:
index f6c8678c39ceadbea75bdd6bdcc299d2f8c9bb41..2575427cba9e081a59428f69f9c8dbbcc22a3e37 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index ee2489e762cba06f221de852e310e298bb459f88..55c44345176900522502737e0b01ef07d5c12328 100644 (file)
@@ -14,8 +14,6 @@
           branch: 'stable/carbon'
       - boron:
           branch: 'stable/boron'
-      - beryllium:
-          branch: 'stable/beryllium'
 
     project: 'sfc'
 
@@ -66,7 +64,8 @@
       - shell: |
           virtualenv $WORKSPACE/venv-tox
           source $WORKSPACE/venv-tox/bin/activate
-          pip install tox argparse
+          PYTHON="$WORKSPACE/venv-tox/bin/python"
+          $PYTHON -m pip install tox argparse
           tox --version
           cd $WORKSPACE/sfc-py
           tox
index 2c32dfe76eb87b053abf885cd601ec3e3eb954f7..0a4baa87fe5b51567798344cf84ec04f644f3120 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
 
-- project:
-    name: sfc-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-
 - project:
     name: sfc-sonar
     jobs:
index 13ca70d9c37d06c160ea06d98e807923b8beb37e..01bcf83ed6f4f33d648055f74cbe03efa7b3095d 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[snbi]'
     archive-artifacts: ''
 
-
-- project:
-    name: snbi-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-    archive-artifacts: ''
-
 - project:
     name: snbi-sonar
     jobs:
index 720213d7ba6d707b6450ba061a0499508c311168..cf6c2e9a41c66675dab13741c1dbacaa93c35f4f 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 44ddc07f249e9a1fe3387f448a172daa473d7987..49917a3374be08d3644fb4dde71da1f7d8b43eff 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[snmp] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: snmp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: snmp-sonar
     jobs:
index 3cf225219fcbc433a5351b8dd3ab13a74653fa72..7c03df5c1ef8d7f5ec3be6d1aef1daae4a408e2b 100644 (file)
@@ -4,11 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      # remove nitrogen validate job until SNMP4SDN is back in nitrogen
-      # - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: snmp4sdn-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: snmp4sdn-sonar
     jobs:
index b1bf0c530c95993144f08b94f076691c17a8602a..3851b864ae7fba7555048c60b5725a4dd7db4a8b 100644 (file)
@@ -41,6 +41,7 @@
           server-name: '{server-name}'
           name: 'spectrometer'
           branch: 'master'
+      - timed: 'H H * * 1'
 
     builders:
       - shell: |
           if [ -e venv-python34/bin/activate ]; then
               echo "---> Updating Python dependencies"
               source venv-python34/bin/activate
+              PYTHON="venv-python34/bin/python"
           else
               echo "---> virtualenv not found. Setting up new virtualenv."
               pyvenv venv-python34 --without-pip
               source venv-python34/bin/activate
+              PYTHON="venv-python34/bin/python"
               wget https://bootstrap.pypa.io/get-pip.py
               python get-pip.py
-              pip install -e spectrometer/server
+              $PYTHON -m pip install -e spectrometer/server
           fi
-          pip install --upgrade -r spectrometer/server/requirements.txt
-          pip install --upgrade gunicorn gevent
-          pip install --upgrade nodeenv
-          pip freeze
+          $PYTHON -m pip install --upgrade -r spectrometer/server/requirements.txt
+          $PYTHON -m pip install --upgrade gunicorn gevent
+          $PYTHON -m pip install --upgrade nodeenv
+          $PYTHON -m pip freeze
 
           echo "---> Setup NodeJS"
           if [ -e venv-nodejs/bin/activate ]; then
index 8429fcdffe91a2309e9c49010d8dd7c1f039b9b9..b674e0651299db13eacdbe7dc6c0872a7c7ba228 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 4d58157cf5033378dfcc2fb35c89061491707522..ece9b88b2d872c0427051031aabe92a4be384310 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 25edbef3abdb8c3182126de46c2a364ce3985d54..6448938d6fe38f8330657d6950d036722bb2c0ac 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 32152e1dddd66d203171512ac2f04895eb3e2686..53970cbd396e75a48238fe25cd54b833e94cedab 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: sxp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: sxp-sonar
     jobs:
diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
deleted file mode 100644 (file)
index cd2bb78..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
----
-- project:
-    name: tcpmd5-nitrogen
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: nitrogen
-    project: 'tcpmd5'
-    project-name: 'tcpmd5'
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'tcpmd5-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
-- project:
-    name: tcpmd5-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'tcpmd5'
-    project-name: 'tcpmd5'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'tcpmd5-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
-- project:
-    name: tcpmd5-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'tcpmd5'
-    project-name: 'tcpmd5'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'tcpmd5-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
-- project:
-    name: tcpmd5-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'tcpmd5'
-    project-name: 'tcpmd5'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'tcpmd5-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
-- project:
-    name: tcpmd5-sonar
-    jobs:
-      - '{project-name}-sonar'
-    project: 'tcpmd5'
-    project-name: 'tcpmd5'
-    branch: 'master'
-    mvn-settings: 'tcpmd5-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index d8a8881f225a32a6f7f7e832dafe8ee890de9ce2..0485111cad0deee85c45f23020b468580b376e61 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 7ac5137e08155d3120ff422687d27c37396a14f5..e083fda07d88bb9cc7e3669d745092fbc721322d 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-
-- project:
-    name: topoprocessing-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
 - project:
     name: topoprocessing-sonar
     jobs:
index 99c9dc322bd215b5fa373757e9b549709947cafa..ec117395302dca6be5636401cfbacc05540ff07f 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index bb99a172a347b3b899464a847a8c432511edfa24..325c3420c966c569783219f947007a7dd6db8468 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 401c1e09f9758738bd272c4c3af12a8d6eac956e..7300d3a0d3383cbd2a801ce8dbffc9be06590cfb 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index b8e5cd3c8a02cd96112f609407742494a3524a80..f90dfd8ee376e8deeb3e2dbe6634571ebd4c4698 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
-- project:
-    name: tsdr-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
-    archive-artifacts: ''
-
 - project:
     name: tsdr-sonar
     jobs:
index 5a9d13f93138e3d7357f9a7303b1ad7a2aa93c79..e2435af9f3c043fdf9e9ba5ccf0f6dc38eb47d31 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[ttp] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: ttp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: ttp-sonar
     jobs:
index 8a5067f273b16018e28fc87746a90a097289ff48..e80aee0b93b11c3faf988f289b7a267e9db8b95c 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 214c62042cb99cef545e50f4c5e49c1524ad45e4..8d7396b89bf4d5580690a2593d398603b3323151 100644 (file)
@@ -41,4 +41,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
index bf9b84e9b8f6364ceff96e5fbf45ca822329e9c9..af3b5ba1a36be467c4eb3cd60c0d11eeb5576152 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      # - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
 
-
-- project:
-    name: unimgr-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-        - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
-
 - project:
     name: unimgr-sonar
     jobs:
index 402b071b47bfe7f2bd8f943fdf866c763121b506..8679bab957923e5acb9bb253d6e0df100c7a9ce4 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 675c3b6d051cf8af01f29fbd2f414e6b593ae328..fab1687273627e2c331aea319ca519c64032795d 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index b827b37005ee47937d216a5fdb88d740973351ac..b6af34d0330b40804174cf89c44efe8d587c31c9 100644 (file)
           branch: 'master'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 7798961f115a961b266d3940248182d39c395166..cb766b8a8a701c2ab6998bcdf59dac4a90bcddd3 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: usc-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: usc-sonar
     jobs:
index c13bbf62c330c9fd3d0fe2b71adf77c16104f790..3fbd3ebac12ed656e81d5110bdc3674339306b72 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
index 67ce4ac85131fb448d1b6f90f6424bb0c795a0d0..68a997c37e2224e3b645c1194515a3c09911c750 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[usecplugin] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: usecplugin-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-        - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
-
 - project:
     name: usecplugin-sonar
     jobs:
diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
deleted file mode 100644 (file)
index debef1f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: vpnservice-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'vpnservice'
-    project-name: 'vpnservice'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-        - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'vpnservice-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[vpnservice] [openflowplugin] [neutron]'
-    archive-artifacts: ''
index 1e7185d5e06260b5bbf8bea8376af447f3abfcb9..9196216b8aa2f8ddb7b95dd426d9022783b4a150 100644 (file)
@@ -37,4 +37,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221'
index f1ba019d082c87bf2ccf8caa09a8e491ccfaf015..838cf6faf997a45fa0fcdf89a3283ff09fe13dd6 100644 (file)
           branch: 'stable/carbon'
           jre: 'openjdk8'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 
     install:
       - only:
index b2b0482889cfe11d4edd90febe26d630b175170d..c3c2c64625963ddd64dfdd0d715f57be135446c5 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439
 
     install:
       - only:
@@ -42,4 +37,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
index e6fdab106d97dab09fc4d30c1b4fe2bf49666d71..4c5ee0c212e68cc2ce74edf34feb1c45ebc692ca 100644 (file)
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     openstack:
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
 
     schedule: ''
 
index bf46dcc81f852b1cfeb4a0a48c1bd520914cb887..61e48d628a4a83749cd2a86d8a9e1dfba7d3d3b1 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
-- project:
-    name: vtn-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
-
-    # Please do not archive maven sites!!!
-    # Maven sites are published to Nexus at:
-    # https://nexus.opendaylight.org/content/sites/site/
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
-
 - project:
     name: vtn-sonar
     jobs:
index d839cb7b9275b863e2e6c1f0aa2d648fa7842dc7..b8ddd851c7d2c9e3a8f9615d07d1aa355a6a09f3 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
-- project:
-    name: yang-push-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[yang-push]'
-    archive-artifacts: ''
-
 - project:
     name: yang-push-sonar
     jobs:
index 4aeeea1478272594db0a067bb1178f70e02842d5..7a44277af1c1b51e664a48f8cc4010b61b52e09e 100644 (file)
@@ -4,7 +4,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: yangtools-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn32:
-          mvn-version: 'mvn32'
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: yangtools-sonar
     jobs:
index 5a97699467aab83610b1021ff219886edaee0f4d..e5f727f5a4e57eb6c08a0aadae892e42edb972a6 100644 (file)
@@ -5,6 +5,41 @@
 # force any errors to cause the script and job to end in failure
 set -xeu -o pipefail
 
+enable_service() {
+    # Enable services for Ubuntu instances
+    services=($@)
+
+    for service in "${services[@]}"; do
+        echo "---> Enable service: $service"
+        FACTER_OS=$(/usr/bin/facter operatingsystem)
+        FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
+        if [ "$FACTER_OS" == "CentOS" ]; then
+            systemctl enable "$service"
+            systemctl start "$service"
+            systemctl status "$service"
+        elif [ "$FACTER_OS" == "Ubuntu" ]; then
+            case "$FACTER_OSVER" in
+                14.04)
+                    service "$service" start
+                    service "$service" status
+                ;;
+                16.04)
+                    systemctl enable "$service"
+                    systemctl start "$service"
+                    systemctl status "$service"
+                ;;
+                *)
+                    echo "---> Unknown Ubuntu version $FACTER_OSVER"
+                    exit 1
+                ;;
+            esac
+        else
+            echo "---> Unknown OS $FACTER_OS"
+            exit 1
+        fi
+    done
+}
+
 ensure_kernel_install() {
     # Workaround for mkinitrd failing on occassion.
     # On CentOS 7 it seems like the kernel install can fail it's mkinitrd
@@ -32,6 +67,30 @@ ensure_kernel_install() {
     fi
 }
 
+ensure_ubuntu_install() {
+    # Workaround for mirrors occassionally failing to install a package.
+    # On Ubuntu sometimes the mirrors fail to install a package. This wrapper
+    # checks that a package is successfully installed before moving on.
+
+    packages=($@)
+
+    for pkg in "${packages[@]}"
+    do
+        # Retry installing package 5 times if necessary
+        for i in {0..5}
+        do
+            if [ "$(dpkg-query -W -f='${Status}' "$pkg" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; then
+                apt-cache policy "$pkg"
+                apt-get install "$pkg"
+                continue
+            else
+                echo "$pkg already installed."
+                break
+            fi
+        done
+    done
+}
+
 rh_systems() {
     # Handle the occurance where SELINUX is actually disabled
     SELINUX=$(grep -E '^SELINUX=(disabled|permissive|enforcing)$' /etc/selinux/config)
@@ -87,7 +146,7 @@ EOF
     # separate group installs from package installs since a non-existing
     # group with dnf based systems (F21+) will fail the install if such
     # a group does not exist
-    yum install -y unzip xz puppet git git-review perl-XML-XPath ShellCheck
+    yum install -y unzip xz puppet git git-review perl-XML-XPath
 
     # All of our systems require Java (because of Jenkins)
     # Install all versions of the OpenJDK devel but force 1.7.0 to be the
@@ -123,14 +182,47 @@ EOF
         ;;
     esac
 
+    ########################
+    # --- START LFTOOLS DEPS
+
+    # Used by various scripts to push patches to Gerrit
+    yum install -y git-review
+
     # Needed to parse OpenStack commands used by opendaylight-infra stack commands
     # to initialize Heat template based systems.
     yum install -y jq
 
+    # Used by lftools scripts to parse XML
+    yum install -y xmlstarlet
+
+    # Haskel Packages
+    # Cabal update fails on a 1G system so workaround that with a swap file
+    dd if=/dev/zero of=/tmp/swap bs=1M count=1024
+    mkswap /tmp/swap
+    swapon /tmp/swap
+
+    yum install -y cabal-install
+    cabal update
+    cabal install "Cabal<1.18"  # Pull Cabal version that is capable of building shellcheck
+    cabal install --bindir=/usr/local/bin "shellcheck-0.4.6"  # Pin shellcheck version
+
+    # --- END LFTOOLS DEPS
+    ######################
+
     # install haveged to avoid low entropy rejecting ssh connections
     yum install -y haveged
     systemctl enable haveged.service
 
+    # Install sysstat
+    yum install -y sysstat
+    enable_service sysstat
+
+    # Install python3 and dependencies, needed for Coala linting at least
+    yum install -y python34
+    yum install -y python34-{devel,virtualenv,setuptools,pip}
+
+    # Install python dependencies, useful generally
+    yum install -y python-{devel,virtualenv,setuptools,pip}
 }
 
 ubuntu_systems() {
@@ -170,42 +262,42 @@ EOF
     sudo add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
 
     echo "---> Installing base packages"
-    # Use retry loop to install packages for failing mirrors
-    for i in {0..5}
-    do
-        echo "Attempt $i of installing base packages..."
-        apt-get clean
-        apt-get update -m
-        apt-get upgrade -m
-        apt-get dist-upgrade -m
+    apt-get clean
+    apt-get update -m
+    apt-get upgrade -m
+    apt-get dist-upgrade -m
 
-        for pkg in unzip xz-utils puppet git git-review libxml-xpath-perl
-        do
-            # shellcheck disable=SC2046
-            if [ $(dpkg-query -W -f='${Status}' $pkg 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
-                apt-cache policy $pkg
-                apt-get install $pkg
-            fi
-        done
-    done
+    ensure_ubuntu_install unzip xz-utils puppet git libxml-xpath-perl
+
+    # Install python3 and dependencies, needed for Coala linting
+    ensure_ubuntu_install python3
+    ensure_ubuntu_install python3-{dev,setuptools,pip}
+
+    # Install python and dependencies
+    ensure_ubuntu_install python-{dev,virtualenv,setuptools,pip}
 
-    # install Java 7
-    echo "---> Configuring OpenJDK"
     FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
     case "$FACTER_OSVER" in
         14.04)
+            echo "---> Installing OpenJDK"
             apt-get install openjdk-7-jdk
             # make jdk8 available
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
             # We need to force openjdk-8-jdk to install
             apt-get install openjdk-8-jdk
+            echo "---> Configuring OpenJDK"
             # make sure that we still default to openjdk 7
             update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
             update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac
         ;;
         16.04)
+            echo "---> Installing OpenJDK"
             apt-get install openjdk-8-jdk
+
+            echo "---> Installing python3 virtualenv"
+            # python3-virtualenv is available starting with 16.04.
+            ensure_ubuntu_install python3-virtualenv
         ;;
         *)
             echo "---> Unknown Ubuntu version $FACTER_OSVER"
@@ -213,9 +305,36 @@ EOF
         ;;
     esac
 
+    ########################
+    # --- START LFTOOLS DEPS
+
+    # Used by various scripts to push patches to Gerrit
+    ensure_ubuntu_install git-review
+
     # Needed to parse OpenStack commands used by opendaylight-infra stack commands
     # to initialize Heat template based systems.
-    apt-get install jq
+    ensure_ubuntu_install jq
+
+    # Used by lftools scripts to parse XML
+    ensure_ubuntu_install xmlstarlet
+
+    # Haskel Packages
+    # Cabal update fails on a 1G system so workaround that with a swap file
+    dd if=/dev/zero of=/tmp/swap bs=1M count=1024
+    mkswap /tmp/swap
+    swapon /tmp/swap
+
+    ensure_ubuntu_install cabal-install
+    cabal update
+    cabal install --bindir=/usr/local/bin "shellcheck-0.4.6"  # Pin shellcheck version
+
+    # --- END LFTOOLS DEPS
+    ######################
+
+    # Install sysstat
+    ensure_ubuntu_install sysstat
+    sed -i 's/ENABLED="false"/ENABLED="true"/' /etc/default/sysstat
+    enable_service sysstat
 
     # install haveged to avoid low entropy rejecting ssh connections
     apt-get install haveged
index ad0ef81e2e242142bc3c5b0475ab17fc02df7f9a..6f8f6121b8380a7d04ed80151d2c8c13b911bc76 100644 (file)
@@ -12,16 +12,6 @@ yum install -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     {readline,unixODBC}-devel yum-utils fedora-packager \
     libxslt-devel crudini
 
-# Install python3 and dependencies, needed for Coala linting at least
-yum install -y python34
-yum install -y python34-{devel,virtualenv,setuptools,pip}
-
-# Install python dependencies, useful generally
-yum install -y python-{devel,virtualenv,setuptools,pip}
-
-# Use pip to install newer version of git-review
-pip install git-review --upgrade
-
 # Needed by autorelease scripts
 yum install -y xmlstarlet
 
@@ -31,14 +21,12 @@ yum install -y graphviz
 # Needed by deploy test
 yum install -y sshpass
 
-# tcpmd5 is wanting to do 32bit ARM cross-compilation and is specifically
-# requesting the following be installed (note the kernel headers are
-# going to be the x86_64 package as there aren't separate 32bit and
-# x86_64 packages for them
-yum install -y glibc-devel.i686 kernel-headers
+#########################
+# Integration/Packaging #
+#########################
 
-# Needed by opendove
-yum install -y {jansson,libevent,libnl,libuuid}-devel
+# Install software for building RPMs
+yum install -y fedora-packager
 
 # Needed for vsemprovider build in vtn project to enable C# compilation.
 rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
@@ -76,15 +64,3 @@ unzip packer_0.12.2_linux_amd64.zip -d /usr/local/bin/
 # rename packer to avoid conflict with binary in cracklib
 mv /usr/local/bin/packer /usr/local/bin/packer.io
 
-#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
-echo "---> Installing the Quagga..."
-mkdir -p /tmp/build_quagga
-cd /tmp/build_quagga
-git clone https://github.com/6WIND/zrpcd.git
-cd zrpcd
-git checkout 20170418
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
-
-# Removing the build_quagga folder
-rm -rf /tmp/build_quagga/
index 5f392cf8a15c69c97839144fa0edd6bb26d0e19b..4afb693411b92e81bfed2e27cd01cbd0dcb5d81e 100644 (file)
@@ -39,9 +39,6 @@ cp cbench /usr/local/bin/
 echo '---> Installing exabgp'
 apt-get install exabgp
 
-echo '---> All Python package installation should happen in virtualenv'
-apt-get install python-virtualenv python-pip
-
 # Install vlan for vlan based tests in VTN suites
 apt-get install vlan
 
index 0e7efcb37dfa7b1f8155222705f73a31ebdca1b6..9274388204f752c3f592037f72b34cbe3edc9d6e 100644 (file)
@@ -69,8 +69,5 @@ make install
 echo '---> Installing vlan for vlan based tests in VTN suites'
 apt-get install -y --force-yes vlan
 
-echo '---> All Python package installation should happen in virtualenv'
-apt-get install -y --force-yes python-virtualenv python-pip
-
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install -y --force-yes -qq python-netaddr
index e3e0d0fc170b7a8f67c34299a9dcda3b6d479976..86fee0358220dd7ec92b37ffb85a4315f3df47c8 100644 (file)
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"
index 74f89faa9e105d5869d13323a91d568b0bec9fa1..5de50fcb9e7923f4d70bdf84c22c0f74776b095f 100644 (file)
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"
diff --git a/packer/templates/devstack-pre-pip-ocata.json b/packer/templates/devstack-pre-pip-ocata.json
new file mode 100644 (file)
index 0000000..0905f23
--- /dev/null
@@ -0,0 +1,70 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+    "private_base_image": null,
+    "private_network": null,
+    "private_cloud_user": null,
+    "private_auth_url": null,
+    "private_tenant": null,
+    "private_user": null,
+    "private_pass": null,
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "name": "public_cloud",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "DFW",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "image_name": "{{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
+      "source_image": "{{user `public_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    },
+    {
+      "type": "openstack",
+      "name": "private_cloud",
+      "identity_endpoint": "{{user `private_auth_url`}}",
+      "tenant_name": "{{user `private_tenant`}}",
+      "username": "{{user `private_user`}}",
+      "password": "{{user `private_pass`}}",
+      "ssh_username": "{{user `private_cloud_user`}}",
+      "image_name": "{{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `private_base_image`}}",
+      "flavor": "general1-1",
+      "networks": [
+        "{{user `private_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "environment_vars": [
+        "os_branch=stable/ocata"
+      ],
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/devstack-pre-pip.sh",
+        "provision/system_reseal_local_env.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}
index dc38a548161e94a697b0782e89b644d30d303538..1234aa531393adf95364504b1d06ad36a73ca9fb 100644 (file)
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"
index 5fccb455aa46d95c0c5f1b2a37c32aca63d380ae..c622ad26c838f15dad96329894d94148df1a8039 100644 (file)
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"
index ef5f42e0453e3340c13f34d243b58b8d76583eca..adae8a1c473a6a3834aaf2edabfe62150a70d42e 100644 (file)
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"
index d79322dc390ce544198122b1fa1fcf5b2641f428..e361c805764785cfeb5dd9fd377ebb5a325f495a 100644 (file)
@@ -28,7 +28,7 @@
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
       "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
         "{{user `public_network`}}"
index 30c0d4a1a2628158289ac6b08ea96eb41a27182e..ec911de818d21671bc1913eff6cf5eed26e7388b 100644 (file)
@@ -1,5 +1,5 @@
 {
-  "public_base_image": "CentOS 7 (PVHVM)",
+  "public_base_image": "2d659868-df96-4f8e-8ce1-bd32bb86805a",
   "public_cloud_user": "root",
   "private_base_image": "CentOS 7 (cloudimg 1510)",
   "private_cloud_user": "centos",
diff --git a/tox.ini b/tox.ini
index 2b5af0c333baa370043f7f5e1f0be8c01e32053e..6379686fe7c86974b6e71d2eb0d0c4429ac8776b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,8 @@ basepython = python3
 deps =
     coala==0.11
     coala-bears==0.11
+    # Requests 2.16 breaks dependencies
+    requests<2.16
 commands =
     python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger
     coala --non-interactive