Merge "move network id to local jenkins configuration managed files"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Mon, 6 Feb 2017 20:24:47 +0000 (20:24 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 6 Feb 2017 20:24:47 +0000 (20:24 +0000)
220 files changed:
docs/cloud-images.rst
docs/jenkins.rst
jenkins-scripts/builder.sh
jenkins-scripts/jenkins-init-script-local-env.sh [new file with mode: 0755]
jenkins-scripts/jenkins-init-script.sh
jenkins.ini.example
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-idmlite.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/armoury/armoury-csit-basic.yaml
jjb/armoury/armoury.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.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/coe/coe.yaml [new file with mode: 0644]
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/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim.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.yaml
jjb/eman/eman-csit-model.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml [new file with mode: 0644]
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/include-raw-deploy-archives.sh
jjb/infrautils/infrautils.yaml
jjb/integration/distribution-jobs.yaml [moved from jjb/integration/integration-distribution-jobs.yaml with 92% similarity]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
jjb/integration/include-raw-integration-list-jobs.sh [new file with mode: 0644]
jjb/integration/include-raw-integration-replace-block-text.sh [new file with mode: 0644]
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
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-csit-basic.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-cluster-stress.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-multi-openstack.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-vpnservices-csit-hwvtep-openstack.yaml [new file with mode: 0644]
jjb/netvirt/netvirt.yaml
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-csit-basic.yaml
jjb/ocpplugin/ocpplugin-csit-scalability.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-stacks.sh
jjb/opendaylight-infra-push-gerrit-patch.sh [new file with mode: 0644]
jjb/opendaylight-infra-stack.sh
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
jjb/openflowplugin/openflowplugin-csit-scalability.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packaging/packaging.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/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.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-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/tcpmd5/tcpmd5.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.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
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/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools.yaml
openstack-hot/csit-3-instance-type.yaml [new file with mode: 0644]
packer/provision/devstack-pre-pip.sh
packer/provision/devstack.sh
packer/provision/java-builder.sh
packer/provision/robot.sh
packer/provision/system_reseal.sh
packer/provision/system_reseal_local_env.sh [new file with mode: 0644]
packer/templates/devstack-pre-pip-mitaka.json
packer/templates/devstack-pre-pip-newton.json

index a7e10a3aa97c26592d295db074c7fb08294bb141..88a033540f39c90c714b72d2ab832bd9ab0a6690 100644 (file)
@@ -2,10 +2,10 @@ Following are the list of published images recommened to be used with Jenkins jo
 
 * CentOS 7 - java-builder - 20170120-1817
 * Ubuntu 14.04 - gbp - 20170117-0042
-* Ubuntu 14.04 - mininet - 20170117-0003
-* Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004
-* Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+* Ubuntu 14.04 - mininet - 20170130-0425
+* Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415
+* Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
 * CentOS 7 - devstack - 20170120-1710
-* CentOS 7 - devstack - mitaka - 20170106-2237
-* CentOS 7 - devstack - newton - 20170106-2237
+* CentOS 7 - devstack-mitaka - 20170130-0523
+* CentOS 7 - devstack-newton - 20170130-0426
 * CentOS 7 - docker - 20170120-1434
index 2c0d629441ccd1272d188642a8cc0334a3d4e9a2..8e89d67ab33477196aee806f046ae79c6ac82cf3 100644 (file)
@@ -42,7 +42,6 @@ Next we will create <new-project>.yaml as follows:
         name: <NEW_PROJECT>-carbon
         jobs:
             - '{project-name}-clm-{stream}'
-            - '{project-name}-distribution-{stream}'
             - '{project-name}-integration-{stream}'
             - '{project-name}-merge-{stream}'
             - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -189,12 +188,13 @@ Pool: ODLRPC
 
     <table class="table table-bordered">
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_controller, dynamic_verify,
-          dynamic_merge, centos7-java-builder-2c-4g, centos7-java-builder-2c-8g,
-          centos7-java-builder-4c-8g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-java-builder-2c-4g,
+          centos7-java-builder-2c-8g, centos7-java-builder-4c-8g,
+          centos7-java-builder-8c-8g, centos7-java-builder-4c-16g</td>
         <td><b>Minion Template names</b><br/> centos7-java-builder-2c-4g,
-          centos7-java-builder-2c-8g, centos7-java-builder-2c-8g,
-          centos7-java-builder-4c-8g, centos7-java-builder-8c-8g</td>
+          centos7-java-builder-2c-4g, centos7-java-builder-2c-8g,
+          centos7-java-builder-4c-8g, centos7-java-builder-8c-8g,
+          centos7-java-builder-4c-16g</td>
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/java-builder.json</td>
         <td><b>Spinup Script</b><br/>
@@ -202,7 +202,7 @@ Pool: ODLRPC
       </tr>
       <tr>
         <td colspan="4">
-          A CentOS 7 huild minion. This system has OpenJDK 1.7 (Java7) and OpenJDK
+          A CentOS 7 build minion. This system has OpenJDK 1.7 (Java7) and OpenJDK
           1.8 (Java8) installed on it along with all the other components and
           libraries needed for building any current OpenDaylight project. This is
           the label that is used for all basic verify, merge and daily builds for
@@ -211,7 +211,7 @@ Pool: ODLRPC
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_robot, centos7-robot-2c-2g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-robot-2c-2g</td>
         <td><b>Minion Template names</b><br/> centos7-robot-2c-2g</td>
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/robot.json</td>
@@ -268,7 +268,7 @@ Pool: ODLRPC
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_devstack, centos7-devstack-2c-4g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-devstack-2c-4g</td>
         <td><b>Minion Template names</b><br/> centos7-devstack-2c-4g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/devstack.json</td>
         <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/devstack.sh</td>
@@ -283,7 +283,7 @@ Pool: ODLRPC
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_docker, centos7-docker-2c-4g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-docker-2c-4g</td>
         <td><b>Minion Template names</b><br/> centos7-docker-2c-4g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/docker.json</td>
         <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/docker.sh</td>
@@ -573,17 +573,6 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
 .. raw:: html
 
     <table class="table table-bordered">
-      <tr class="warning">
-        <td><b>Job Template</b><br/>{project}-distribution-{stream}</td>
-      </tr>
-      <tr>
-        <td colspan="2">
-          This job builds a snapshot distribution. This is triggered by successful merge job,
-          so the distribution contains newest project artifacts.
-          This job then triggers subset of sanity CSIT jobs relevant for the project.
-        </td>
-      </tr>
-
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-distribution-check-{stream}</td>
         <td><b>Gerrit Trigger</b><br/>recheck</td>
@@ -624,6 +613,9 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
           Artifacts are uploaded to OpenDaylight's
           <a href="https://nexus.opendaylight.org">Nexus</a> on completion.
 
+          A distribution-merge-{stream} job is triggered to add the new artifacts to the
+          integration distribution.
+
           Running the "remerge" trigger is possible before a Change is merged,
           it would still build the actual HEAD. This job does not alter Gerrit votes.
         </td>
index d607757aa4a2cd315e0ac37258453f33a6b1ef38..7249e01cdd10603fe5dbbc3b43947eb06565cee8 100755 (executable)
@@ -19,39 +19,6 @@ yum install -y libxslt-devel
 # install sshpass
 yum install -y sshpass
 
-# vim: sw=2 ts=2 sts=2 et :
-# Installation of Hbase
-mkdir /tmp/Hbase
-cd /tmp/Hbase
-
-wget --no-verbose http://apache.osuosl.org/hbase/hbase-0.94.27/hbase-0.94.27.tar.gz
-
-echo "Installing the Hbase Server..."
-tar -xvf hbase-0.94.27.tar.gz
-
-#Installation of Cassandra
-
-
-mkdir /tmp/cassandra
-cd /tmp/cassandra
-
-wget --no-verbose http://apache.osuosl.org/cassandra/2.1.16/apache-cassandra-2.1.16-bin.tar.gz
-
-echo "Installing the Cassandra Server..."
-
-tar -xvf apache-cassandra-2.1.16-bin.tar.gz
-
-# Installation of Elasticsearch node
-
-mkdir /tmp/elasticsearch
-cd /tmp/elasticsearch
-
-wget --no-verbose https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.tar.gz
-
-echo "Installing the Elasticsearch node..."
-
-tar -xvzf elasticsearch-1.7.5.tar.gz
-
 cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
 Defaults:jenkins !requiretty
 jenkins     ALL = NOPASSWD: ALL
diff --git a/jenkins-scripts/jenkins-init-script-local-env.sh b/jenkins-scripts/jenkins-init-script-local-env.sh
new file mode 100755 (executable)
index 0000000..0e490f4
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+## will be added in local environment
index 88c5eb620bf285281c51cbcbeb6b9a46108ed815..efb8b1a79733a57fb878c801b71d453e9ddc6053 100755 (executable)
@@ -20,3 +20,6 @@ source /tmp/system_type.sh
 # Create the jenkins user last so that hopefully we don't have to deal with
 # guard files
 ./create_jenkins_user.sh
+
+## add local environment changes post scripts
+./jenkins-init-script-local-env.sh
index 6c3e115a8bdb3bdca269a043a2bcbd3452d15152..6c2308bfee017943fb5c6e0d26c5ceee8d4295b5 100644 (file)
@@ -1,12 +1,11 @@
 [job_builder]
 ignore_cache=True
 keep_descriptions=False
-include_path=.:scripts:~/git/
+include_path=.
 recursive=True
 
 [jenkins]
-#user=jenkins
-#password=1234567890abcdef1234567890abcdef
-url=http://localhost:8080
+user=#odl_username#
+password=#api_token#
+url=https://jenkins.opendaylight.org/sandbox
 query_plugins_info=False
-
index 3f7673a690985937520d8287d85d3b5cac338b5e..e44ef5e3011e27bbee75af2d11e36491b090bd31 100644 (file)
@@ -34,8 +34,5 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
-
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0
index acbb03867f1e9ebda87d970f8f7857974a35656c..5021d5e142c2fbe5248ab5fbf5d0e7368c853241 100644 (file)
@@ -34,8 +34,5 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
-
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0
index 3443aec621ae335c6b478794dc7d0cee15104968..c14410202a1b28852236e5c55d08250c737119ec 100644 (file)
@@ -2,7 +2,6 @@
     name: aaa-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: aaa-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: aaa-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 4170987e35dc689a69901a11ba83a583f6837a7c..e01a179e6a90d513b962693136ade6678e90ef45 100644 (file)
@@ -33,8 +33,5 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'alto-distribution-{stream}'
-
     # Don't spin up mininet vms as alto-csit-setup jobs don't need them
     tools_system_count: 0
index 116b7bcbbfc25438f6f41964f6eb26e29ab0b31f..e6acbd93e4ae035c8e941e9fdac0251004f50eaa 100644 (file)
@@ -2,7 +2,6 @@
     name: alto-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: alto-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: alto-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 653a5aeb8bcdca5efc87920c741ad1518b0f9b1a..0e239f3a52fb9df836e7663ca268fb31beea7df6 100644 (file)
@@ -35,8 +35,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        netconf-distribution-{stream},
-        armoury-distribution-{stream}
index 24e5f0e6fdfa3bd60fabc8a968bb52e119d4b362..e397334a5d848f13ea27ab1d34b1fc5276791b89 100644 (file)
@@ -2,7 +2,6 @@
     name: armoury-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -29,7 +28,6 @@
     name: armoury-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -56,7 +54,6 @@
     name: armoury-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index 18ba43f83ac23e3e2c4cc6829e01f12b48334b5a..db7b088b7d4bf0c493198bd72adacfe89d0d04a2 100644 (file)
@@ -2,7 +2,6 @@
     name: atrium-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: atrium-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index bd290cf0b541fe13ba434056b2f368a077a112d6..aa1e8aa847b3e72147cf3a0462b1cb660c129253 100644 (file)
@@ -93,6 +93,8 @@
             cp *.log *.prop $_
 
     publishers:
+        - archive:
+            artifacts: 'dependencies.log'
         - email-notification:
             email-recipients: '{email-recipients}'
             email-prefix: '[autorelease]'
index c6d3a16eb7fabe7288492d4a2e3f2a7f959f5911..6d99ba591438a1395ed0c10a3dfe30d690c194f4 100644 (file)
@@ -37,9 +37,6 @@
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False -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 '
 
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
 
@@ -83,9 +80,6 @@
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test environment or more complex scenario is chosen
     robot-options: '-v USE_NETCONF_CONNECTOR:False -v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
 
index f3a052d3da2450baed1bfbfc677861ba4bf1c197..e373adcb0dd2a48ddd7a2fec6ebea1b6076a2cd0 100644 (file)
@@ -28,6 +28,3 @@
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
index 786da1ce33d0ec431780b9673a9d654d0bef1bcc..a376f3c065ee183297da03ca0294ffadfcb15020 100644 (file)
@@ -35,8 +35,5 @@
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: '8 GB General Purpose v1'
index 2d3f05ac0cf51e908f4ee5f01663211705dd6911..a808296a5f4a9a397e9a7b3053b6f6c24e2c0279 100644 (file)
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False -v PCEP_READY_VERIFY_TIMEOUT:5 -v RESTCONF_REUSE:False -v UPDATER_TIMEOUT:600'
 
-    # This performance test can take up to one hour to finish,
-    # so the job is defined to run once a day.
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
index 76ef3ff617588ff5148e18c2181c86f5aa4e3cb9..0e0fd1cf070b56366d26231283d1e915f77ad22e 100644 (file)
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    # Netconf is there for run-time re-configuration.
-    # AAA could also be a dependency, but probability of breakage is too low to trigger everytime.
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        mdsal-distribution-{stream},
-        netconf-distribution-{stream},
-        tcpmd5-distribution-{stream},
-        bgpcep-distribution-{stream}
index 3114166ad5bff9ad9f33a0c45165999749afa1dd..deffea6e092dea85ccf3f12dd4aba59a5c931e9e 100644 (file)
@@ -4,8 +4,7 @@
         - '{project-name}-verify-python-{stream}'
 
     stream:
-        - carbon:
-            branch: 'master'
+        # Pcepy was removed in Carbon.
         - boron:
             branch: 'stable/boron'
         - beryllium:
index 3ee1607661583a8c9ec397e668b0138fa78d3af2..fcd35040a37f9082c5a722835629bb4dfca4071c 100644 (file)
@@ -2,7 +2,6 @@
     name: bgpcep-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -31,7 +30,6 @@
     name: bgpcep-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -61,7 +59,6 @@
     name: bgpcep-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 9f243587ad82703fd4d43868722aa8597c9b2940..9abd5c1101ee5a0ee1903c5cbf5ec9920cfcc6f6 100644 (file)
@@ -2,7 +2,6 @@
     name: bier-carbon\r
     jobs:\r
         - '{project-name}-clm-{stream}'\r
-        - '{project-name}-distribution-{stream}'\r
         - '{project-name}-distribution-check-{stream}'\r
         - '{project-name}-integration-{stream}'\r
         - '{project-name}-merge-{stream}'\r
index d52ad4ea055eb75bd10f7618b2ca6983b85eaeee..70c1cf0f3a369b93e72ff3a46b6db55b4ee671a6 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'capwap-distribution-{stream}'
index aa4416b5a7c0e9a1d8b5abde6f83c050403d5dcf..48d903a71baf8a617c3cd152da57b81a10f636e7 100644 (file)
@@ -2,7 +2,6 @@
     name: capwap-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: capwap-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: capwap-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 3c3654c627dd84b9c9497258e3c08bf65427bb53..2e5dba5554eeb2edbb27bc4b582db1b10d019311 100644 (file)
@@ -2,7 +2,6 @@
     name: cardinal-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: cardinal-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 3aebba377ba1a1ca4ac91bb66e5863a576254def..8e2ac4c1854cef9c6606eb02678cf5f103a2fe4c 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'centinel-distribution-{stream}'
index 42cfb5fe25b6ee03ebf79b3558028646feaae53b..d02c69ad27c422bfdf027fd42a4a48df53b2c6df 100644 (file)
@@ -2,7 +2,6 @@
     name: centinel-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: centinel-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: centinel-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
new file mode 100644 (file)
index 0000000..3fc36fd
--- /dev/null
@@ -0,0 +1,36 @@
+- project:
+    name: coe-carbon
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: carbon
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: 'mvn33'
+    mvn-settings: 'coe-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}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
+- project:
+    name: coe-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'coe'
+    project-name: 'coe'
+    branch: 'master'
+    mvn-settings: 'coe-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
index 3575d937c5ec8ef024ed4822e5fc6e14c98a1459..091cdc6275df05a264e48485e8f030e99e8af373 100644 (file)
@@ -35,7 +35,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream}
index 39e247ac3ead6e5b6cde18dd049508f3a4cc780c..72371b93a000410f364c156bd0ebb2040aa24de7 100644 (file)
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        mdsal-distribution-{stream},
-        controller-distribution-{stream},
-        netconf-distribution-{stream},
-        integration-distribution-merge-{stream}
index bbd5fb22879b3fcb7994ee0d8aa24493c264a48d..90394584396fcd99355db24e75dd974eb0d59c46 100644 (file)
@@ -33,9 +33,6 @@
     # Robot custom options
     robot-options: '--exclude singlenode_setup'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
     odl_system_flavor: '8 GB General Purpose v1'
index a4b5edcc9761efd3f032f2c5757b2209b8ed158f..1d37f3adb4ff57e54aa07c3b51eb7ec10f07c681 100644 (file)
@@ -33,9 +33,6 @@
     # Robot custom options
     robot-options: '--exclude clustered_setup'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
     odl_system_flavor: 8 GB General Purpose v1
index b982aef7ffb8b196f1897dfff4ff9bf7d044a5e2..303722338df08a7ad7c723e6f747fe818a684586 100644 (file)
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'
index c0252a7af13ff80c336f1573b56aa03db462c60c..3b4596adf919f244b0f87355e4b4344df054286a 100644 (file)
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'
index c3542caf9a5211c16a215dd3bda2efbc9ea1fe5b..a18d7d4794023e5a389804dca76f11a9a9f8928c 100644 (file)
@@ -2,7 +2,6 @@
     name: controller-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
+    # Temporary workaround for SFT failure with karaf4-features
+    build-node: centos7-java-builder-4c-16g
 
 - project:
     name: controller-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +58,6 @@
     name: controller-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index f1098b7ebee22614356fc9b8103c09b5cc473052..1a583090bc0ee22c3ea725657db9fdbcea88a107 100644 (file)
@@ -2,7 +2,6 @@
     name: coretutorials-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: coretutorials-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: coretutorials-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index dad3d01117f339b14f49f9975542441766f06f7e..a374c9942ae58609ef8e2bd005fdb73f33965d03 100644 (file)
@@ -28,6 +28,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'daexim-merge-{stream}'
index 02bf27447113ad0a51376469642e032312b5aec7..cdd2255377b9ba880ef4f7faa3a299942a3d9a28 100644 (file)
@@ -2,7 +2,6 @@
     name: daexim-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index 7976732a1cc63fc17f6a669444e6a9379237f36c..84f25d52e1737cbdd3a661b03d2456000f996979 100644 (file)
@@ -31,6 +31,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'didm-distribution-{stream},openflowplugin-distribution-{stream}'
index 549e1f97b41a48fb1287d6e1864632df57260194..f5666bc3a658fcd74250ba329f774a1b9d4a40fa 100644 (file)
@@ -2,7 +2,6 @@
     name: didm-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: didm-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: didm-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index a9ff17fa015796c83b94c1f28d7482f905c04db1..82cfc56b255e615eacad2b5bac7a9f9e3cf8f8dd 100644 (file)
@@ -2,7 +2,6 @@
     name: discovery-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: discovery-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: discovery-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index 74c84ffd67c3755da722425d8709a412038239af..17578a7b5ec852dba8fee9d2f2b8a44bf81d1fe4 100644 (file)
@@ -2,7 +2,6 @@
     name: dlux-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: dlux-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: dlux-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 3dbc62af8e4bc4f5e71d528bc8875b19a029fd15..37b5e47357def3799d33ffacbf7de384fe6ebfa4 100644 (file)
@@ -2,7 +2,6 @@
     name: dluxapps-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 7aecd36f1fcdf446a2cf871f196812b203b919f2..96f3ad413eb1760c755528a7aa7654e4b954f949 100644 (file)
@@ -2,7 +2,6 @@
     name: docs-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index 9f7d2c65a3226afcf7e88bec43ae1663810c2271..71dd2f63bd0cd082f3529f4e37c6c1c87b9acd37 100644 (file)
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'eman-distribution-{stream}'
index f81864d0e15c45baa3eece36310936e56aaa38d3..34e05b3e40920ab016b95e6691a7e798abd86017 100644 (file)
@@ -2,7 +2,6 @@
     name: eman-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: eman-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 51f516ff398a65c3df906d18a6065babde64ed5e..00fe1614fbb7351e7943637ad358a8e6d8b6b20f 100644 (file)
@@ -2,7 +2,6 @@
     name: faas-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: faas-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: faas-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
new file mode 100644 (file)
index 0000000..dc85076
--- /dev/null
@@ -0,0 +1,36 @@
+- project:
+    name: federation-carbon
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: carbon
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: 'mvn33'
+    mvn-settings: 'federation-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}'
+    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
+- project:
+    name: federation-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'federation'
+    project-name: 'federation'
+    branch: 'master'
+    mvn-settings: 'federation-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 39487b6bf79ac1d903ae4010d2b1c8206848dc0e..f4837edea038d333a02d636c57b22794bb84a6e8 100644 (file)
 
     # Mininet configuration
     tools_system_count: 2
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415
 
     # Features to install
     install-features: 'odl-genius-ui'
 
     # Robot custom options
     robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},genius-distribution-{stream}'
index ef9d437ddff7f35c9800477cf785e12c695fa006..50f7f10db69987398adb483085b8958dc926d072 100644 (file)
@@ -2,7 +2,6 @@
     name: genius-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: genius-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index e36c248ab12605cd0b7658f5d92c0904a8977160..d8db329866620203a2b26526f9cb4716e5725873 100644 (file)
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'groupbasedpolicy-distribution-{stream},
-                   neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'
index c6a70f3c983fa20d027bfa968063b8fdf6cf3d61..561df443edce6a4f4fb60bbda97e7fd79114f710 100644 (file)
 
     # Robot custom options
     robot-options: ''
-
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'groupbasedpolicy-distribution-{stream},
-                   neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'
index 25fdba1f88f869ca1e290a07c995bdec600f701c..ac27097a943faf1f983c21d9d6c29f7315514f80 100644 (file)
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'
index 8d2e412e4eced86b85346421dd0d4b977ac85df2..16296a93da98dd75bb402eed256cd7f8930b3434 100644 (file)
@@ -26,6 +26,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'sfc-distribution-{stream},groupbasedpolicy-distribution-{stream},sxp-distribution-{stream}'
index 321b06776083c1270b31bba00b09c5887414cae8..da3fd917cb5f5f98b6270c36b674269dc3c44055 100644 (file)
@@ -2,7 +2,6 @@
     name: groupbasedpolicy-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: groupbasedpolicy-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: groupbasedpolicy-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 3dcf452485ee49d42dc215a84f1a93a98c7cd9b9..f16edde3d2c16be6c9ead242d6830eda2434ef9c 100644 (file)
@@ -2,7 +2,6 @@
     name: vbd-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: vbd-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index ac955ef65deda2e608bd71d0c0563b8e86f4a08a..86e077eb5bc9700a1761d05718efa779567fa52c 100644 (file)
@@ -1,6 +1,11 @@
 #!/bin/bash
 
 set +e  # Do not affect the build result if some part of archiving fails.
+# 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"
index 47b3e9293bdcaa22390a3f551f5b7dc339e61a41..b5fce1aebfc1ddc8606804fd3701a104fc1fff48 100644 (file)
@@ -2,7 +2,6 @@
     name: infrautils-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: infrautils-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
similarity index 92%
rename from jjb/integration/integration-distribution-jobs.yaml
rename to jjb/integration/distribution-jobs.yaml
index 45fe379a7e1dbb8adbe03193ce41618ad0c8536f..da71d2d61f53ab269398e2b66a7cc6facd8cbdee 100644 (file)
@@ -1,15 +1,15 @@
 
 - project:
-    name: integration-distribution
+    name: distribution-jobs
     jobs:
         - '{project-name}-verify-python-{stream}'
-        - 'integration-distribution-verify-{stream}'
-        - 'integration-distribution-merge-{stream}'
-        - 'integration-distribution-deploy-{stream}'
-        - 'integration-distribution-offline-{stream}'
+        - 'distribution-verify-{stream}'
+        - 'distribution-merge-{stream}'
+        - 'distribution-deploy-{stream}'
+        - 'distribution-offline-{stream}'
 
     project: integration/distribution
-    project-name: integration-distribution
+    project-name: distribution
 
     stream:
         - carbon:
@@ -24,7 +24,7 @@
 
 
 - job-template:
-    name: 'integration-distribution-verify-{stream}'
+    name: 'distribution-verify-{stream}'
 
     project-type: maven
     node: centos7-java-builder-2c-8g
@@ -83,7 +83,7 @@
 
     postbuilders:
         - trigger-builds:
-            - project: 'integration-distribution-deploy-{stream}'
+            - project: 'distribution-deploy-{stream}'
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
 
 - job-template:
-    name: 'integration-distribution-merge-{stream}'
+    name: 'distribution-merge-{stream}'
 
     # Need to keep jobs that deploy to Nexus at end of build as Maven
     # projects. Maybe reconsider this once upstream moves deploy to a
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jre}'
 
     properties:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
 
     scm:
         - gerrit-trigger-scm:
             build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             server-name: '{server-name}'
             name: 'integration/distribution'
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: 'integration-settings'
+        - distribute-build-url:
+            path: 'distribution-karaf/src/main/assembly'
 
     maven:
         maven-name: 'mvn33'
             email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
-# Template: integration-distribution-deploy-{stream}
+# Template: distribution-deploy-{stream}
 # Goal: Verify distribution starts with no issues when all features are loaded
 # Operation: This job deploys the controller installing odl-integration-all
 
 - job-template:
-    name: 'integration-distribution-deploy-{stream}'
+    name: 'distribution-deploy-{stream}'
 
     project-type: freestyle
     node: centos7-java-builder-2c-8g
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
-# Template: integration-distribution-offline-{stream}
+# Template: distribution-offline-{stream}
 # Goal: Verify distribution can start with no internet connection
 # Operation: This job deploys the controller removing any external repository definition
 
 - job-template:
-    name: 'integration-distribution-offline-{stream}'
+    name: 'distribution-offline-{stream}'
 
     project-type: freestyle
     node: centos7-java-builder-2c-8g
index c8324bda7e04569422ca7668c786c9536d1624b3..309986336997e9c6463f40e61af2652b256f9502 100644 (file)
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream},
-        integration-distribution-merge-{stream}
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
index 5c057535ce893fc27dc24a993f97cb5286a046f4..7f29520f88cb45549f3b8f1dc195fe6c8516a47e 100644 (file)
@@ -9,7 +9,7 @@ echo "showing recent changes that made it in to the distribution used by this jo
 pip install --upgrade urllib3
 python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folder \
                   -u ${ACTUALBUNDLEURL} \
-                  -r ssh://jenkins-${SILO}@git.opendaylight.org:29418
+                  -r ssh://jenkins-${SILO}@git.opendaylight.org:29418 || true
 
 echo "#################################################"
 echo "##         Deploy Openstack 3-node             ##"
@@ -620,6 +620,8 @@ pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDE
 -v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
 -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_1_IP} -v ODL_SYSTEM_2_IP:${ODL_SYSTEM_2_IP} \
 -v ODL_SYSTEM_3_IP:${ODL_SYSTEM_3_IP} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v OS_USER:${USER} \
+-v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_1_IP} -v TOOLS_SYSTEM_1_IP:${TOOLS_SYSTEM_1_IP} \
+-v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
 -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} -v OS_CONTROL_NODE_IP:${OPENSTACK_CONTROL_NODE_IP} \
 -v OS_COMPUTE_1_IP:${OPENSTACK_COMPUTE_NODE_1_IP} -v OS_COMPUTE_2_IP:${OPENSTACK_COMPUTE_NODE_2_IP} \
 -v HA_PROXY_IP:${HA_PROXY_IP} \
diff --git a/jjb/integration/include-raw-integration-list-jobs.sh b/jjb/integration/include-raw-integration-list-jobs.sh
new file mode 100644 (file)
index 0000000..769cbc6
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/bash
+# Script to filter Jenkins jobs against a blacklist
+# output: newline & comma-separated list
+
+system="releng"
+search_string="{search_string}"
+blacklist_in="{blacklist}"
+blacklist=( $(echo ${{blacklist_in}}) )
+stream="{stream}"
+
+wget --quiet -O jenkins-jobs.xml https://jenkins.opendaylight.org/$system/api/xml
+jobs=$(xmlstarlet sel -t -m '//hudson/job' \
+    -n -v 'name' jenkins-jobs.xml | grep $search_string | grep $stream)
+
+bl_len=${{#blacklist[@]}}
+for (( i = 0; i < ${{bl_len}}; i++ )); do
+    jobs="$(echo "$jobs" | grep -v ${{blacklist[$i]}} )"
+done
+# output as comma-separated list with 8 spaces before each item
+echo $jobs | sed 's: :,\n:g' | sed 's:^\(.*\):        \1:g' > {jobs-filename}
+
diff --git a/jjb/integration/include-raw-integration-replace-block-text.sh b/jjb/integration/include-raw-integration-replace-block-text.sh
new file mode 100644 (file)
index 0000000..a21f7e2
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/bash
+starting_regex={starting-regex}
+ending_regex={ending-regex}
+file_with_changes_to_insert={file-with-changes-to-insert}
+file_to_change={file-to-change}
+output=$(sed -e "/$starting_regex/,/$ending_regex/{{ /$starting_regex/{{p; r ${{file_with_changes_to_insert}}
+        }}; /$ending_regex/p; d }}"  ${{file_to_change}})
+echo "$output" > ${{file_to_change}}
index 4ac193bc60049a5a6575ce99b3b36921509915cf..a0e480942467e85bc8e2973eabfb5705fc473830 100644 (file)
                       - compare-type: 'ANT'
                         pattern: '{files}'
 
-# Macro: integration-csit-only
-# Operation: this macro sets a trigger on reverse job list
-# Used by: csit -only- job templates
-
-- trigger:
-    name: integration-csit-only
-    triggers:
-        - reverse:
-            jobs: '{jobs}'
-            result: 'success'
-
-# Macro: integration-csit-all
-# Operation: this macro sets a periodic trigger
-# Used by: csit -all- job teamplates
-
-- trigger:
-    name: integration-csit-all
-    triggers:
-        - timed: 'H H * * *'
-
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates
         - opendaylight-infra-stack:
             stack-template: '{stack-template}'
 
+# Macro: integration-infra-stack-3-type
+# Operation: Sets environment and then calls opendaylight-infra-stack to spin
+#            up csit lab using openstack-heat.
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-infra-stack-3-type
+    builders:
+        - integration-cleanup-workspace
+        - shell: |
+            #!/bin/bash
+            # Setup openstack envirnoment file for use by
+            # the opendaylight-infra-stack macro
+            cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
+            parameters:
+                vm_0_count: {vm_0_count}
+                vm_0_flavor: {vm_0_flavor}
+                vm_0_image: {vm_0_image}
+                vm_1_count: {vm_1_count}
+                vm_1_flavor: {vm_1_flavor}
+                vm_1_image: {vm_1_image}
+                vm_2_count: {vm_2_count}
+                vm_2_flavor: {vm_2_flavor}
+                vm_2_image: {vm_2_image}
+            EOF
+            echo "Contents of opendaylight-infra-environment.yaml ..."
+            cat $WORKSPACE/opendaylight-infra-environment.yaml
+        - opendaylight-infra-stack:
+            stack-template: 'csit-3-instance-type.yaml'
+
 # Macro: integration-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms
 # Used by: {project}-csit-* job templates
 
 # Macro: integration-deploy-controller-verify
 # Operation: this macro deploys the controller with all fetures
-# Used by: integration-distribution-deploy-{stream} job template
+# Used by: distribution-deploy-{stream} job template
 
 - builder:
     name: integration-deploy-controller-verify
 
 # Macro: integration-get-bundle-url-root
 # Operation: this macro gets the job generated distribution URL from root pom.xml
-# Used by: integration-distribution-verify-{stream} job template
+# Used by: distribution-verify-{stream} job template
 
 - builder:
     name: integration-get-bundle-url-root
         - shell:
             !include-raw:
                 - include-raw-integration-deploy-openstack-run-test.sh
+
+# Macro: integration-list-jobs
+# Operation: queries Jenkins jobs from jenkins.opendaylight.org and
+#   writes a list of the jobs corresponding to the search terms to a file.
+# Used by: builder-merge job template
+#
+# This script requires the following JJB variables to be passed in:
+#   {search_string}     Job type to act as a primary filter (e.g. csit)
+#   {blacklist}         List of sub-projects to filter out (e.g. longevity)
+#   {stream}            Development release name (e.g. boron)
+#   {jobs-filename}     Filename to write list into (e.g. carbon-jobs.lst)
+# NOTE: Requires xmlstarlet installed on node.
+
+- builder:
+    name: integration-list-jobs
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-list-jobs.sh
+
+# Macro: integration-replace-block-text
+# Operation: using starting and ending regex to
+# replace a block of text in a file with the text in
+# another file. Regex should be basic and work with sed
+# Used by: builder-merge job template
+#
+# This script requires the following JJB variables to be passed in:
+#   {starting-regex}
+#   {ending-regex}
+#   {file-with-changes-to-insert}
+#   {file-to-change}
+
+- builder:
+    name: integration-replace-block-text
+    builders:
+        - shell:
+            !include-raw:
+                - include-raw-integration-replace-block-text.sh
+
 ##############
 # Publishers #
 ##############
index c56bf1cb29fe2d4762e70a2de9578c159fe01b84..2583ab6a9bd35511413fef51b1de1ee671e8c60d 100644 (file)
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - integration-csit-{install}:
-            jobs: '{trigger-jobs}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - timed: '{schedule}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - integration-csit-{install}:
-            jobs: '{trigger-jobs}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - integration-csit-{install}:
-            jobs: '{trigger-jobs}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - timed: '{schedule}'
-
     builders:
         - integration-infra-stack:
             stack-template: '{stack-template}'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
+- job-template:
+    name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    disabled: false
+
+    project-type: freestyle
+    node: centos7-robot-2c-2g
+    concurrent: true
+
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
+        - integration-bundleurl:
+            bundleurl: '{bundleurl}'
+        - integration-controller-features:
+            controller-features: '{install-features}'
+        - integration-test-options:
+            test-options: '{robot-options}'
+        - integration-test-plan:
+            test-plan: '{testplan}'
+        - integration-patch-refspec:
+            branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jre}'
+        - string:
+            name: OPENSTACK_BRANCH
+            default: '{openstack-branch}'
+            description: 'Openstack version to use with devstack'
+        - string:
+            name: ODL_ML2_DRIVER_REPO
+            default: '{odl-ml2-driver-repo}'
+            description: 'URL to fetch networking-odl driver'
+        - string:
+            name: ODL_ML2_BRANCH
+            default: '{odl-ml2-branch}'
+            description: 'Version of networking-odl to checkout from the repo'
+        - string:
+            name: ODL_ML2_DRIVER_VERSION
+            default: '{odl-ml2-driver-version}'
+            description: 'Mode of networking-odl (v1 or v2)'
+        - string:
+            name: ODL_ENABLE_L3_FWD
+            default: '{odl-enable-l3}'
+            description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: PUBLIC_BRIDGE
+            default: '{public-bridge}'
+            description: 'Specifies public bridge for provider and external networking'
+        - string:
+            name: ENABLE_HAPROXY_FOR_NEUTRON
+            default: '{enable-haproxy}'
+            description: 'Enable HAProxy for using neutron interface as HA'
+        - string:
+            name: ENABLE_OS_SERVICES
+            default: '{enable-openstack-services}'
+            description: 'comma seperated list of services to enable'
+        - string:
+            name: DISABLE_OS_SERVICES
+            default: '{disable-openstack-services}'
+            description: 'comma seperated list of services to enable'
+        - string:
+            name: TENANT_NETWORK_TYPE
+            default: '{tenant-network-type}'
+            description: 'Tenant Network Type supported by the implementation'
+        - string:
+            name: SECURITY_GROUP_MODE
+            default: '{security-group-mode}'
+            description: 'Security Group Mode to be used in netvirt aclservice config'
+    scm:
+        - integration-gerrit-scm:
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - timed: '{schedule}'
+
+    builders:
+        - integration-infra-stack-3-type:
+            vm_0_count: '{odl_system_count}'
+            vm_0_flavor: '{odl_system_flavor}'
+            vm_0_image: '{odl_system_image}'
+            vm_1_count: '{openstack_system_count}'
+            vm_1_flavor: '{openstack_system_flavor}'
+            vm_1_image: '{openstack_system_image}'
+            vm_2_count: '{tools_system_count}'
+            vm_2_flavor: '{tools_system_flavor}'
+            vm_2_image: '{tools_system_image}'
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
+        - integration-get-slave-addresses
+        - inject:
+            properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
+        - integration-deploy-controller-run-test
+        - integration-deploy-openstack-run-test
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot-tempest:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - email-notification:
+            email-recipients: '{email-recipients}'
+            email-prefix: '[{project}]'
+        - integration-csit-archive-build
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
+
 - job-template:
     name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
     disabled: false
index 052be2f5c28bb29d79dabe8ef05f9472e6f7d25f..6eab6077dcb9dfaf522837a25db2d9ed355520fa 100644 (file)
     project: integration/test
     project-name: integration-test
 
+    # CSIT Lists in releng-defaults.yaml
     stream:
         - carbon:
             branch: 'master'
             jdk: 'openjdk8'
             jre: 'openjdk8'
-            csit-list: >
-                controller-csit-3node-clustering-only-{stream},
-                controller-csit-3node-clustering-all-{stream},
-                integration-distribution-deploy-{stream},
-                integration-distribution-offline-{stream},
-                l2switch-csit-1node-switch-only-{stream},
-                l2switch-csit-1node-switch-all-{stream},
-                l2switch-csit-1node-scalability-only-{stream},
-                l2switch-csit-1node-scalability-all-{stream},
-                lispflowmapping-csit-1node-msmr-only-{stream},
-                lispflowmapping-csit-1node-msmr-all-{stream},
-                nemo-csit-1node-engine-all-{stream},
-                nemo-csit-1node-engine-only-{stream},
-                netvirt-csit-1node-openstack-mitaka-upstream-learn-{stream},
-                netvirt-csit-1node-openstack-mitaka-upstream-transparent-{stream},
-                netvirt-legacy-csit-1node-openstack-basic-all-{stream},
-                netvirt-legacy-csit-1node-openstack-basic-only-{stream},
-                netvirt-legacy-csit-1node-openstack-mitaka-upstream-{stream},
-                netvirt-legacy-csit-3node-clustering-only-{stream},
-                ocpplugin-csit-1node-get-only-{stream},
-                ocpplugin-csit-1node-get-all-{stream},
-                ocpplugin-csit-1node-scalability-only-{stream},
-                ocpplugin-csit-1node-scalability-all-{stream},
-                openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-3node-clustering-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-1node-southbound-only-{stream},
-                ovsdb-csit-3node-clustering-only-{stream},
-                packetcable-csit-1node-pcmm-only-{stream},
-                packetcable-csit-1node-pcmm-all-{stream},
-                sxp-csit-1node-basic-only-{stream},
-                sxp-csit-1node-filtering-all-{stream},
-                sxp-csit-1node-topology-only-{stream},
-                sxp-csit-1node-topology-all-{stream},
-                topoprocessing-csit-1node-topology-operations-all-{stream},
-                topoprocessing-csit-1node-topology-operations-only-{stream},
-                tsdr-csit-1node-cassandra-datastore-only-{stream},
-                tsdr-csit-1node-hbase-datastore-all-{stream},
-                tsdr-csit-1node-hbase-datastore-only-{stream},
-                tsdr-csit-1node-hsqldb-datastore-all-{stream},
-                tsdr-csit-1node-hsqldb-datastore-only-{stream},
-                usc-csit-1node-channel-only-{stream},
-                usc-csit-1node-channel-all-{stream},
-                usc-csit-1node-tcp-only-{stream},
-                usc-csit-1node-tcp-all-{stream},
-                vtn-csit-1node-manager-only-{stream},
-                vtn-csit-1node-manager-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream}
+            csit-list: '{csit-list-carbon}'
+            schedule: 'H H * * 0-4'
 
         - boron:
             branch: 'stable/boron'
             jdk: 'openjdk8'
             jre: 'openjdk8'
-            csit-list: >
-                controller-csit-3node-clustering-only-{stream},
-                controller-csit-3node-clustering-all-{stream},
-                integration-distribution-deploy-{stream},
-                integration-distribution-offline-{stream},
-                l2switch-csit-1node-switch-only-{stream},
-                l2switch-csit-1node-switch-all-{stream},
-                l2switch-csit-1node-scalability-only-{stream},
-                l2switch-csit-1node-scalability-all-{stream},
-                lispflowmapping-csit-1node-msmr-only-{stream},
-                lispflowmapping-csit-1node-msmr-all-{stream},
-                nemo-csit-1node-engine-all-{stream},
-                nemo-csit-1node-engine-only-{stream},
-                netvirt-csit-1node-openstack-mitaka-upstream-learn-{stream},
-                netvirt-csit-1node-openstack-mitaka-upstream-transparent-{stream},
-                netvirt-legacy-csit-1node-openstack-basic-all-{stream},
-                netvirt-legacy-csit-1node-openstack-basic-only-{stream},
-                netvirt-legacy-csit-1node-openstack-mitaka-upstream-{stream},
-                netvirt-legacy-csit-3node-clustering-only-{stream},
-                ocpplugin-csit-1node-get-only-{stream},
-                ocpplugin-csit-1node-get-all-{stream},
-                ocpplugin-csit-1node-scalability-only-{stream},
-                ocpplugin-csit-1node-scalability-all-{stream},
-                openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-3node-clustering-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-1node-southbound-only-{stream},
-                ovsdb-csit-3node-clustering-only-{stream},
-                packetcable-csit-1node-pcmm-only-{stream},
-                packetcable-csit-1node-pcmm-all-{stream},
-                sxp-csit-1node-basic-only-{stream},
-                sxp-csit-1node-filtering-all-{stream},
-                sxp-csit-1node-topology-only-{stream},
-                sxp-csit-1node-topology-all-{stream},
-                topoprocessing-csit-1node-topology-operations-all-{stream},
-                topoprocessing-csit-1node-topology-operations-only-{stream},
-                tsdr-csit-1node-cassandra-datastore-only-{stream},
-                tsdr-csit-1node-hbase-datastore-only-{stream},
-                tsdr-csit-1node-hsqldb-datastore-only-{stream},
-                usc-csit-1node-channel-only-{stream},
-                usc-csit-1node-channel-all-{stream},
-                usc-csit-1node-tcp-only-{stream},
-                usc-csit-1node-tcp-all-{stream},
-                vtn-csit-1node-manager-only-{stream},
-                vtn-csit-1node-manager-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream}
+            csit-list: '{csit-list-boron}'
+            schedule: 'H H * * 0-4'
 
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'
             jre: 'openjdk7'
-            csit-list: >
-                aaa-csit-1node-authn-only-{stream},
-                aaa-csit-1node-authn-all-{stream},
-                bgpcep-csit-1node-userfeatures-only-{stream},
-                bgpcep-csit-1node-userfeatures-all-{stream},
-                capwap-csit-1node-ac-only-{stream},
-                capwap-csit-1node-ac-all-{stream},
-                integration-distribution-offline-{stream},
-                integration-distribution-deploy-{stream},
-                l2switch-csit-1node-switch-only-{stream},
-                l2switch-csit-1node-scalability-only-{stream},
-                l2switch-csit-1node-scalability-all-{stream},
-                lispflowmapping-csit-1node-msmr-only-{stream},
-                lispflowmapping-csit-1node-msmr-all-{stream},
-                nemo-csit-1node-engine-all-{stream},
-                nemo-csit-1node-engine-only-{stream},
-                nic-csit-1node-basic-all-{stream},
-                nic-csit-1node-basic-only-{stream},
-                openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-all-{stream},
-                openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-3node-clustering-only-{stream},
-                ovsdb-csit-1node-southbound-all-{stream},
-                ovsdb-csit-1node-southbound-only-{stream},
-                packetcable-csit-1node-pcmm-only-{stream},
-                packetcable-csit-1node-pcmm-all-{stream},
-                snmp-csit-1node-basic-only-{stream},
-                snmp-csit-1node-basic-all-{stream},
-                sxp-csit-1node-basic-only-{stream},
-                sxp-csit-1node-filtering-only-{stream},
-                sxp-csit-1node-filtering-all-{stream},
-                topoprocessing-csit-1node-topology-operations-all-{stream},
-                topoprocessing-csit-1node-topology-operations-only-{stream},
-                tsdr-csit-1node-cassandra-datastore-only-{stream},
-                tsdr-csit-1node-hbase-datastore-only-{stream},
-                tsdr-csit-1node-hsqldb-datastore-only-{stream},
-                usc-csit-1node-channel-only-{stream},
-                usc-csit-1node-channel-all-{stream},
-                usc-csit-1node-tcp-only-{stream},
-                usc-csit-1node-tcp-all-{stream},
-                vtn-csit-1node-manager-only-{stream},
-                vtn-csit-1node-manager-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream}
+            csit-list: '{csit-list-beryllium}'
+            schedule: 'H H * * 6'
 
     # tools system image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-robot-2c-2g
 
     properties:
         - opendaylight-infra-properties:
             jdkversion: '{jre}'
 
     triggers:
-        - timed: 'H H * * 6'
+        - timed: '{schedule}'
 
     builders:
         - trigger-builds:
index ecf14b1b9a450035488e9f95a003b0cbcfdd0270..59f7337648c962e9bfb810640a64991fa15a3567 100644 (file)
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-iotdm-onem2m'
+    install-features: 'odl-onem2mall-iotdm'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'iotdm-distribution-{stream}'
index a72974e9b0aab8f230d6dfdb64b0dc241542273d..a769e7a28b5e21bf52dc2e99db2bb687ac1c7d35 100644 (file)
@@ -2,7 +2,6 @@
     name: iotdm-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: iotdm-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: iotdm-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index f486df6024c4226bf7a79baf400cedfebe7c566c..d0da62a6e30aabdb4e3fa1443978ad15565b1cbe 100644 (file)
@@ -31,9 +31,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Max number of Hosts'
     01-plot-yaxis: 'Network Hosts'
index ff12542b521a454a5481a04d85bb8237ae504839..e6da699f133113c91b16f0006b96ae94cf0c5aa7 100644 (file)
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'
index 3b36a14522a31e7fb4b43a460fa33b8a17206828..cc14b0a818560ef7f3566384be54039dd73ba705 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:5'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},l2switch-distribution-{stream}'
index e1decc799d7fc8922880c1052c3be8077b50c088..0daa6a4e56641df4747c4e14fd535f274074bc73 100644 (file)
@@ -2,7 +2,6 @@
     name: l2switch-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: l2switch-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: l2switch-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 8ac90cbf97d67ed2224b7370ca349a65c2d56549..39de16e90dda030c6d39229c0d052bd689d30f55 100644 (file)
         - all:
             scope: 'all'
 
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415
 
     # Features to install
     install-features: 'odl-lacp-ui'
 
     # Robot custom options
     robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'
index 423a2923bdb6c25f495ec203c5315dcb69c6de25..2e031d7f1d2f8d4474df7d764029871264a1b06d 100644 (file)
@@ -2,7 +2,6 @@
     name: lacp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: lacp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: lacp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index dbdb4e09cea978a209a5ba1249662e93a5ed44fe..b2ba78e89c3a0cf7c469fdc411e1b7c4ba1b1d04 100644 (file)
@@ -34,6 +34,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},neutron-distribution-{stream},lispflowmapping-distribution-{stream}'
index 5efc332b63464be45a1c7e5e88016afac7df87cc..3c162cc5d292150973c5faed7c8d5a1d0e20ef8d 100644 (file)
@@ -31,9 +31,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream},lispflowmapping-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Southbound Map-Reply Rate'
     01-plot-yaxis: 'req/sec'
index db8ab0a705d2d4aaff5d11fdc54a31905c3e0157..21cfe76474471b3080b28032f3047ed7067c7908 100644 (file)
@@ -2,7 +2,6 @@
     name: lispflowmapping-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -31,7 +30,6 @@
     name: lispflowmapping-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -60,7 +58,6 @@
     name: lispflowmapping-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 61f1d14ec32acf862273808fab0f83e0f0082824..88bb7a885446016ada26ddf0a01a3b1b2f697f6b 100644 (file)
@@ -38,6 +38,3 @@
 
     # Additional patterns to archive
     archive-artifacts: '*.xml'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
index 6e70808a706d491502cc186e484ea3b8a1033fa3..17c2685221ea499c205732200ce7fb335c379ea0 100644 (file)
@@ -2,7 +2,6 @@
     name: mdsal-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: mdsal-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: mdsal-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index f2a3357df939c9a56caee14b734d4c191e9d7065..f625154cc9212e7619b4c918bf7a8e64562e6210 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream},messaging4transport-distribution-{stream}'
index 3bf39b5348badfce8c58218ad0bda3873f8dc7b2..f876f7d5831b0740007953aff5c580da45512293 100644 (file)
@@ -2,7 +2,6 @@
     name: messaging4transport-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: messaging4transport-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: messaging4transport-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index a6d246f91f7acfa1e9b0450418731415040e1b5e..f0c2d680025a5e249054d5abacdacfdcce94181d 100644 (file)
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowplugin-distribution-{stream},natapp-distribution-{stream}'
index 3aec5087d2aa02d091c3880819df6f2d60d47925..da68b4dd81177da5f861febc10e08e6e42280400 100644 (file)
@@ -2,7 +2,6 @@
     name: natapp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: natapp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index dc6a21119fa1161f17a75dbacb51d5fc43398581..f575c9e267e531c1ce41efccf7bf089181f63be1 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'nemo-distribution-{stream}'
index 530afd30ac2be41d7b99f153590e8e36d928304d..50d259bda4074063c34e71621763125ca9b2e13a 100644 (file)
@@ -2,7 +2,6 @@
     name: nemo-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: nemo-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: nemo-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 3bdbcf751c96917657c0f6d4a0eb4c65c269a8a8..c195e532d94f5df7f2bc4db57bf632d423a92121 100644 (file)
@@ -34,9 +34,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs:
-        controller-distribution-{stream},
-        netconf-distribution-{stream},
-        integration-distribution-merge-{stream}
index 751ee7024f60e6d3c3cd7e604ef9365d1d0a4cfd..d8c1d4b0e41c72191e404461882fcbb87197a954 100644 (file)
@@ -32,8 +32,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # This scaling test can take several hours to finish,
-    # so the job is defined to run once a day.
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
index dc8aa3d06a8517599f985161f5ba051515f1a193..0f24660244501c70661866b3fabc29dfc833e36c 100644 (file)
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'
index 2f9f6455b50a0ae81d00b90d5001c9c2c1106839..3549a3bfcb1ca2089fd297786bb4bee9e3928733 100644 (file)
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # This scaling test can take several hours to finish,
-    # so the job is defined to run once a day.
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # ODL system configuration
     odl_system_flavor: 8 GB General Purpose v1
index ab26168116fe7d955a3ca360e39df02b29488e9f..bbf91ebc8eb02147138dfd2eaa9e04d44b752e2d 100644 (file)
@@ -37,6 +37,3 @@
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'
index 792311c9d9bdbb012471d9a1b4b1b4bd2ac833fd..468e00134de516b3686b641bcb8393d170440456 100644 (file)
@@ -2,7 +2,6 @@
     name: netconf-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: netconf-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: netconf-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 436170333515e4ca84b58eda1b1b1f301269101e..65e8680464f3834ad1b83d167596eb5471470774 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},netide-distribution-{stream}'
index 999d115a28fb9876925abf77c35054cd63c130e2..68d5bcd1c940607c5ad7d40b787b6166c4440e2e 100644 (file)
@@ -2,7 +2,6 @@
     name: netide-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: netide-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: netide-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 8e310c787b9c9c2b98facfde6ba6ce7cd46f0506..e8d66d20f6778efe2ca4860f3851954016dae797 100644 (file)
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - mitaka - 20170106-2237'
+            openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170130-0523'
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: 'CentOS 7 - devstack-newton - 20170130-0426'
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: 'CentOS 7 - devstack-newton - 20170130-0426'
 
     odl-enable-l3: 'yes'
 
index d7b665bbb340f6929325068ba68a628b49110bce..15731ac4e9292c93ea7a0207dba329c72808e87b 100644 (file)
@@ -31,6 +31,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'netvirt-distribution-{stream},ovsdb-distribution-{stream}'
index 924d3243c07d900105e22978f5f569fe896f7427..cb0d0f4e80d2ba789993a89b4772ad7388741d75 100644 (file)
@@ -23,7 +23,7 @@
     # The project name
     functionality:
         - upstream:
-            schedule: 'H H * * *'
+            schedule: ''
         - gate:
             schedule: ''
 
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: CentOS 7 - devstack - mitaka - 20170106-2237
+            openstack_system_image: CentOS 7 - devstack-mitaka - 20170130-0523
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
+            openstack_system_image: CentOS 7 - devstack-newton - 20170130-0426
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
-            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
+            openstack_system_image: CentOS 7 - devstack-newton - 20170130-0426
 
     odl-enable-l3: 'yes'
 
index 91e12f4b97f413e2c9a178df352dd617b046e3d8..34b88e909e4215dee6b026d01a1d89250a9b4e47 100644 (file)
@@ -36,6 +36,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},netvirt-distribution-{stream},ovsdb-distribution-{stream}'
diff --git a/jjb/netvirt/netvirt-vpnservices-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-vpnservices-csit-hwvtep-openstack.yaml
new file mode 100644 (file)
index 0000000..2700bdc
--- /dev/null
@@ -0,0 +1,91 @@
+- project:
+    name: netvirt-vpnservices-csit-hwvtep-openstack-integration
+    jobs:
+        - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt-vpnservices'
+
+    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: 'H H * * *'
+            sg-mode: 'transparent'
+        - upstream-stateful:
+            schedule: 'H H * * *'
+            sg-mode: 'stateful'
+        - upstream-learn:
+            schedule: 'H H * * *'
+            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: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+
+    openstack:
+        - mitaka:
+            openstack-branch: 'stable/mitaka'
+            odl-ml2-branch: 'stable/mitaka'
+            odl-ml2-driver-version: 'v1'
+            openstack_system_image: 'CentOS 7 - devstack - mitaka - 20170106-2237'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'stable/newton'
+            odl-ml2-driver-version: 'v1'
+            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+        - newton-nodl-v2:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'stable/newton'
+            odl-ml2-driver-version: 'v2'
+            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+
+    tools_system_count: 2
+
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414'
+
+    odl-enable-l3: 'yes'
+
+    public-bridge: 'br-physnet1'
+
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+
+    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
+
+    tenant-network-type: 'vxlan'
+
+    security-group-mode: '{sg-mode}'
+
+    robot-options: ''
index 06fd014274da0a247257bdfca978faa79da81e37..2814724438f61ad6652dc6ea4073ca93c6667668 100644 (file)
@@ -2,7 +2,6 @@
     name: netvirt-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
     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]'
+    dependencies: 'genius-merge-{stream},neutron-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
 
 - project:
     name: netvirt-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
     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]'
+    dependencies: 'genius-merge-{stream},neutron-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
 
 - project:
     name: netvirt-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -87,7 +84,6 @@
     name: netvirt-vpp
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
     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]'
+    dependencies: 'genius-merge-{stream},neutron-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
     archive-artifacts: ''
index 633b377ed7db85e821d2d204c1efe7b70138e851..202629ed8fa8821b9b6b979b5036b190e4f25b6d 100644 (file)
@@ -2,7 +2,6 @@
     name: neutron-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -31,7 +30,6 @@
     name: neutron-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: neutron-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index e53c2bf50af6a4bf5463c52d2514c714e94a8769..6d586f92dac5b1cbeb9bd78c8294bfc77df0692d 100644 (file)
@@ -2,7 +2,6 @@
     name: next-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: next-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: next-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 3e2fec7ba933cd5d3abee5693e75a6d3ab9c4330..2b3e4da0fcf7519eae6300cc8285e733f9e133a5 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'nic-distribution-{stream},vtn-distribution-{stream}'
index 16bf3c78622af680c2d1483a762c8aaea3acf412..1944af84a49eefb2ed552c1a041c74590d2b297f 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'nic-distribution-{stream},vtn-distribution-{stream}'
index 448eb76e2e3436bc3709eec693b13b4ee272eb0c..0c3a965c15bdf9d2fbec2ac323df080fa530748e 100644 (file)
@@ -2,7 +2,6 @@
     name: nic-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: nic-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: nic-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 0d00827bc6de337005b35667dbe216865dcac2c2..c27a0721112161e6787ad7dfd4356d36c49c0886 100644 (file)
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ocpplugin-distribution-{stream}'
index 12644994da9a9d85349b321049043c2aa7d73106..f550aa50538abf8b192056bad4167072e390aa62 100644 (file)
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ocpplugin-distribution-{stream}'
index 4795b7b6cda0989fd624fd1f80ad36fc2f0740b1..0a9aa7d916dc9b154ef47a5ca4338d5219803bac 100644 (file)
@@ -2,7 +2,6 @@
     name: ocpplugin-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: ocpplugin-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index df84b5a647115e01af0bb3f5c0b5d9b334f93ac3..58e44299e9c786e4c95bc4dcca73a49c7fb33074 100644 (file)
@@ -2,7 +2,6 @@
     name: odlparent-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: odlparent-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: odlparent-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index acad73675eee59c1d2922869948ccd4b926cc742..a2800d1d45d03a5fc03fa303d7cb6eca80f1d6c4 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'of-config-distribution-{stream}'
index 1885224667a2bd6c9970115942eb87b39190bc2b..ba9909535c309e6cc0d8a7d06e6ee1cc825284a1 100644 (file)
@@ -2,7 +2,6 @@
     name: of-config-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: of-config-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: of-config-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 04e990773f0ead5984cb1e5533cd0f287e088058..12f7c54e11cc3ea85cd927b43b2eb5308770dcb6 100644 (file)
@@ -2,7 +2,6 @@
     name: circuitsw-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: circuitsw-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: circuitsw-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index f44ac51079794a844d02635f17ade872e8ec106f..4c59d8c61bb27bf8a82696e0b3bf1c9cd43ef628 100644 (file)
@@ -5,12 +5,40 @@ pip install --upgrade pip
 pip install --upgrade python-openstackclient python-heatclient
 pip freeze
 
-DELETE_LIST=(`openstack --os-cloud rackspace stack list -f json | \
-              jq -r '.[] | \
-                     select((."Stack Status" == "CREATE_FAILED") or \
-                            (."Stack Status" == "DELETE_FAILED")) | \
-                     ."Stack Name"'`)
-for i in "${DELETE_LIST[@]}"; do
-    echo "Deleting stack $i"
-    openstack --os-cloud rackspace stack delete --yes $i
+#########################
+## FETCH ACTIVE BUILDS ##
+#########################
+# Fetch stack list before fetching active builds to minimize race condition
+# where we might be try to delete stacks while jobs are trying to start
+OS_STACKS=(`openstack --os-cloud rackspace stack list \
+            -f json -c "Stack Name" -c "Stack Status" \
+            --property "stack_status=CREATE_COMPLETE" \
+            --property "stack_status=DELETE_FAILED" \
+            --property "stack_status=CREATE_FAILED" \
+            | jq -r '.[] | ."Stack Name"'`)
+
+# Make sure we fetch active builds on both the releng and sandbox silos
+ACTIVE_BUILDS=()
+for silo in releng sandbox; do
+    JENKINS_URL="https://jenkins.opendaylight.org/$silo//computer/api/json?tree=computer[executors[currentExecutable[url]],oneOffExecutors[currentExecutable[url]]]&xpath=//url&wrapper=builds"
+    wget --no-verbose -O $silo_builds.json $JENKINS_URL
+    sleep 1  # Need to sleep for 1 second otherwise next line causes script to stall
+    ACTIVE_BUILDS=(${ACTIVE_BUILDS[@]} ` \
+        jq -r '.computer[].executors[].currentExecutable.url' $silo_builds.json \
+        | grep -v null | awk -F'/' '{print $6 "-" $7}'`)
+done
+
+##########################
+## DELETE UNUSED STACKS ##
+##########################
+# Search for stacks taht are not in use by either releng or sandbox silos and
+# delete them.
+for stack in ${OS_STACKS[@]}; do
+    if [[ "${ACTIVE_BUILDS[@]}" =~ $stack ]]; then
+        # No need to delete stacks if there exists an active build for them
+        continue
+    else
+        echo "Deleting orphaned stack: $stack"
+        openstack --os-cloud rackspace stack delete --yes $stack
+    fi
 done
diff --git a/jjb/opendaylight-infra-push-gerrit-patch.sh b/jjb/opendaylight-infra-push-gerrit-patch.sh
new file mode 100644 (file)
index 0000000..6679d27
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/bash
+CHANGE_ID=`ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query \
+               limit:1 owner:self is:open project:{project} \
+               message:'{gerrit-commit-message}' \
+               topic:{gerrit-topic} | \
+               grep 'Change-Id:' | \
+               awk '{{ print $2 }}'`
+
+if [ -z "$CHANGE_ID" ]; then
+    git commit -sm "{gerrit-commit-message}"
+else
+    git commit -sm "{gerrit-commit-message}" -m "Change-Id: $CHANGE_ID"
+fi
+
+git status
+git remote add gerrit ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/builder.git
+
+# Don't fail the build if this command fails because it's possible that there
+# is no changes since last update.
+git review --yes -t {gerrit-topic} || true
index 52d450a7162786651ec17d1b84fae711f495c21e..5b17b9b107b3dad9e115d02fc01ae7f7baba8a7b 100644 (file)
@@ -9,9 +9,25 @@ cd /builder/openstack-hot
 
 JOB_SUM=`echo $JOB_NAME | sum | awk '{{ print $1 }}'`
 VM_NAME="$JOB_SUM-$BUILD_NUMBER"
-openstack --os-cloud rackspace stack create --wait --timeout 15 -t {stack-template} -e $WORKSPACE/opendaylight-infra-environment.yaml --parameter "job_name=$VM_NAME" --parameter "silo=$SILO" $STACK_NAME
-OS_STATUS=`openstack --os-cloud rackspace stack show -f json -c stack_status $STACK_NAME | jq -r '.stack_status'`
-if [ "$OS_STATUS" != "CREATE_COMPLETE" ]; then
-    echo "Failed to initialize infrastructure. Quitting..."
-    exit 1
-fi
+
+# seq X refers to waiting for X minutes for OpenStack to return
+# a status that is not CREATE_IN_PROGRESS before giving up.
+OS_TIMEOUT=15  # Minutes to wait for OpenStack VM to come online
+openstack --os-cloud rackspace stack create --timeout $OS_TIMEOUT -t {stack-template} -e $WORKSPACE/opendaylight-infra-environment.yaml --parameter "job_name=$VM_NAME" --parameter "silo=$SILO" $STACK_NAME
+echo "Waiting for $OS_TIMEOUT minutes to create $STACK_NAME."
+for i in `seq $OS_TIMEOUT`; do
+    sleep 60
+    OS_STATUS=`openstack --os-cloud rackspace stack show -f json -c stack_status $STACK_NAME | jq -r '.stack_status'`
+    if [ "$OS_STATUS" == "CREATE_COMPLETE" ]; then
+        echo "Stack initialized on infrastructure successful."
+        break
+    elif [ "$OS_STATUS" == "CREATE_FAILED" ]; then
+        echo "ERROR: Failed to initialize infrastructure. Quitting..."
+        exit 1
+    elif [ "$OS_STATUS" == "CREATE_IN_PROGRESS" ]; then
+        echo "Waiting to initialize infrastructure."
+        continue
+    else
+        echo "Unexpected status: $OS_STATUS"
+    fi
+done
index d399af964eb89fc8c7725b9896ff51395500b492..ed098fd66429d1686976fcea8f4c1414a9bace2d 100644 (file)
@@ -2,7 +2,6 @@
     name: openflowjava-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: openflowjava-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: openflowjava-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index de59d6fc2b85c1bfa8ea79d00d8547cf350f592f..4ac442e6c840e0fcead4e2fb65c84b2e7cc162b3 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'
index edd6e4b9ee1f6764e8dc361f769439d6ca136dda..8fdb4052aa073c7abac70b2e934f527a0063a766 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'
index e9149f4ae7feada50cc033fa18fa6a9cf865eb62..9103bf64ffe86e471a2f777b3e32119eba9e623a 100644 (file)
@@ -24,6 +24,3 @@
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
index ca6bf88251c66dccdb37112c72637dac0e215cf7..c108689fb2f730a84d987aa5d8aac6937e2744c8 100644 (file)
@@ -27,6 +27,3 @@
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
index fc77dc7dca5a31a3618e083adcfda989c0480fa0..739c3415c05da89ba86478063322a5a2dbcd5f38 100644 (file)
@@ -28,9 +28,6 @@
     # 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'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index a507761ea80d5773cd19156305ef02d9a981f1c0..2b48e8c430a5cfc171d4135ebd5c988f76e39042 100644 (file)
@@ -24,7 +24,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index 843d15e4c76138ba886adb0a7716701e8ef2d47c..0921246f54d6d45ff77e6f75f3cba16a9a4d2b61 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count_per_switch:2000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index 3c245f23fb1cf9a82266d1191f83f776f7bfcf38..98899010b0eeb0f8bbdcf5d38d4a28428db17295 100644 (file)
@@ -24,7 +24,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index d4c2e22a41249fa27c6cf25e68d741bf8d2fb04d..a27a1330b4d85e55e9bae6e364e3aafc569c4009 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'
index 3260786da724c64e592878e43e20b80043682018..bca1b51964f5d64f5fea4f0d3458dffaa2d32bcf 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'
index 9369afefc2ac2b30df05a992ab87ba9dd548b92b..00ee09ee25abe306926ca1ace09b2051fed2cbb3 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'
index 18840b86139f962110cd78bc76e51ee947d2c347..718fd413b48678725f3964fe0c9cfce30d15f8fb 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Throughput Mode'
     01-plot-yaxis: 'flow_mods/sec'
index 99091cfed75e7a35c2cbec930822b6ab183a8b66..fad490aa32bfdd334795cf1da87869620693c4e4 100644 (file)
@@ -24,6 +24,3 @@
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
index c10d0975023f429c8504b7f1e5b0f64d8ba90ad5..cac04bd85bc142308533273e5cb999d507eead80 100644 (file)
@@ -30,7 +30,4 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414'
index 829aaeec787b8ab735ff07cce2014caac8ee899a..9a9d31f8adf9076828834788873a1a2800409f61 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Flow REST API Rate'
     01-plot-yaxis: 'http_req/sec'
index c24df399ed46cb9a0b94355ed683a5a51616a4b1..7197a4125efdc32c58ce7d1355b269573456545a 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
     # Plot Info
     01-plot-title: 'Flow REST API Rate'
     01-plot-yaxis: 'http_req/sec'
index ae0718ea0b4e75e17d3a94a2c2260e9c8957d20a..9c6c360861ca4e879087fbd1fe2e31c455a0e657 100644 (file)
@@ -30,7 +30,4 @@
     robot-options: '-v flow_update_time:30s'
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
index f4eff57e5228bd22116b17a9b22bb83c666693e3..55b6f2aaa185e4ee35f81ef2d060a67c13a3f167 100644 (file)
@@ -28,7 +28,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
index d76163a49245b2b180abc89196867917807ff6af..1a762b4b811b64e69e95516b1ac5c1b2ed421be5 100644 (file)
@@ -32,7 +32,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
index 0cbce891404d99f2184138d9aa79789b089cedd5..49297549df5a73c4612d278e0ca9be69a5551fd6 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Maxmum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'
index f45aa573057ae5c35525bbcb6af4ecc04e53c98f..12ade29745a6c1fdc66a9f21cb0356697d160391 100644 (file)
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
 
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'
index be18e675ee390f408146d897f4658b2a80cb9c48..09832e77f92ed07aa9daf7f9c0a6451883242443 100644 (file)
@@ -25,6 +25,3 @@
 
     # Robot custom options
     robot-options: '-v TEST_LENGTH:23h'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
index 3debf748cdd8d4b99fbf10c6a5d567a2b6ed9698..bac6e772c3a5ffd0b50053de8c36c5207eb83e6f 100644 (file)
@@ -30,7 +30,7 @@
     robot-options: '-v TEST_LENGTH:23h'
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
+    # Trigger jobs (on saturday)
+    schedule: 'H H * * 6'
index 796951c11fb26759f6d183861b233d31e0087c71..ced3ab35f560021d636d6049dce0a31304084c52 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium -v oper_ds_timeout:1000 -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index f984d9b0f7bf442549bb8f43bc71b45476473b6c..8141a2e73a695890522f2c07c226f0fbe7d1a9b7 100644 (file)
@@ -24,7 +24,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index 7b30d5a3a69e9cb6dd5beb0de8958186d2406826..d05faddebb4f2126fae0db74155fccedc3af0718 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:helium -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index adb77dd6ea3a27503ca8c3dbd4ec4afa40550cfa..38835bc91f615ae4cf087381f9e3f38af5ce0665 100644 (file)
@@ -24,7 +24,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'
@@ -32,9 +32,6 @@
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flow Add rate'
     01-plot-yaxis: 'flow_mods/sec'
index 5d7c7d92bd241b9a6006045313b107eac7c363d1..0bf0cc6c0b2d512a84e96f135b9c88256e554c71 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'
index 1fd2c9ab0d26cf90ad4895f532d96007a04943af..c124bbc9ea8706f8cb6a529616761ec1bea67b1e 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'REST setup rate (for 100k flows)'
     01-plot-yaxis: 'setup time[s], req[flows/s]'
index 8e702b6b9d902bd6ba659374fcb232fb0894a574..4faf10197ed19d04f7f4b070b1700538af280283 100644 (file)
@@ -24,6 +24,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
index 9e31b0a3fc7c873ddd3b5dfcb1967bf5631700d7..66750821c8ca8df91459e73b9d7a1bcb1e1f4583 100644 (file)
@@ -27,6 +27,3 @@
 
     # Robot custom options
     robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
index c74001a68a80098e4cc0fc7b91a15b1eccd5a097..32abb0a37e75e72da653726c1d17fcfde2d084e5 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'
     01-plot-yaxis: '[s]'
index 2a2854b819f2b42398c8b1e7e41cd7da159042ea..1a59ff240429fe574f035a322abd18a7fc3cc8fd 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'
     01-plot-yaxis: '[s]'
index 033fe811bb2df7e68b570a3e36fa345a8de6b79e..7892556b452cb832e6bda785d1ec9b2aa335d215 100644 (file)
@@ -28,9 +28,6 @@
     # Robot custom options
     robot-options: '-v flnr:50000'
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'
     01-plot-yaxis: '[s]'
index e9b87608a495c047af2f68d22457704c98095192..574b623b17cf8836ba702840cfc7ded318da2061 100644 (file)
@@ -25,9 +25,6 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
     01-plot-yaxis: 'Switches'
index de535f19091449f45dfd5d4e59be17f7d5658f3b..60a98e8a5cfd42ceab6bf1658a0e2e6f08eb66ce 100644 (file)
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
 
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
index 7e7db5a7d22b9f673e3a371bb3792207ea044027..aa8228d20177479d2fef683afe2bd772c1c22fca 100644 (file)
@@ -2,7 +2,6 @@
     name: openflowplugin-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: openflowplugin-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: openflowplugin-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index fffaad026ab9a666e28d85cbd258c4e6314a85ac..07117bb3cb0aec022b51138037d95fd6bd0ab92d 100644 (file)
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream}'
index 01deef60a5211a24499503927895af7a17d780bb..1a8ccf533a3a42655a8452a8504c03c0ac6817c3 100644 (file)
@@ -31,9 +31,6 @@
     # Robot custom options
     robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
 
-    # Trigger jobs (daily)
-    schedule: ''
-
     # Plot Info
     01-plot-title: 'Max number of Switches'
     01-plot-yaxis: 'OpenFlow Switches'
index cef56dea87ed40bba38db02c45456911ad89ab0a..92dc18a4ce94b005248305c21981f735d11e1746 100644 (file)
@@ -35,6 +35,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream}'
index 189317cfa04b8820c1faced68d8b3a9e6d9f447b..07cd2074f761286d76c47445923e325793cbdae2 100644 (file)
@@ -2,7 +2,6 @@
     name: ovsdb-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: ovsdb-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: ovsdb-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index eab6d659d8ab19ce9f86a66ce302c1c21b77ac33..513bd9e59aab24180dd874fddbb414589c71809b 100644 (file)
@@ -4,11 +4,11 @@
 
     jobs:
         - '{project-name}-verify-python-{stream}'
-        - '{project-name}-build-rpm-{stream}'
-        - '{project-name}-build-rpm-snap-{stream}'
-        - '{project-name}-build-deb-{stream}'
-        - '{project-name}-test-rpm-{stream}'
-        - '{project-name}-test-puppet-{stream}'
+        - 'packaging-build-rpm-{stream}'
+        - 'packaging-build-rpm-snap-{stream}'
+        - 'packaging-build-deb-{stream}'
+        - 'packaging-test-rpm-{stream}'
+        - 'packaging-test-puppet-{stream}'
 
     project: 'integration/packaging'
 
@@ -17,7 +17,7 @@
             branch: 'master'
 
 - job-template:
-    name: '{project-name}-test-puppet-{stream}'
+    name: 'packaging-test-puppet-{stream}'
 
     node: centos7-docker-2c-4g
 
@@ -51,9 +51,9 @@
         - timed: '@daily'
 
 - job-template:
-    name: '{project-name}-build-rpm-{stream}'
+    name: 'packaging-build-rpm-{stream}'
 
-    node: dynamic_verify
+    node: centos7-java-builder-2c-4g
 
     project-type: freestyle
 
         artifacts: '**/*.rpm'
 
 - job-template:
-    name: '{project-name}-build-rpm-snap-{stream}'
+    name: 'packaging-build-rpm-snap-{stream}'
 
-    node: dynamic_verify
+    node: centos7-java-builder-2c-4g
 
     project-type: freestyle
 
          artifacts: '**/*.rpm'
 
 - job-template:
-    name: '{project-name}-test-rpm-{stream}'
+    name: 'packaging-test-rpm-{stream}'
 
-    node: dynamic_verify
+    node: centos7-java-builder-2c-4g
 
     parameters:
         - opendaylight-infra-parameters:
          artifacts: '**'
 
 - job-template:
-    name: '{project-name}-build-deb-{stream}'
+    name: 'packaging-build-deb-{stream}'
 
     node: ubuntu_mininet
 
index 357cbbb1aba7b5c2e675f0621f84b708fae89694..486edac85b702cb1bc891a89d1b530594c47da93 100644 (file)
@@ -33,7 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        packetcable-distribution-merge-{stream}
index 3973fbd2347557ee9e56cda57833e320916a2b4e..3b5bf16be4be9cd2a59317c03efe708bd93f672d 100644 (file)
@@ -2,7 +2,6 @@
     name: packetcable-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: packetcable-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: packetcable-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 503ab86153c09686988126fc07a5c2e2a882bee1..f2fb88b077d3bab7b58700926ac2e786fd419632 100644 (file)
@@ -2,7 +2,6 @@
     name: persistence-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -29,7 +28,6 @@
     name: persistence-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -56,7 +54,6 @@
     name: persistence-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index 6fdb920d28c64181596c40c665ac821873804369..80b4a14462cba0642ea1d7ba4c1111b5cbe342eb 100644 (file)
     docker_system_image: CentOS 7 - docker - 20170120-1434
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170120-1817
+    odl_system_image: CentOS 7 - java-builder - 20170126-0058
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     openstack_system_image: CentOS 7 - devstack - 20170120-1710
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170117-0003
+    tools_system_image: Ubuntu 14.04 - mininet - 20170130-0425
 
     # Default Robot framework options
     robot-options: ''
     10-plot-group: ''
     10-inclusion-flag: 'off'
     10-exclude-value: ''
+
+    ### CSIT Test List Variables
+    # Space seperated strings to exclude from CSIT lists
+    csit-list-blacklist: 'longevity gate'
+    # Auto Generated CSIT job lists used
+    # in integration-distribution-test jobs
+    csit-list-carbon: >
+        aaa-csit-1node-authn-all-carbon,
+        aaa-csit-1node-authn-only-carbon,
+        aaa-csit-1node-idmlite-all-carbon,
+        aaa-csit-1node-idmlite-only-carbon,
+        alto-csit-1node-setup-all-carbon,
+        alto-csit-1node-setup-only-carbon,
+        armoury-csit-1node-basic-all-carbon,
+        armoury-csit-1node-basic-only-carbon,
+        bgpcep-csit-1node-periodic-bgp-ingest-all-carbon,
+        bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-carbon,
+        bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-carbon,
+        bgpcep-csit-1node-periodic-bgp-ingest-only-carbon,
+        bgpcep-csit-1node-periodic-throughpcep-all-carbon,
+        bgpcep-csit-1node-periodic-throughpcep-only-carbon,
+        bgpcep-csit-1node-userfeatures-all-carbon,
+        bgpcep-csit-1node-userfeatures-only-carbon,
+        bgpcep-csit-3node-periodic-bgpclustering-all-carbon,
+        bgpcep-csit-3node-periodic-bgpclustering-ha-only-carbon,
+        bgpcep-csit-3node-periodic-bgpclustering-only-carbon,
+        capwap-csit-1node-ac-all-carbon,
+        capwap-csit-1node-ac-only-carbon,
+        centinel-csit-1node-basic-all-carbon,
+        centinel-csit-1node-basic-only-carbon,
+        controller-csit-1node-akka1-all-carbon,
+        controller-csit-1node-akka1-only-carbon,
+        controller-csit-1node-periodic-benchmark-all-carbon,
+        controller-csit-1node-periodic-benchmark-only-carbon,
+        controller-csit-1node-rest-cars-perf-all-carbon,
+        controller-csit-1node-rest-cars-perf-only-carbon,
+        controller-csit-3node-clustering-all-carbon,
+        controller-csit-3node-clustering-only-carbon,
+        controller-csit-3node-periodic-benchmark-all-carbon,
+        controller-csit-3node-periodic-benchmark-only-carbon,
+        controller-csit-3node-rest-clust-cars-perf-only-carbon,
+        daexim-csit-1node-basic-only-carbon,
+        didm-csit-1node-discovery-only-carbon,
+        distribution-csit-1node-userfeatures-all-carbon,
+        distribution-csit-1node-userfeatures-only-carbon,
+        eman-csit-1node-model-all-carbon,
+        eman-csit-1node-model-only-carbon,
+        genius-csit-1node-genius-all-carbon,
+        genius-csit-1node-genius-only-carbon,
+        groupbasedpolicy-csit-1node-3-node-all-carbon,
+        groupbasedpolicy-csit-1node-3-node-only-carbon,
+        groupbasedpolicy-csit-1node-6node-all-carbon,
+        groupbasedpolicy-csit-1node-6node-only-carbon,
+        groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon,
+        groupbasedpolicy-csit-1node-openstack-mitaka-openstack-carbon,
+        groupbasedpolicy-csit-1node-sxp-only-carbon,
+        groupbasedpolicy-csit-3node-clustering-all-carbon,
+        groupbasedpolicy-csit-3node-clustering-only-carbon,
+        iotdm-csit-1node-basic-all-carbon,
+        iotdm-csit-1node-basic-only-carbon,
+        l2switch-csit-1node-periodic-host-scalability-daily-only-carbon,
+        l2switch-csit-1node-scalability-all-carbon,
+        l2switch-csit-1node-scalability-only-carbon,
+        l2switch-csit-1node-switch-all-carbon,
+        l2switch-csit-1node-switch-only-carbon,
+        lacp-csit-1node-lacp-all-carbon,
+        lacp-csit-1node-lacp-only-carbon,
+        lispflowmapping-csit-1node-msmr-all-carbon,
+        lispflowmapping-csit-1node-msmr-only-carbon,
+        lispflowmapping-csit-1node-performance-only-carbon,
+        lispflowmapping-csit-3node-msmr-all-carbon,
+        lispflowmapping-csit-3node-msmr-only-carbon,
+        mdsal-csit-1node-periodic-bindingv1-only-carbon,
+        messaging4transport-csit-1node-basic-all-carbon,
+        messaging4transport-csit-1node-basic-only-carbon,
+        natapp-csit-1node-basic-all-carbon,
+        natapp-csit-1node-basic-only-carbon,
+        nemo-csit-1node-engine-all-carbon,
+        nemo-csit-1node-engine-only-carbon,
+        netconf-csit-1node-periodic-scale-all-carbon,
+        netconf-csit-1node-periodic-scale-only-carbon,
+        netconf-csit-1node-userfeatures-all-carbon,
+        netconf-csit-1node-userfeatures-only-carbon,
+        netconf-csit-3node-cluster-stress-all-carbon,
+        netconf-csit-3node-cluster-stress-only-carbon,
+        netconf-csit-3node-clustering-all-carbon,
+        netconf-csit-3node-clustering-only-carbon,
+        netconf-csit-3node-periodic-clustering-scale-all-carbon,
+        netconf-csit-3node-periodic-clustering-scale-only-carbon,
+        netide-csit-1node-basic-all-carbon,
+        netide-csit-1node-basic-only-carbon,
+        netvirt-csit-1node-openstack-mitaka-upstream-learn-carbon,
+        netvirt-csit-1node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-mitaka-upstream-transparent-carbon,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+        netvirt-csit-1node-openstack-newton-upstream-learn-carbon,
+        netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-3node-openstack-mitaka-upstream-learn-carbon,
+        netvirt-csit-3node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-mitaka-upstream-transparent-carbon,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+        netvirt-csit-3node-openstack-newton-upstream-learn-carbon,
+        netvirt-csit-3node-openstack-newton-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-newton-upstream-transparent-carbon,
+        netvirt-legacy-csit-1node-openstack-basic-all-carbon,
+        netvirt-legacy-csit-1node-openstack-basic-only-carbon,
+        netvirt-legacy-csit-1node-openstack-mitaka-upstream-carbon,
+        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-carbon,
+        netvirt-legacy-csit-1node-openstack-newton-upstream-carbon,
+        netvirt-legacy-csit-3node-clustering-only-carbon,
+        netvirt-legacy-csit-3node-openstack-mitaka-upstream-carbon,
+        netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-carbon,
+        netvirt-legacy-csit-3node-openstack-newton-upstream-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-learn-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-learn-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-stateful-carbon,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-transparent-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-learn-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
+        nic-csit-1node-basic-all-carbon,
+        nic-csit-1node-basic-only-carbon,
+        nic-csit-1node-vtnrenderer-all-carbon,
+        nic-csit-1node-vtnrenderer-only-carbon,
+        ocpplugin-csit-1node-get-all-carbon,
+        ocpplugin-csit-1node-get-only-carbon,
+        ocpplugin-csit-1node-scalability-all-carbon,
+        ocpplugin-csit-1node-scalability-only-carbon,
+        of-config-csit-1node-basic-all-carbon,
+        of-config-csit-1node-basic-only-carbon,
+        openflowplugin-csit-1node-cbench-performance-only-carbon,
+        openflowplugin-csit-1node-config-performance-only-carbon,
+        openflowplugin-csit-1node-flow-services-all-carbon,
+        openflowplugin-csit-1node-flow-services-frs-only-carbon,
+        openflowplugin-csit-1node-flow-services-only-carbon,
+        openflowplugin-csit-1node-periodic-bulk-matic-ds-daily-only-carbon,
+        openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-carbon,
+        openflowplugin-csit-1node-periodic-cbench-daily-only-carbon,
+        openflowplugin-csit-1node-periodic-link-scalability-daily-only-carbon,
+        openflowplugin-csit-1node-periodic-restconf-perf-daily-only-carbon,
+        openflowplugin-csit-1node-periodic-rpc-time-measure-daily-only-carbon,
+        openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-carbon,
+        openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-carbon,
+        openflowplugin-csit-1node-periodic-sw-scalability-daily-only-carbon,
+        openflowplugin-csit-1node-scalability-only-carbon,
+        openflowplugin-csit-3node-clustering-only-carbon,
+        openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-carbon,
+        openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-carbon,
+        openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-carbon,
+        ovsdb-csit-1node-periodic-scalability-daily-only-carbon,
+        ovsdb-csit-1node-southbound-all-carbon,
+        ovsdb-csit-1node-southbound-only-carbon,
+        ovsdb-csit-3node-clustering-only-carbon,
+        packetcable-csit-1node-pcmm-all-carbon,
+        packetcable-csit-1node-pcmm-only-carbon,
+        sdninterfaceapp-csit-1node-basic-only-carbon,
+        sfc-csit-3node-docker-full-deploy-all-carbon,
+        sfc-csit-3node-docker-full-deploy-only-carbon,
+        sfc-csit-3node-rest-basic-all-carbon,
+        sfc-csit-3node-rest-basic-only-carbon,
+        snmp-csit-1node-basic-all-carbon,
+        snmp-csit-1node-basic-only-carbon,
+        sxp-csit-1node-basic-all-carbon,
+        sxp-csit-1node-basic-only-carbon,
+        sxp-csit-1node-filtering-all-carbon,
+        sxp-csit-1node-filtering-only-carbon,
+        sxp-csit-1node-periodic-performance-all-carbon,
+        sxp-csit-1node-periodic-performance-only-carbon,
+        sxp-csit-1node-topology-all-carbon,
+        sxp-csit-1node-topology-only-carbon,
+        sxp-csit-3node-periodic-clustering-all-carbon,
+        sxp-csit-3node-periodic-clustering-only-carbon,
+        topoprocessing-csit-1node-topology-operations-all-carbon,
+        topoprocessing-csit-1node-topology-operations-only-carbon,
+        tsdr-csit-1node-cassandra-datastore-only-carbon,
+        tsdr-csit-1node-hbase-datastore-all-carbon,
+        tsdr-csit-1node-hbase-datastore-only-carbon,
+        tsdr-csit-1node-hsqldb-datastore-all-carbon,
+        tsdr-csit-1node-hsqldb-datastore-only-carbon,
+        unimgr-csit-1node-basic-all-carbon,
+        unimgr-csit-1node-basic-only-carbon,
+        unimgr-csit-1node-legato-all-carbon,
+        unimgr-csit-1node-legato-only-carbon,
+        usc-csit-1node-channel-all-carbon,
+        usc-csit-1node-channel-only-carbon,
+        usc-csit-1node-tcp-all-carbon,
+        usc-csit-1node-tcp-only-carbon,
+        usecplugin-csit-1node-basic-all-carbon,
+        usecplugin-csit-1node-basic-only-carbon,
+        vtn-csit-1node-coordinator-only-carbon,
+        vtn-csit-1node-manager-all-carbon,
+        vtn-csit-1node-manager-only-carbon,
+        vtn-csit-1node-openstack-mitaka-neutron-carbon,
+        vtn-csit-1node-openstack-newton-neutron-carbon,
+        vtn-csit-3node-manager-all-carbon,
+        vtn-csit-3node-manager-only-carbon,
+        yangtools-csit-1node-periodic-system-only-carbon
+    csit-list-boron: >
+        aaa-csit-1node-authn-all-boron,
+        aaa-csit-1node-authn-only-boron,
+        aaa-csit-1node-idmlite-all-boron,
+        aaa-csit-1node-idmlite-only-boron,
+        alto-csit-1node-setup-all-boron,
+        alto-csit-1node-setup-only-boron,
+        armoury-csit-1node-basic-all-boron,
+        armoury-csit-1node-basic-only-boron,
+        bgpcep-csit-1node-periodic-bgp-ingest-all-boron,
+        bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-boron,
+        bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-boron,
+        bgpcep-csit-1node-periodic-bgp-ingest-only-boron,
+        bgpcep-csit-1node-periodic-throughpcep-all-boron,
+        bgpcep-csit-1node-periodic-throughpcep-only-boron,
+        bgpcep-csit-1node-userfeatures-all-boron,
+        bgpcep-csit-1node-userfeatures-only-boron,
+        bgpcep-csit-3node-periodic-bgpclustering-all-boron,
+        bgpcep-csit-3node-periodic-bgpclustering-ha-only-boron,
+        bgpcep-csit-3node-periodic-bgpclustering-only-boron,
+        capwap-csit-1node-ac-all-boron,
+        capwap-csit-1node-ac-only-boron,
+        centinel-csit-1node-basic-all-boron,
+        centinel-csit-1node-basic-only-boron,
+        controller-csit-1node-akka1-all-boron,
+        controller-csit-1node-akka1-only-boron,
+        controller-csit-1node-periodic-benchmark-all-boron,
+        controller-csit-1node-periodic-benchmark-only-boron,
+        controller-csit-1node-rest-cars-perf-all-boron,
+        controller-csit-1node-rest-cars-perf-only-boron,
+        controller-csit-3node-clustering-all-boron,
+        controller-csit-3node-clustering-only-boron,
+        controller-csit-3node-periodic-benchmark-all-boron,
+        controller-csit-3node-periodic-benchmark-only-boron,
+        controller-csit-3node-rest-clust-cars-perf-only-boron,
+        didm-csit-1node-discovery-only-boron,
+        distribution-csit-1node-userfeatures-all-boron,
+        distribution-csit-1node-userfeatures-only-boron,
+        eman-csit-1node-model-all-boron,
+        eman-csit-1node-model-only-boron,
+        genius-csit-1node-genius-all-boron,
+        genius-csit-1node-genius-only-boron,
+        groupbasedpolicy-csit-1node-3-node-all-boron,
+        groupbasedpolicy-csit-1node-3-node-only-boron,
+        groupbasedpolicy-csit-1node-6node-all-boron,
+        groupbasedpolicy-csit-1node-6node-only-boron,
+        groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron,
+        groupbasedpolicy-csit-1node-openstack-mitaka-openstack-boron,
+        groupbasedpolicy-csit-3node-clustering-all-boron,
+        groupbasedpolicy-csit-3node-clustering-only-boron,
+        l2switch-csit-1node-periodic-host-scalability-daily-only-boron,
+        l2switch-csit-1node-scalability-all-boron,
+        l2switch-csit-1node-scalability-only-boron,
+        l2switch-csit-1node-switch-all-boron,
+        l2switch-csit-1node-switch-only-boron,
+        lacp-csit-1node-lacp-all-boron,
+        lacp-csit-1node-lacp-only-boron,
+        lispflowmapping-csit-1node-msmr-all-boron,
+        lispflowmapping-csit-1node-msmr-only-boron,
+        lispflowmapping-csit-1node-performance-only-boron,
+        lispflowmapping-csit-3node-msmr-all-boron,
+        lispflowmapping-csit-3node-msmr-only-boron,
+        mdsal-csit-1node-periodic-bindingv1-only-boron,
+        messaging4transport-csit-1node-basic-all-boron,
+        messaging4transport-csit-1node-basic-only-boron,
+        natapp-csit-1node-basic-all-boron,
+        natapp-csit-1node-basic-only-boron,
+        nemo-csit-1node-engine-all-boron,
+        nemo-csit-1node-engine-only-boron,
+        netconf-csit-1node-periodic-scale-all-boron,
+        netconf-csit-1node-periodic-scale-only-boron,
+        netconf-csit-1node-userfeatures-all-boron,
+        netconf-csit-1node-userfeatures-only-boron,
+        netconf-csit-3node-cluster-stress-all-boron,
+        netconf-csit-3node-cluster-stress-only-boron,
+        netconf-csit-3node-clustering-all-boron,
+        netconf-csit-3node-clustering-only-boron,
+        netconf-csit-3node-periodic-clustering-scale-all-boron,
+        netconf-csit-3node-periodic-clustering-scale-only-boron,
+        netide-csit-1node-basic-all-boron,
+        netide-csit-1node-basic-only-boron,
+        netvirt-csit-1node-openstack-mitaka-upstream-learn-boron,
+        netvirt-csit-1node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-mitaka-upstream-transparent-boron,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
+        netvirt-csit-1node-openstack-newton-upstream-learn-boron,
+        netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-3node-openstack-mitaka-upstream-learn-boron,
+        netvirt-csit-3node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-mitaka-upstream-transparent-boron,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
+        netvirt-csit-3node-openstack-newton-upstream-learn-boron,
+        netvirt-csit-3node-openstack-newton-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-newton-upstream-transparent-boron,
+        netvirt-legacy-csit-1node-openstack-basic-all-boron,
+        netvirt-legacy-csit-1node-openstack-basic-only-boron,
+        netvirt-legacy-csit-1node-openstack-mitaka-upstream-boron,
+        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-boron,
+        netvirt-legacy-csit-1node-openstack-newton-upstream-boron,
+        netvirt-legacy-csit-3node-clustering-only-boron,
+        netvirt-legacy-csit-3node-openstack-mitaka-upstream-boron,
+        netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-boron,
+        netvirt-legacy-csit-3node-openstack-newton-upstream-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-learn-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-learn-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron,
+        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-learn-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-learn-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-stateful-boron,
+        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron,
+        nic-csit-1node-basic-all-boron,
+        nic-csit-1node-basic-only-boron,
+        nic-csit-1node-vtnrenderer-all-boron,
+        nic-csit-1node-vtnrenderer-only-boron,
+        ocpplugin-csit-1node-get-all-boron,
+        ocpplugin-csit-1node-get-only-boron,
+        ocpplugin-csit-1node-scalability-all-boron,
+        ocpplugin-csit-1node-scalability-only-boron,
+        of-config-csit-1node-basic-all-boron,
+        of-config-csit-1node-basic-only-boron,
+        openflowplugin-csit-1node-cbench-performance-only-boron,
+        openflowplugin-csit-1node-config-performance-only-boron,
+        openflowplugin-csit-1node-flow-services-all-boron,
+        openflowplugin-csit-1node-flow-services-frs-only-boron,
+        openflowplugin-csit-1node-flow-services-only-boron,
+        openflowplugin-csit-1node-periodic-bulk-matic-ds-daily-only-boron,
+        openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-boron,
+        openflowplugin-csit-1node-periodic-cbench-daily-only-boron,
+        openflowplugin-csit-1node-periodic-link-scalability-daily-only-boron,
+        openflowplugin-csit-1node-periodic-restconf-perf-daily-only-boron,
+        openflowplugin-csit-1node-periodic-rpc-time-measure-daily-only-boron,
+        openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-boron,
+        openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-boron,
+        openflowplugin-csit-1node-periodic-sw-scalability-daily-only-boron,
+        openflowplugin-csit-1node-scalability-only-boron,
+        openflowplugin-csit-3node-clustering-only-boron,
+        openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-boron,
+        openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-boron,
+        openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-boron,
+        ovsdb-csit-1node-periodic-scalability-daily-only-boron,
+        ovsdb-csit-1node-southbound-all-boron,
+        ovsdb-csit-1node-southbound-only-boron,
+        ovsdb-csit-3node-clustering-only-boron,
+        packetcable-csit-1node-pcmm-all-boron,
+        packetcable-csit-1node-pcmm-only-boron,
+        sdninterfaceapp-csit-1node-basic-only-boron,
+        sfc-csit-3node-rest-basic-all-boron,
+        sfc-csit-3node-rest-basic-only-boron,
+        snmp-csit-1node-basic-all-boron,
+        snmp-csit-1node-basic-only-boron,
+        sxp-csit-1node-basic-all-boron,
+        sxp-csit-1node-basic-only-boron,
+        sxp-csit-1node-filtering-all-boron,
+        sxp-csit-1node-filtering-only-boron,
+        sxp-csit-1node-topology-all-boron,
+        sxp-csit-1node-topology-only-boron,
+        sxp-csit-3node-periodic-clustering-all-boron,
+        sxp-csit-3node-periodic-clustering-only-boron,
+        topoprocessing-csit-1node-topology-operations-all-boron,
+        topoprocessing-csit-1node-topology-operations-only-boron,
+        tsdr-csit-1node-cassandra-datastore-only-boron,
+        tsdr-csit-1node-hbase-datastore-all-boron,
+        tsdr-csit-1node-hbase-datastore-only-boron,
+        tsdr-csit-1node-hsqldb-datastore-all-boron,
+        tsdr-csit-1node-hsqldb-datastore-only-boron,
+        unimgr-csit-1node-basic-all-boron,
+        unimgr-csit-1node-basic-only-boron,
+        unimgr-csit-1node-legato-all-boron,
+        unimgr-csit-1node-legato-only-boron,
+        usc-csit-1node-channel-all-boron,
+        usc-csit-1node-channel-only-boron,
+        usc-csit-1node-tcp-all-boron,
+        usc-csit-1node-tcp-only-boron,
+        usc-csit-1node-udp-all-boron,
+        usc-csit-1node-udp-only-boron,
+        usecplugin-csit-1node-basic-all-boron,
+        usecplugin-csit-1node-basic-only-boron,
+        vtn-csit-1node-coordinator-only-boron,
+        vtn-csit-1node-manager-all-boron,
+        vtn-csit-1node-manager-only-boron,
+        vtn-csit-1node-openstack-mitaka-neutron-boron,
+        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,
+        armoury-csit-1node-basic-all-beryllium,
+        armoury-csit-1node-basic-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-liberty-openstack-beryllium,
+        groupbasedpolicy-csit-1node-openstack-mitaka-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-cluster-stress-all-beryllium,
+        netconf-csit-3node-cluster-stress-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-mitaka-upstream-beryllium,
+        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-beryllium,
+        netvirt-legacy-csit-1node-openstack-newton-upstream-beryllium,
+        netvirt-legacy-csit-3node-clustering-only-beryllium,
+        netvirt-legacy-csit-3node-openstack-mitaka-upstream-beryllium,
+        netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-beryllium,
+        netvirt-legacy-csit-3node-openstack-newton-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-cbench-performance-only-beryllium,
+        openflowplugin-csit-1node-config-performance-only-beryllium,
+        openflowplugin-csit-1node-flow-services-all-beryllium,
+        openflowplugin-csit-1node-flow-services-only-beryllium,
+        openflowplugin-csit-1node-periodic-bulk-matic-ds-daily-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-rpc-time-measure-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-periodic-scalability-daily-only-beryllium,
+        ovsdb-csit-1node-southbound-all-beryllium,
+        ovsdb-csit-1node-southbound-only-beryllium,
+        ovsdb-csit-3node-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-mitaka-neutron-beryllium,
+        vtn-csit-1node-openstack-newton-neutron-beryllium
+        # CSIT TESTS END SED MARKER
index 4c00833dbea5ef59038f2ec00d319f308a843042..aad8b08f52b12dcbbe12ba22b7c51b3ddffa88a5 100644 (file)
@@ -9,6 +9,7 @@
         - 'builder-verify-packer'
         - 'builder-merge-packer-{platforms}-{templates}'
         - 'builder-delete-stale-stacks'
+        - 'builder-update-csit-tests'
 
     platforms:
         - centos
 #        as there are zero python files (aside docs/conf.py) in releng/builder.
 - job-template:
     name: builder-verify-python
-    node: centos7-java-builder-2c-8g
+    node: centos7-java-builder-2c-4g
 
     project-type: freestyle
 
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-2c-8g
+    node: centos7-java-builder-2c-4g
 
     project-type: freestyle
 
             build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H/6 * * *'
+        # 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
 - job-template:
     name: 'builder-verify-packer'
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-java-builder-2c-4g
     concurrent: true
 
     properties:
 - job-template:
     name: 'builder-merge-packer-{platforms}-{templates}'
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-java-builder-2c-4g
     concurrent: true
 
     properties:
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
+
+- job-template:
+    name: 'builder-update-csit-tests'
+    node: centos7-java-builder-2c-8g
+
+    # builder-update-csit-tests job
+    #
+    # This job's purpose is to update csit
+    # tests to run in integration-distribution-test-{stream}
+    # by updating releng-defaults variables: csit-list-carbon,
+    # csit-list-boron, csit-list-beryllium
+
+    project-type: freestyle
+
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
+
+    scm:
+        - gerrit-trigger-scm:
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - reverse:
+               jobs: 'builder-merge'
+
+    builders:
+        - shell: |
+            git checkout -b auto-update-csit-jobs
+        - integration-list-jobs:
+            blacklist: '{csit-list-blacklist}'
+            search_string: "csit"
+            stream: "carbon"
+            jobs-filename: "csit_jobs_carbon.lst"
+        - integration-list-jobs:
+            blacklist: '{csit-list-blacklist}'
+            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-carbon: >'"
+            ending-regex: "'csit-list-boron: >'"
+            file-with-changes-to-insert: "'csit_jobs_carbon.lst'"
+            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-to-change: "'jjb/releng-defaults.yaml'"
+        - shell: |
+            git status
+            git add jjb/releng-defaults.yaml
+        - opendaylight-infra-push-gerrit-patch:
+            project: "releng/builder"
+            gerrit-topic: "auto-update-csit-jobs"
+            gerrit-commit-message: "Auto Update CSIT Jobs to run"
+
+    publishers:
+        - email-notification:
+            email-recipients: '{email-recipients}'
+            email-prefix: '[releng]'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
index 0371d28a57911b9c5c6c7a21b2300ffb36f03b2b..37425b47fd2fe0c16b163f3e49fe8e7d0f5b1c31 100644 (file)
@@ -15,7 +15,7 @@
             description: 'Parameter to identify an ODL Gerrit project'
         - string:
             name: ARCHIVE_ARTIFACTS
-            default: '{artifacts} **/target/surefire-reports/*-output.txt'
+            default: '{artifacts} **/target/surefire-reports/*-output.txt **/hs_err_*.log'
             description: 'Space separated glob patterns for artifacts to archive into logs.opendaylight.org'
         - string:
             name: GERRIT_PROJECT
             body: |
                 $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
 
-                Check console output at $BUILD_URL to view the results.
+                Please refer to the logs server URL for console logs when possible
+                and use the Jenkins Build URL as a last resort.
+
+                Console Logs URL:
+                https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
+
+                Jenkins Build URL:
+                $BUILD_URL
             unstable: true
             fixed: true
             send-to:
         - postbuildscript:
             builders:
                 - shell: |
+                    #!/bin/bash
                     if [ -d "$WORKSPACE/.venv-openstack" ]; then
                         source $WORKSPACE/.venv-openstack/bin/activate
                         OS_STATUS=`openstack --os-cloud rackspace stack show -f json -c stack_status $STACK_NAME | jq -r '.stack_status'`
-                        if [ "$OS_STATUS" == "CREATE_COMPLETE" ] || [ "$OS_STATUS" == "CREATE_FAILED" ]; then
-                            echo "Deleting $STACK_NAME"
+                        if [ "$OS_STATUS" != "CREATE_IN_PROGRESS" ] && [ "$OS_STATUS" != "DELETE_IN_PROGRESS" ]; then
                             openstack --os-cloud rackspace stack delete --yes $STACK_NAME
                         fi
                     fi
         - shell: !include-raw: opendaylight-infra-stack.sh
         - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
+- builder:
+    name: opendaylight-infra-push-gerrit-patch
+    # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to
+    # Gerrit in an automated fashion. This is meant for tasks that creates
+    # the same patch regularly and needs the ability to detect if an unreviewed
+    # patch already exists. In which case it will update the existing patch.
+    #
+    # Note: This patch assumes the $WORKSPACE contains the project repo with
+    #       the files changed already "git add" and waiting for a "git commit" call.
+    #
+    # This script requires the following JJB variables to be passed in:
+    #     {project}       Gerrit project-name
+    #     {gerrit-topic}  Gerrit topic, please make a unique topic.
+    #     {gerrit-commit-message} Commit message to assign to commit.
+    # NOTE: Requires git review to be installed on node.
+    builders:
+        - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh
+
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
index c952ff116ec830ce01e5f85cb8ac5f2df9db58f7..aa6caa13c92870785d88ee5ea68f53d11d7620cc 100644 (file)
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
-- job-template:
-    name: '{project-name}-distribution-{stream}'
-
-    # Required variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-
-    # Need to keep jobs that deploy to Nexus at end of build as Maven
-    # projects. Maybe reconsider this once upstream moves deploy to a
-    # separate lifecycle:
-    #     https://issues.apache.org/jira/browse/MNG-5666
-    project-type: maven
-    node: '{build-node}'
-    jdk: '{jdk}'
-
-    properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: 'integration/distribution'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - distribute-build-url:
-            path: 'distribution-karaf/src/main/assembly'
-
-    maven:
-        maven-name: 'mvn33'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: 'integration-distribution-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-
 - job-template:
     # Template: {project-name}-distribution-check-{stream}
     # Goal: Build a patch and make sure the distribution can deploy with this change.
         - jacoco-report
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
+        - trigger:
+            project: 'distribution-merge-{stream}'
+            threshold: SUCCESS
 
 - job-template:
     name: '{project-name}-sonar'
index 4a84610156b50067ea2c2c063bcffdf178630a46..a89a6411d546cc43fd5db43d90d1943f2702fcee 100644 (file)
@@ -2,7 +2,6 @@
     name: reservation-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: reservation-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: reservation-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index 26794a1da52ad04c128681596ac3c8eb5f43c6d2..b0fe4acdccfc74cc2ab5415f27821e2ef3f89658 100644 (file)
@@ -31,6 +31,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowplugin-distribution-{stream},sdninterfaceapp-distribution-{stream}'
index ea9086eca51f0c89d3e7cae2a1d703fa4d055e36..ffe1bf9c75b7f18a17d4b1e474f0a81395df6ec8 100644 (file)
@@ -2,7 +2,6 @@
     name: sdninterfaceapp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: sdninterfaceapp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: sdninterfaceapp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 042edc14f44d31d0d6d59c84ecbe39468694cd82..4a3f37131d2c0ef76cd0b512778104371d036771 100644 (file)
@@ -27,6 +27,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},openflowplugin-distribution-{stream},sfc-distribution-{stream}'
index 039238c5c0072f620f5ae0af958247748552f45f..8d60f9fcafd64c42e1077d5cd32c5048153adaaf 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'lispflowmapping-distribution-{stream},ovsdb-distribution-{stream},openflowplugin-distribution-{stream},sfc-distribution-{stream}'
index 9355778ae7d6429f047bf47d2508ad9ca2fb7181..3470a5516b60b00d3f2160f450f2ec14b094965a 100644 (file)
@@ -2,7 +2,6 @@
     name: sfc-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: sfc-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: sfc-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index a56407b60aab4b0f3440d49e0dd63c58d299f341..60ab2c24d354013956bae27da769bb3e9d0c4778 100644 (file)
@@ -2,7 +2,6 @@
     name: snbi-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: snbi-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: snbi-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index d0ba1ca0d859df13a9caf64abb9955330bdf0939..e1fcc8da746c2b01e478ce11160ed2f9a0ffee56 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},snmp-distribution-{stream}'
index 0b4fccdf055fd7925d22bbcc9d0070a61a6d7f4f..68662eafe99f9fa3829c526d7413b3ad92b323de 100644 (file)
@@ -2,7 +2,6 @@
     name: snmp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: snmp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: snmp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index a0fab82be51ff1b55e005890a3b03c48ea3b2e4b..7c23643f1a73444af66c2876a62911e797ec6d9d 100644 (file)
@@ -2,7 +2,6 @@
     name: snmp4sdn-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: snmp4sdn-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: snmp4sdn-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index ae66accb78f1ac0d5de2d9d55b3dd7fba463840c..e3c9584dbb6e287b2531657c07ab82749f4c7881 100644 (file)
     rtdproject: 'opendaylight-spectrometer'
     toxdir: server
     nodedir: web
-    nodever: 4.4.6
+    nodever: 6.9.4
     staging-server: spectrometer03.dfw.opendaylight.org
 
 - job-template:
     name: 'spectrometer-deploy-webapp-master'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-4g
     concurrent: false
 
     properties:
             echo "---> Setup Python"
             if [ -e venv-python34/bin/activate ]; then
                 echo "---> Updating Python dependencies"
+                source venv-python34/bin/activate
             else
                 echo "---> virtualenv not found. Setting up new virtualenv."
-                pyvenv venv-python34
+                pyvenv venv-python34 --without-pip
+                source venv-python34/bin/activate
+                wget https://bootstrap.pypa.io/get-pip.py
+                python get-pip.py
                 pip install -e spectrometer/server
             fi
-            source venv-python34/bin/activate
             pip install --upgrade -r spectrometer/server/requirements.txt
+            pip install --upgrade gunicorn gevent
             pip install --upgrade nodeenv
             pip freeze
 
@@ -75,7 +79,6 @@
                 nodeenv --node={nodever} --prebuilt venv-nodejs
             fi
             source venv-nodejs/bin/activate
-            npm install -g spectrometer/web
             node -v
             npm -v
 
@@ -89,6 +92,7 @@
             pkill node
             sleep 5  # Sleep 5 seconds for cooldown
             cd spectrometer/web
+            npm install
             nohup npm start >> ~/node.out &
 
             EOF
index 076daab658d7df9191909f6120e9d45e60208eae..a374b66aaf9d862765d98c1c8bd7e1e696c64d40 100644 (file)
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'
index 5dbe4126daeeb56b3a789ce1a2ae2153b3700f70..e8a845c9cfb9548bedf4e5b7d1d601523b6d1fea 100644 (file)
@@ -29,7 +29,3 @@
 
     # Robot custom options:
     robot-options: ''
-
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
-
index a964198314f5a37afa5b5ed291f5b53e29ebed17..ecd7d318a6ccd757df22f24d23285e7b77e38087 100644 (file)
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'
index ba2a2594e3df7bbdedf919b27ab7b57bac0b3f2b..ecf8e43d2c317ad8601973b0fa567060a0b77e73 100644 (file)
@@ -26,6 +26,3 @@
 
     # Robot custom options:
     robot-options: ''
-
-    # Trigger jobs: (daily)
-    schedule: 'H H * * *'
index 19e7206c5c6ceace25079f344b85e35d2212f8c0..5b6d6fc987f1d75e0dd344c20f8513f17afe76c2 100644 (file)
@@ -32,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'
index 703876691306c3b86f0e75b2b1d6654f315659c7..d404988abe8198e6d7e05fd2698d5566f4d9b22c 100644 (file)
@@ -2,7 +2,6 @@
     name: sxp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: sxp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: sxp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 041439d6330096d18238b98e877ed4c935c5bf09..91c68f764666c14974a184323a72f0b7962e1e24 100644 (file)
@@ -2,7 +2,6 @@
     name: systemmetrics-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -34,4 +33,4 @@
     branch: 'master'
     mvn-settings: 'systemmetrics-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index e79eca7b4064946dd1adb11b02767bc8d58c710a..29e83fe765dfc8966465772fcb1324a897d81b2d 100644 (file)
@@ -2,7 +2,6 @@
     name: tcpmd5-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -29,7 +28,6 @@
     name: tcpmd5-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -56,7 +54,6 @@
     name: tcpmd5-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 759b1c89700e9afe18058eb61d2e46893bf0a940..52081aaab7919d4a73ad94382af022f0ff4b1dff 100644 (file)
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        aaa-distribution-{stream},
-        integration-distribution-merge-{stream}
index 81a28538599356cf341040f608eb79f23a4ca36e..80e34c6e638a9e3e5346b7ffe902423ed64d6d0b 100644 (file)
@@ -2,7 +2,6 @@
     name: topoprocessing-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: topoprocessing-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: topoprocessing-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index de3b6c4c308d6e2813e78f6b84be713e14a1d06a..c710d3c2a802169c493b636129f284cc4eb2f77b 100644 (file)
@@ -2,7 +2,6 @@
     name: transportpce-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index c08458fd15428d7ff9532feda42553de5b0cdb92..31b3eadafc29c56567ef19bf28f2ce78bedb44f0 100644 (file)
@@ -30,7 +30,4 @@
     install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
-    robot-options: ' '
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+    robot-options: ''
index e75bbb64c7e1e9e66b68ef45529340c7d5abf188..a08d5d29df8ccb6df967dbcf34774b7b78523ebd 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
index 85c6060e427d8a7ad7249dc6a95bf13305a84282..8685354198d87c411c4f10ba99d47ee8d677345f 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
index 5c40b899e4e6885e8608bbe1612a03147e0fd95e..cc1b1a4118fe645d62ccde888f1d04c7bec12600 100644 (file)
@@ -2,7 +2,6 @@
     name: tsdr-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: tsdr-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: tsdr-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 1aabef817bee8aebfa639e4a181f847c3f5f98fb..b7e3f8efc9b316fd8fc861563783bbe4455043d5 100644 (file)
@@ -2,7 +2,6 @@
     name: ttp-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: ttp-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: ttp-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 6448505203a34d5bc8e0ac6182a4dcaaeabf895f..386727e6a0030cf6753a631ebebaa7834baf111a 100644 (file)
@@ -36,6 +36,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream}'
index fc0d5daa88d4276cd1fd94030425666c3ff97c7c..ebf4aa89428c07060ceedd83a0be48627be9cf58 100644 (file)
@@ -35,7 +35,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream},netvirt-distribution-{stream},genius-distribution-{stream}'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
index 1e9cb13c87736fe243b7781f6a03c0434d9e1c4a..4151a16a5d1b0455c0ca9ce2bc3c701f0de71fea 100644 (file)
@@ -2,7 +2,6 @@
     name: unimgr-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: unimgr-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -59,7 +57,6 @@
     name: unimgr-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index d31b4ad3e7ce7999424b8cfaa684bbd4ad735c5b..cbe283f86a80b5acf0732d16cd31abfb5d729060 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'
index a117d2835fbf0946a1a7ef5dd4043a9d46b5f27c..a6b6122f19c61e572b039df13d2ad043faba3f06 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'
index 088838e6efbb9dfe9fa524c0d4d140f07cbea5c8..66a9e7dbfc5953cc0984e9778069a359a9d1c2b0 100644 (file)
@@ -30,6 +30,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},usc-distribution-{stream}'
index e0360721c572a7cc159b6fc95819f750b81f4109..abe995519ae0a3414e6e5a0e0cd33cdbb3fc8064 100644 (file)
@@ -2,7 +2,6 @@
     name: usc-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: usc-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: usc-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 910cbab58e6a7ffca1c2e4d2cc740f943bf9cb6d..e902519fb70a36cd132b22600fc6b67017a21d40 100644 (file)
@@ -33,6 +33,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowplugin-distribution-{stream},usecplugin-distribution-{stream}'
index d04d065a112a5cc743d3e5621a6ad7f56b1f9eb1..f9cf80a554d21dbb7468d3cf20fe626ca1be9116 100644 (file)
@@ -2,7 +2,6 @@
     name: usecplugin-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: usecplugin-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: usecplugin-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index ceacf73629184aff6b16f64d208d55dd28ece42c..80a47b6ca0c1bcb85970810fd0ee0e2fc2c52054 100644 (file)
@@ -2,7 +2,6 @@
     name: vpnservice-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: vpnservice-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -54,7 +52,6 @@
     name: vpnservice-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 0c07ba78e42e74c8c8b15b7e2f33b967ee42dc43..4fa3fe58184f9ca41617167851591dfb6b98fae2 100644 (file)
@@ -31,7 +31,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414'
index 395ca6bc9496325ae5502f717c244f366092a3e9..bbfc21c239d66337777e363069b7a7428eb54042 100644 (file)
         - carbon:
             branch: 'master'
             jre: 'openjdk8'
-            tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+            tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
-            tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
+            tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -34,7 +34,3 @@
 
     # Robot custom options
     robot-options: ''
-
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
index 203d811a41801ffd96600e2ef5bc4736c3f6bd2a..829aa69300fb06dd34ec797350b817f0b37ecb7c 100644 (file)
@@ -21,7 +21,7 @@
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-            tools_system_image: Ubuntu 14.04 - mininet - 20170117-0003
+            tools_system_image: Ubuntu 14.04 - mininet - 20170130-0425
 
     install:
         - only:
@@ -35,7 +35,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170130-0414
index 76bed461be7d7157bebd42ef45f2b29aa49c7c26..3b329e1dc38518d9d0adf0ba1a30e96d30a59e09 100644 (file)
@@ -39,7 +39,7 @@
             odl-ml2-branch: 'master'
             odl-ml2-driver-version: 'v1'
 
-    schedule: 'H H * * *'
+    schedule: ''
 
     odl-enable-l3: 'no'
 
index b26d38e94304472c3fa94ed1918aa75529e8c2e1..a6954dc7834442aa524b6c0a66544ed194f8afc6 100644 (file)
@@ -2,7 +2,6 @@
     name: vtn-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -34,7 +33,6 @@
     name: vtn-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -66,7 +64,6 @@
     name: vtn-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 7c4852b3e7e65c634df45216f807e8fda5c311bb..557b84d28a9331fb00926ec09c1672becf1ffa9b 100644 (file)
@@ -2,7 +2,6 @@
     name: yang-push-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: yang-push-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -58,7 +56,6 @@
     name: yang-push-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
index 9d09dac5089361e0abff15714ebdb95e5d7508c8..7ed721fdf3bbaec33cbb6c8bbd9a35564b70b669 100644 (file)
@@ -2,7 +2,6 @@
     name: yangide-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -28,7 +27,6 @@
     name: yangide-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
index 313ba85c9bfd7535406fd8e3f8287169e26979e9..5c59cd0914426593f3acaa12a8a9beeb50a5223b 100644 (file)
@@ -33,6 +33,3 @@
     # Additional patterns to archive
     archive-artifacts: ''
     # FIXME: Delete if no patterns.
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
index 3b3c7e581b87154ed0cf78f904cbf446efd6f1d8..cb35c40517374ea955c0165c5b3061c3fb4282f8 100644 (file)
@@ -2,7 +2,6 @@
     name: yangtools-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -30,7 +29,6 @@
     name: yangtools-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
@@ -60,7 +58,6 @@
     name: yangtools-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml
new file mode 100644 (file)
index 0000000..3aadcf9
--- /dev/null
@@ -0,0 +1,92 @@
+heat_template_version: 2016-04-08
+
+parameters:
+    job_name:
+        type: string
+        description: Name of job running this template
+    silo:
+        type: string
+        description: Jenkins Silo job is running in (typically releng|sandbox)
+    vm_0_count:
+        type: number
+        description: Number of VMs for 1st VM type
+    vm_0_flavor:
+        type: string
+        default: 1 GB General Purpose v1
+        description: Flavor to run instance on for 1st VM type
+    vm_0_image:
+        type: string
+        description: Image to run instance on for 1st VM type
+    vm_1_count:
+        type: number
+        description: Number of VMs for 2nd VM type
+    vm_1_flavor:
+        type: string
+        default: 1 GB General Purpose v1
+        description: Flavor to run instance on for 2nd VM type
+    vm_1_image:
+        type: string
+        description: Image to run instance on for 2nd VM type
+    vm_2_count:
+        type: number
+        description: Number of VMs for 3rd VM type
+    vm_2_flavor:
+        type: string
+        default: 1 GB General Purpose v1
+        description: Flavor to run instance on for 3rd VM type
+    vm_2_image:
+        type: string
+
+resources:
+    vm_0_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: { get_param: vm_0_count }
+            resource_def:
+                type: generic-server.yaml
+                properties:
+                    job_name: { get_param: job_name }
+                    silo: { get_param: silo }
+                    ssh_key: { get_param: silo }
+                    index: "%index%"
+                    vm_flavor: { get_param: vm_0_flavor }
+                    vm_image: { get_param: vm_0_image }
+
+    vm_1_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: { get_param: vm_1_count }
+            resource_def:
+                type: generic-server.yaml
+                properties:
+                    job_name: { get_param: job_name }
+                    silo: { get_param: silo }
+                    ssh_key: { get_param: silo }
+                    index: "%index%"
+                    vm_flavor: { get_param: vm_1_flavor }
+                    vm_image: { get_param: vm_1_image }
+
+    vm_2_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: { get_param: vm_2_count }
+            resource_def:
+                type: generic-server.yaml
+                properties:
+                    job_name: { get_param: job_name }
+                    silo: { get_param: silo }
+                    ssh_key: { get_param: silo }
+                    index: "%index%"
+                    vm_flavor: { get_param: vm_2_flavor }
+                    vm_image: { get_param: vm_2_image }
+
+outputs:
+    vm_0_ips:
+        description: IP addresses of the 1st vm types
+        value: { get_attr: [vm_0_group, ip] }
+    vm_1_ips:
+        description: IP addresses of the 2nd vm types
+        value: { get_attr: [vm_1_group, ip] }
+    vm_2_ips:
+        description: IP addresses of the 3rd vm types
+        value: { get_attr: [vm_2_group, ip] }
index 1e2a0ccacf2499bb193a77fa1246989236fc0a02..575d0072bf0daa547a959421d3e54be92c26fceb 100644 (file)
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# add in a test copr repo
+wget http://copr.fedoraproject.org/coprs/tykeal/odl-updates/repo/epel-7/tykeal-odl-updates-epel-7.repo -O /etc/yum.repos.d/tykeal-odl-updates-epel-7.repo
+# Install xpath
+yum install -y perl-XML-XPath python-pip python-six
+
+# install crudini command line tool for editing config files
+yum install -y crudini
+
 echo '---> Installing non-baseline requirements'
 yum install -y deltarpm nc python{,-{crypto,devel,lxml,setuptools}} \
     @development {lib{xml2,xslt,ffi},openssl}-devel git wget
index 4e08b6e678e14c6a00623f4e07ee9be24b166eda..4671599253042c0a50aa0dba12137c5c3c15c71a 100644 (file)
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# add in a test copr repo
+wget http://copr.fedoraproject.org/coprs/tykeal/odl-updates/repo/epel-7/tykeal-odl-updates-epel-7.repo -O /etc/yum.repos.d/tykeal-odl-updates-epel-7.repo
+# Install xpath
+yum install -y perl-XML-XPath python-pip python-six
+
+# install crudini command line tool for editing config files
+yum install -y crudini
+
 echo '---> Installing non-baseline requirements'
 yum install -y deltarpm python{,-{crypto,devel,lxml,setuptools}} \
     @development {lib{xml2,xslt,ffi},openssl}-devel
index 653012b63120a7a463d506af3651c6125c046caf..0777292fdcc50363d82802075fcd95eceabdbfa1 100644 (file)
@@ -6,7 +6,8 @@
 # needed by enough to make them useful everywhere
 yum install -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     ant {boost,gtest,json-c,libcurl,libxml2,libvirt,openssl}-devel \
-    {readline,unixODBC}-devel yum-utils
+    {readline,unixODBC}-devel yum-utils fedora-packager \
+    libxslt-devel crudini
 
 #Install python3 and dependencies
 yum install -y python34
@@ -43,11 +44,34 @@ yum-config-manager -y --add-repo http://download.mono-project.com/repo/centos/
 yum -y install mono-complete nuget
 #end changes for vsemprovider in VTN
 
+
+# TSDR dependencies
+echo "Installing the Hbase Server..."
+mkdir /tmp/Hbase
+cd /tmp/Hbase
+wget --no-verbose http://apache.osuosl.org/hbase/hbase-0.94.27/hbase-0.94.27.tar.gz
+tar -xvf hbase-0.94.27.tar.gz
+
+echo "Installing the Cassandra Server..."
+mkdir /tmp/cassandra
+cd /tmp/cassandra
+wget --no-verbose http://apache.osuosl.org/cassandra/2.1.16/apache-cassandra-2.1.16-bin.tar.gz
+tar -xvf apache-cassandra-2.1.16-bin.tar.gz
+
+
+# Generally useful for all projects
+echo "Installing the Elasticsearch node..."
+mkdir /tmp/elasticsearch
+cd /tmp/elasticsearch
+wget --no-verbose https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.tar.gz
+tar -xvzf elasticsearch-1.7.5.tar.gz
+
+
 # The following installs hashicorp's packer binary which is required  for
 # the {verify,merge}-packer jobs
 mkdir /tmp/packer
 cd /tmp/packer
-wget https://releases.hashicorp.com/packer/0.10.1/packer_0.10.1_linux_amd64.zip
-unzip packer_0.10.1_linux_amd64.zip -d /usr/local/bin/
+wget https://releases.hashicorp.com/packer/0.12.2/packer_0.12.2_linux_amd64.zip
+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
index 268d6c24f7d94b3b940d253b14baee5d4668c5a0..b24dd1f57aa95f75d76444b0fdcc1250b261ac6c 100644 (file)
@@ -35,6 +35,9 @@ cd udpreplay
 ./configure
 make &> /dev/null && cp udpreplay /usr/local/bin
 
+## Install docker-py and netaddr
+yum install -y -q python-docker-py python-netaddr
+
 #####################
 # DLUX requirements #
 #####################
index f8bc7dc5f9b4b865df8ebf7c06eb617c3fa3bb98..865fc935bf650d18a1023386853e05d1cd6437d4 100644 (file)
@@ -32,6 +32,10 @@ rm -rf /var/lib/cloud/*
 # clean-up any manual packer uploads
 rm -rf /tmp/packer
 
+# add local script for remote environments
+
+./system_reseal_local_env.sh
+
 # Force a system sync and sleep to get around any SSD issues
 echo "Forcing sync and sleep for 10sec"
 sync
diff --git a/packer/provision/system_reseal_local_env.sh b/packer/provision/system_reseal_local_env.sh
new file mode 100644 (file)
index 0000000..af72d99
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# local env changes will be added here
index a6de66f724dd60070c0866443f8a41b54213cbb5..3676ae31bf723ac0443fe68d5930e1efa2d8ba1f 100644 (file)
@@ -29,7 +29,7 @@
       "password": "{{user `public_pass`}}",
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - mitaka - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-mitaka - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
@@ -45,7 +45,7 @@
       "username": "{{user `private_user`}}",
       "password": "{{user `private_pass`}}",
       "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - mitaka - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-mitaka - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `private_base_image`}}",
       "flavor": "general1-1",
       "networks": [
index a97d82644e838cfe7a56b58909702c11e946612d..99e5fe7bf091f6563b84b68f618fbbde1d445d90 100644 (file)
@@ -29,7 +29,7 @@
       "password": "{{user `public_pass`}}",
       "region": "DFW",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - newton - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
       "flavor": "general1-1",
       "networks": [
@@ -45,7 +45,7 @@
       "username": "{{user `private_user`}}",
       "password": "{{user `private_pass`}}",
       "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - newton - {{isotime \"20060102-1504\"}}",
+      "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `private_base_image`}}",
       "flavor": "general1-1",
       "networks": [