Merge "Configuration for Testing Live Migration"
authorSam Hague <shague@redhat.com>
Wed, 20 Jun 2018 20:08:01 +0000 (20:08 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 20 Jun 2018 20:08:01 +0000 (20:08 +0000)
265 files changed:
check_prefix.sh
docs/cloud-images.rst
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/cloud.cfg
jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
jenkins-scripts/jenkins-init-script.sh
jenkins-scripts/system_type.sh
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/notify-build-failure.sh
jjb/autorelease/update-autorelease-projects-views.sh
jjb/autorelease/view-autorelease-fluorine.yaml [new file with mode: 0644]
jjb/autorelease/view-autorelease-oxygen.yaml [new file with mode: 0644]
jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.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-csit.yaml [new file with mode: 0644]
jjb/coe/coe-patch-test.yaml [new file with mode: 0644]
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml [new file with mode: 0644]
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml [moved from jjb/releng-defaults.yaml with 81% similarity]
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/common-functions.sh
jjb/integration/csit-jobs-fluorine.lst
jjb/integration/csit-jobs-nitrogen.lst [deleted file]
jjb/integration/csit-jobs-oxygen.lst
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-start-cluster-run-test.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/multipatch-distribution.sh [changed mode: 0644->0755]
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
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-patch-test.yaml [new file with mode: 0644]
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-cluster-stress.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml [deleted file]
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin-csit-basic.yaml [deleted file]
jjb/ocpplugin/ocpplugin-csit-scalability.yaml [deleted file]
jjb/ocpplugin/ocpplugin.yaml
jjb/odl-openstack-check-image-protection.sh
jjb/odl-openstack-install.sh
jjb/odlparent/odlparent-patch-test.yaml [new file with mode: 0644]
jjb/odlparent/odlparent.yaml
jjb/odltools/odltools.yaml [new file with mode: 0644]
jjb/of-config/of-config-csit-basic.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openci/create-ape.sh [new file with mode: 0755]
jjb/openci/openci-odl-daily-jobs.yaml [new file with mode: 0644]
jjb/opendaylight-infra-stack.sh
jjb/opendaylight-infra-update-image-list.sh
jjb/openflowjava/openflowjava.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-thirdparty-dependencies.yaml
jjb/opflex/opflex.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packaging/build-rpm-snap.sh
jjb/packaging/packaging.yaml
jjb/packaging/puppet.yaml
jjb/packaging/test-ports-nofeature.sh
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-jobs.yaml
jjb/releng-packer-jobs.yaml
jjb/releng-templates-java.yaml
jjb/releng-views.yaml
jjb/requirements.txt
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/serviceutils/serviceutils.yaml [new file with mode: 0644]
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.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/topoprocessing/topoprocessing-csit-topology-operation.yaml [deleted file]
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.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 [deleted file]
jjb/unimgr/unimgr-csit-legato.yaml [deleted file]
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml [new file with mode: 0644]
jjb/yangtools/yangtools.yaml
packer/common-packer
packer/provision/examples/apache-e-w.yaml [new file with mode: 0644]
packer/provision/examples/apache-n-s.yaml [new file with mode: 0644]
packer/provision/examples/apache-pod.yaml [new file with mode: 0644]
packer/provision/examples/busybox.yaml [new file with mode: 0644]
packer/provision/examples/nginx-pod.yaml [new file with mode: 0644]
packer/provision/kubernetes.yaml [new file with mode: 0644]
packer/provision/local-builder.yaml
packer/provision/robot.yaml
packer/provision/roles/coe/requirements.yaml [new file with mode: 0644]
packer/provision/templates/odlovs-cni.conf.j2 [new file with mode: 0644]
packer/templates/devstack-pre-pip-ocata.json
packer/templates/devstack-pre-pip-pike.json
packer/templates/devstack-pre-pip-queens.json
packer/templates/devstack.json
packer/templates/gbp.json
packer/templates/kubernetes.json [new file with mode: 0644]
packer/templates/mininet-ovs-2.5.json
packer/templates/mininet-ovs-2.6.json
packer/templates/mininet-ovs-2.8.json
packer/templates/robot.json
packer/vars/centos.json [deleted file]
packer/vars/ubuntu-16.04.json [deleted file]
scripts/branch_cut/branch_cutter.sh
tox.ini

index 87a8427a04b67db9db8c569ca5c63cc36a7e6f40..5b62ac4e3d43f05b914b277d8a0489fc193b9866 100755 (executable)
@@ -12,8 +12,8 @@
 #
 # The production prefix MUST always be a blank string.
 
-if grep 'prefix:' jjb/releng-defaults.yaml | grep -v "''"; then
-    echo "ERROR: A non-blank prefix is defined in jjb/releng-defaults.yaml"
+if grep 'prefix:' jjb/defaults.yaml | grep -v "''"; then
+    echo "ERROR: A non-blank prefix is defined in jjb/defaults.yaml"
     echo "The prefix MUST be set to blank '' in production!"
     exit 1
 fi
index 777c983e0339fb839b4815aaee4b75d361d1cc2e..fde93b609febf3199f954b361d39e3fb3a535a6b 100644 (file)
@@ -1,9 +1,8 @@
 Following are the list of published images available to be used with Jenkins jobs.
 
 * ZZCI - CentOS 7 - autorelease - 20180125-2240
-* ZZCI - CentOS 7 - builder - 20180109-0417
-* ZZCI - CentOS 7 - builder - 20180110-1659
 * ZZCI - CentOS 7 - builder - 20180201-2139
+* ZZCI - CentOS 7 - builder - 20180611-1830
 * ZZCI - CentOS 7 - devstack - 20171208-1648
 * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
 * ZZCI - CentOS 7 - devstack-pike - 20171208-1649
@@ -13,9 +12,11 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - CentOS 7 - docker - 20180417-0311
 * ZZCI - CentOS 7 - java-builder - 20171206-1842
 * ZZCI - CentOS 7 - java-builder - 20171209-0032
-* ZZCI - CentOS 7 - robot - 20171207-1911
+* ZZCI - CentOS 7 - robot - 20180601-2050
 * ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
+* ZZCI - Ubuntu 16.04 - docker - 20180601-2047
 * ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
+* ZZCI - Ubuntu 16.04 - kubernetes - 20180527-1344
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041
index bbec5364d5c76f57ce61c6b600925f510d183b2a..f70a2ac8fa2bd032debbba04884386119e29758c 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - autorelease - 20180125-2240
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-4
index d7312c71e31b71a1207cae8cba33cf1e6aa6ee50..87f3b099e82da0c305b608417403e96512fb1748 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 HARDWARE_ID=v1-standard-1
index e7d1fa489b4e65152b193860e1a31f5875f3eef4..ece6865261058934a8f563ebc12e3b809ab2d4ba 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 HARDWARE_ID=odl-highcpu-2
index 4d2f3cfd86bfcb12eda8e4551fb526ccafed510a..3523491c1ef041db12770ee61e3c5883b31e5738 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 HARDWARE_ID=odl-standard-2
index 1c1936b1b0dc9e16277a7e7ba8c3ed9c8afe6f7d..c30c966c1413eb2727491ede4b6bebb57bff2a0a 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 HARDWARE_ID=odl-standard-4
index d7466e50d919ee5e0150372666b89685a7a5e37a..fbb7e78e46d852d26bdf12115935b35f61e6e174 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 HARDWARE_ID=odl-highcpu-4
index 385fdff34ec86291ea44abbea0352ddfa0ece3e6..95a5a0e8b47b9a97168ac789b77ff4934831fc17 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180201-2139
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 HARDWARE_ID=odl-highcpu-8
index 081ffad4dc7562d22aedff300f9b4f07335df8c3..007b17aa7418701c551163b5bbc72d3e9f8218ff 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180601-2050
 HARDWARE_ID=odl-standard-2
 INSTANCE_CAP=25
index 9c8b60862e69b7ddb0c79e3acb99b56cb752ee32..b53023b6258c9ebb6c3950f4083ea5da2044bb2c 100644 (file)
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180220-0346
+IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180611-1830
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
@@ -15,7 +15,7 @@ FLOATING_IP_POOL=
 SECURITY_GROUPS=default
 AVAILABILITY_ZONE=ca-ymq-2
 STARTUP_TIMEOUT=600000
-KEY_PAIR_NAME=jenkins
+KEY_PAIR_NAME=jenkins-ssh
 NUM_EXECUTORS=1
 JVM_OPTIONS=
 FS_ROOT=/w
index d58f8cc874b45746598002acb8d37666b89ccf1f..103c573cfc4459b513f643ed5521dc4971fcc9df 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180601-2050
 HARDWARE_ID=v1-standard-1
 INSTANCE_CAP=1
index 2e79f1ff7485efdbc8f74b481b2abd31b1f2ad94..8f1e4fb790d3d9a551e424f8f88632f389b88b45 100644 (file)
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180601-2050
 HARDWARE_ID=v1-standard-1
 INSTANCE_CAP=1
 NUM_EXECUTORS=4
index 3ca18447cce60ce5b133cfbfed0b6ae564f540fe..4ce7f8e73ca0d76fba76c72da723adf9774c0ad4 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180220-2018
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180601-2047
 HARDWARE_ID=odl-highcpu-2
index e79228f336442c5164aded132bf7455a0bf7e21b..3309b00ab11322912a3e9d0c924f74ef84091f44 100755 (executable)
@@ -24,3 +24,9 @@ source /tmp/system_type.sh
 
 ## add local environment changes post scripts
 ./jenkins-init-script-local-env.sh
+
+# Create a swap file
+dd if=/dev/zero of=/swap count=1024 bs=1MiB
+chmod 600 /swap
+mkswap /swap
+swapon /swap
index d021c0b4ad15c6d03016260fe31c6a0dd356b155..c5b141afd47d859d9384915f0247f905c0bd2748 100755 (executable)
@@ -18,6 +18,7 @@ for i in "java-builder,builder" \
          "devstack,devstack" \
          "docker,docker" \
          "gbp,ubuntu-docker-ovs" \
+         "kubernetes,mininet-ubuntu" \
          "robot,robot" \
          "mininet,mininet-ubuntu"
 do set -- $i
index c085faa4fd207e8c4fbbc8bb82fce7c7e4a4054a..36bdb6040e1291e60e926f79b2881a5dbfad8fee 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 8d0f33daf96e684b39b40b754d7cb623f05da58d..a3ca1d321958cfa50d37b05a6d2b0ac7615e677f 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 5d6d1acb78d8b61685a1b44ce481631af658f19c..189501c35ade5e077d133a9b490ab1a6f96c15c2 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 2930bd0fbd14b521f223f78c309ec5d78608479c..e0b3e50bcec11cf1381d7f119c726850456b59b7 100644 (file)
@@ -4,17 +4,15 @@
     jobs:
       - inttest-patch-test
 
-    # The project name
     project: 'aaa'
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
+          os-branch: 'queens'
 
     feature:
       - authn:
       - keystone:
           csit-list: >
               aaa-csit-1node-keystone-all-{stream}
+
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 129604754080692f4c89a586ef41ef1af58e2511..1a60b2883dd0ccef8647c31a4ebb540d7e25235c 100644 (file)
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
-- project:
-    name: aaa-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
 - project:
     name: aaa-sonar
     jobs:
index bb7640b274afa5034c731fd8de0fdbec028cf7ce..c0c1c0434eb3f498b07c7bd86945878f583da388 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 3ce9680203d5ef2251359aca64d938d32fd9e16d..e1ad649ae12aafe1d69ad9f17ab18723be7e5663 100644 (file)
     # Used by the release job
     staging-profile-id: 931eabae9693c
 
-- project:
-    name: alto-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-
-    # Used by the release job
-    staging-profile-id: 931eabae9693c
-
 - project:
     name: alto-sonar
     jobs:
index 774cb25760ac6d8e4944dcc6fece52b1a14fcb62..ca443e740106afd1c9b7267dc4e69f763684f0aa 100644 (file)
     # Used by the release job
     staging-profile-id: 9324f12310e6a
 
-- project:
-    name: atrium-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'atrium-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[atrium]'
-
-    # Used by the release job
-    staging-profile-id: 9324f12310e6a
-
 - project:
     name: atrium-sonar
     jobs:
index 877dc08d18a0ec59f47f0bdc88dbd6e42aa51755..8194f2a2ebd191cde37cf57c1a4f48211ca618c2 100644 (file)
       - fluorine:
           branch: 'master'
           integration-test: fluorine
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
       - oxygen:
           branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease
index b528cf1216b6318f4e0e00add3dc7c4aab2a536a..f0baa163161731c932a273e7f6f2a28d0dc37922 100644 (file)
           goals: |
               clean deploy
               $EXTRA_MVN_OPTS
-              -Pintegrationtests,docs,repoBuild
+              -Pintegrationtests,repoBuild
               -Dcheckstyle.skip=true
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
           gerrit-commit-message: |
               'Update validate autorelease projects for {stream}'
-          reviewers-email: 'release@lists.opendaylight.org'
+          reviewers-email: 'jenkins-releng@opendaylight.org'
 
     publishers:
       - lf-infra-publish
index 939c46b5ef06883c1f7fbf1663510f31e91af62d..7eefa4043a0322fca793e253466cd4796ea4fe88 100644 (file)
@@ -38,9 +38,11 @@ REACTOR_INFO=$(awk '/Reactor Summary:/ { flag=1 }
 # check for project format
 if [[ ${REACTOR_INFO} =~ .*::*.*::*. ]]; then
     # extract project and artifactId from full format
-    ODL=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $1); print $1 }')
-    PROJECT_=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2 }')
-    NAME=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $3); print $3 }')
+    # Ex: REACTOR_INFO="ODL::sfc::odl-sfc-pot-netconf-renderer 072 " is broken down into
+    # NAME="ODL", PROJECT_="sfc" and NAME="odl-sfc-pot-netconf-renderer"
+    ODL=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+[0-9]+[ \t]+$|[ \t]+$/, "", $1); print $1}')
+    PROJECT_=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+[0-9]+[ \t]+$|[ \t]+$/, "", $2); print $2}')
+    NAME=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+[0-9]+[ \t]+$|[ \t]+$/, "", $3); print $3}')
 else
     # set project from partial format
     ODL=""
index 87992153c98ba04f1cb5cfb9241cba30f4eebe43..fa610a96b2d27313705facf0b2ed42891dcf1e2d 100755 (executable)
@@ -34,13 +34,16 @@ cat > "$VIEWS_AR_YAML_FILE" << EOF
     filter-executors: false
     filter-queue: false
     columns:
-        - status
-        - weather
-        - job
-        - last-success
-        - last-failure
-        - last-duration
-        - build-button
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
     recurse: false
 
 - view:
diff --git a/jjb/autorelease/view-autorelease-fluorine.yaml b/jjb/autorelease/view-autorelease-fluorine.yaml
new file mode 100644 (file)
index 0000000..252ec6b
--- /dev/null
@@ -0,0 +1,41 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_fluorine
+    name: releng-view-autorelease-fluorine
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
+
+- view:
+    name: Merge-Fluorine
+    description: 'List of Fluorine Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-maven-merge-fluorine'
+      - 'bgpcep-maven-merge-fluorine'
+      - 'controller-maven-merge-fluorine'
+      - 'coe-maven-merge-fluorine'
+      - 'daexim-maven-merge-fluorine'
+      - 'genius-maven-merge-fluorine'
+      - 'infrautils-maven-merge-fluorine'
+      - 'integration/distribution-maven-merge-fluorine'
+      - 'lispflowmapping-maven-merge-fluorine'
+      - 'mdsal-maven-merge-fluorine'
+      - 'netconf-maven-merge-fluorine'
+      - 'netvirt-maven-merge-fluorine'
+      - 'neutron-maven-merge-fluorine'
+      - 'openflowplugin-maven-merge-fluorine'
+      - 'ovsdb-maven-merge-fluorine'
+      - 'sfc-maven-merge-fluorine'
+    <<: *releng_autorelease_view_common_fluorine
diff --git a/jjb/autorelease/view-autorelease-oxygen.yaml b/jjb/autorelease/view-autorelease-oxygen.yaml
new file mode 100644 (file)
index 0000000..1f79bad
--- /dev/null
@@ -0,0 +1,58 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_oxygen
+    name: releng-view-autorelease-oxygen
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
+
+- view:
+    name: Merge-Oxygen
+    description: 'List of Oxygen Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-maven-merge-oxygen'
+      - 'alto-maven-merge-oxygen'
+      - 'bgpcep-maven-merge-oxygen'
+      - 'bier-maven-merge-oxygen'
+      - 'controller-maven-merge-oxygen'
+      - 'coe-maven-merge-oxygen'
+      - 'daexim-maven-merge-oxygen'
+      - 'dlux-maven-merge-oxygen'
+      - 'dluxapps-maven-merge-oxygen'
+      - 'genius-maven-merge-oxygen'
+      - 'groupbasedpolicy-maven-merge-oxygen'
+      - 'honeycomb/vbd-maven-merge-oxygen'
+      - 'infrautils-maven-merge-oxygen'
+      - 'integration/distribution-maven-merge-oxygen'
+      - 'jsonrpc-maven-merge-oxygen'
+      - 'l2switch-maven-merge-oxygen'
+      - 'lispflowmapping-maven-merge-oxygen'
+      - 'mdsal-maven-merge-oxygen'
+      - 'nemo-maven-merge-oxygen'
+      - 'netconf-maven-merge-oxygen'
+      - 'netvirt-maven-merge-oxygen'
+      - 'neutron-maven-merge-oxygen'
+      - 'of-config-maven-merge-oxygen'
+      - 'openflowplugin-maven-merge-oxygen'
+      - 'ovsdb-maven-merge-oxygen'
+      - 'p4plugin-maven-merge-oxygen'
+      - 'packetcable-maven-merge-oxygen'
+      - 'sfc-maven-merge-oxygen'
+      - 'snmp-maven-merge-oxygen'
+      - 'snmp4sdn-maven-merge-oxygen'
+      - 'sxp-maven-merge-oxygen'
+      - 'tsdr-maven-merge-oxygen'
+      - 'usc-maven-merge-oxygen'
+    <<: *releng_autorelease_view_common_oxygen
diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
deleted file mode 100644 (file)
index 2107281..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
----
-- project:
-    name: bgpcep-csit-gate-bgp-ingest-mixed
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'gate-bgp-ingest-mixed'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter
-
-    # Robot custom options
-    # 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
-
-    # Controller configuration
-    odl_system_flavor: odl-standard-4
-
-    # Plot Info
-    01-plot-title: 'Number of generated updates'
-    01-plot-yaxis: 'Total number of updates'
-    01-plot-group: 'BGP Scaling test suite'
-    01-plot-data-file: 'totals-bgp.csv'
-    02-plot-title: 'Generated load'
-    02-plot-yaxis: 'Updates per second'
-    02-plot-group: 'BGP Scaling test suite'
-    02-plot-data-file: 'performance-bgp.csv'
index 4519cfad54a2d72830ffd97e1a34486dd5966c5f..846e07ad0c4825e4aadff15aff71aee8fad5c274 100644 (file)
@@ -3,13 +3,14 @@
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
       - inttest-csit-1node
-      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'bgp-ingest-mixed'
+    functionality:
+      - bgp-ingest-mixed
+      - gate-bgp-ingest-mixed
 
     # Project branches
     stream:
@@ -17,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
@@ -44,7 +43,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: odl-standard-2
+    odl_system_flavor: odl-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'
index 145040d3747fb6d46a3f8c7389ad4ea80dcabec2..ca9fa8ce9af901641f68f34ee6aebe933fad7f81 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index c2cf626640e4024cdeb66a88cd72e6b04102be46..248aeec6ebe5dfc808e000838e3bac2e1d0a15a0 100644 (file)
     stream:
       - fluorine:
           branch: 'master'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example,
-              odl-bgpcep-bmp,
-              odl-bgpcep-bmp-config-example,
-              odl-bgpcep-pcep
       - oxygen:
           branch: 'stable/oxygen'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example,
-              odl-bgpcep-bmp,
-              odl-bgpcep-bmp-config-example,
-              odl-bgpcep-pcep
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example
 
     install:
       - only:
           scope: 'only'
 
+    # Features to install
+    install-features: >
+        odl-restconf,
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
+        odl-bgpcep-bmp,
+        odl-bgpcep-bmp-config-example,
+        odl-bgpcep-pcep
+
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
index bc8c1941f0772fdbdd6bc93725e8294ee427eb54..4c19390a4afe49f2a7d3e01bff06f198be6ae771 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 7fdae26ebe920fcb1001a824fb14ee98e1a79f93..dd72b0f53c63692705838e7f07793a9bda7c73f1 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
deleted file mode 100644 (file)
index da17fd3..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: bgpcep-csit-gate-throughpcep
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'gate-throughpcep'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-pcep'
-
-    # Readiness check timeout is lowered from the suite's high default value.
-    # The other options are workarounds for Sandbox not being as performant
-    # as the private lab where this suite was developed.
-    # Robot custom options:
-    robot-options: >
-        -v USE_NETCONF_CONNECTOR:False
-        -v PCEP_READY_VERIFY_TIMEOUT:5
-        -v RESTCONF_REUSE:False
-        -v UPDATER_TIMEOUT:600
-
-    # Controller configuration
-    odl_system_flavor: odl-standard-4
index 23b665162ec849e3beee06757f6741043b58a157..986e53e2964a7e8eb74bc636d805c3c6ea713aa7 100644 (file)
@@ -3,13 +3,14 @@
     name: bgpcep-csit-throughpcep
     jobs:
       - inttest-csit-1node
-      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'throughpcep'
+    functionality:
+      - throughpcep
+      - gate-throughpcep
 
     # Project branches
     stream:
@@ -17,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index dfb6adbfefdff1dccca8548e519bfd5c92564dbc..98542632cce26e47bd6e08809bbdeb0dda319e6e 100644 (file)
@@ -19,8 +19,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 5e8d35d69825a3a64add49293c80f68a874b75e7..f1e2b7a4a2cd6286bc3f7e56242521862eb8247a 100644 (file)
@@ -13,8 +13,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     feature:
       - bgp:
index 412da001366bd4d6e11dc1a7d5eb5ec7a5c4eb50..bc4f4e1eac4d99ebfb131108e58e178217d70084 100644 (file)
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: 'stable/nitrogen'
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream},
-        tcpmd5-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
 - project:
     name: bgpcep-sonar
     jobs:
index 66b7c414376cb6e1cf0c83acd628063de703d004..67dcb5c018458403ead684230a222ba0f3d60d43 100644 (file)
 
     # Project branches
     stream:
-      # Removed jobs testing Carbon branches due to the CSIT update
-      # incompatible changes in test suites for Nitrogen
-      # TODO: Create test suites for specific release before
-      # Nitrogen if needed.
       - fluorine:
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
-    verify-stream: 'nitrogen'
-    verify-branch: 'stable/nitrogen'
+    verify-stream: 'oxygen'
+    verify-branch: 'stable/oxygen'
     verify-karaf-version: 'karaf4'
 
     install:
index ba53880bf4d9e5dea545da13c6bc2c6da2751f5e..c3e51500a83b48b37e2f6b83e822a133a5e55bbe 100644 (file)
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
-- project:
-    name: bier-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[bier]'
-
-    # Used by the release job
-    staging-profile-id: 942a8075b1f2a
-
 - project:
     name: bier-sonar
     jobs:
index 46f26c564934d431d9f324ae565e1cb7d327c245..1ed2c5d6ccac3bebf7821aeaaed35dcbcc58652f 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 7c684484aad339b6c7d99b75be10bdd48e9104b2..ed7c55974acef74738f032722437f1bf343b9b03 100644 (file)
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
 
-- project:
-    name: capwap-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
 - project:
     name: capwap
     jobs:
index c2fe7cdfb3c10aade7c3fa2b85ecd4f4a5267fff..00397abdd293d204287d751c2974609b5094d64d 100644 (file)
     # Used by the release job
     staging-profile-id: 96be20348f0f2
 
-- project:
-    name: cardinal-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
 - project:
     name: cardinal-sonar
     jobs:
index 709290183280f30e7b0347f3f5520bb5d0d73f41..47ba93e7713b46b4eb703eaa65bccb6d64cf5398 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 5d8da824d08f129d9d4fddbbd0b8431232022819..53da8f640598a7f992351be65969dd3d7f59273f 100644 (file)
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
 
-- project:
-    name: centinel-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
 - project:
     name: centinel-sonar
     jobs:
diff --git a/jjb/coe/coe-csit.yaml b/jjb/coe/coe-csit.yaml
new file mode 100644 (file)
index 0000000..d9b172c
--- /dev/null
@@ -0,0 +1,23 @@
+---
+- project:
+    name: coe-csit
+    jobs:
+      - inttest-csit-1node
+
+    project: 'coe'
+    functionality: 'container-networking'
+
+    install-features: 'odl-netvirt-coe'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+
+    install:
+      - all:
+          scope: 'all'
+
+    tools_system_count: 3
+    tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180527-1344
diff --git a/jjb/coe/coe-patch-test.yaml b/jjb/coe/coe-patch-test.yaml
new file mode 100644 (file)
index 0000000..e838bba
--- /dev/null
@@ -0,0 +1,20 @@
+---
+- project:
+    name: coe-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'coe'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - coe:
+          csit-list: >
+              coe-csit-1node-container-networking-all-{stream}
index 6e27ebc45080b7858b88ac5f413031f69174ca39..e4ddeea1c631a7469812490974ad169457eab0cf 100644 (file)
@@ -3,6 +3,11 @@
     name: coe-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: coe
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
+          rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
       - odl-maven-jobs
 
     project: 'coe'
     name: coe-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: coe
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
+          rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
       - odl-maven-jobs
 
     project: 'coe'
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 
-- project:
-    name: coe-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'coe'
-    project-name: 'coe'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96c0be46aac33
-
 - project:
     name: coe-sonar
     jobs:
index 74f10a05999651faa5ab3f63e727b9d45e8b6316..e3488469e024870ebd399510226791b1b297d638 100644 (file)
@@ -15,8 +15,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 5123bc3884446853d97ab12edcb1296761cbce47..56ab3272c4899897af5c4c6482a0cf64e987a123 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 5cff7f2cba21878e91a544636791aaa5adf2c116..b8cc17ed8b0e66c6382248aa5f102eae9161ab3c 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 541a5dcd57616c4465b5182382e354c939fdbeba..14b1725da8cd7152e54bafab962a4bb8e760601a 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 3d0d698879f7cbba3a7abbb87879c33e794e23cb..33c84f63280265cda7f4074b73ed97331baeca2f 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index a11f406427766618fcf2b046a1773e50556a22a8..f0b6362b97eca9bcd66b398d7a8ac19f5c223bd2 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 156522b5faca43faf34ace936545262af71b09ee..8cad5fe09dfab2cf6ac2226fd4760ce7e787a3bf 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index cb0ade8ab8a80583e9131d3efce90a5841a5259f..742d2b90fb19e41f7c03ff80ce8b412a6a7979b2 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index f64faeddee20f51b7bd18d8fdffad30207c20492..472c2fa7517aee370f2228f1301d0b8d2f39695c 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 6edd8890945e39b1c7f7f2ab19935342a724a496..3c8973cb107bb4fbefe1c66ceb89b6fec3d05749 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 25ae2554579379e773955b474cbe6a90b88ea736..82196035cb2932b2b7c4a4733a4e201980938aef 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 616bee0eebfd5a86d79bc1905fd2b5b141111290..80b54ae4cb9eaa297ed447783bee2d539fa71122 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
new file mode 100644 (file)
index 0000000..8bf3659
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: controller-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'controller'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index ed072791dddcb0bb7284e633261eb45403e77963..d6fc7143a79a70a258aa63d039db632f62af3043 100644 (file)
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
-- project:
-    name: controller-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
-
 - project:
     name: controller-sonar
     jobs:
index 78b683e7158f426724091dba686929fe0646f9bb..7c6b907174b3739480c57ee4ea890859b39d160b 100644 (file)
     # Used by the release job
     staging-profile-id: 96cd299563ec6
 
-- project:
-    name: coretutorials-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
 - project:
     name: coretutorials-sonar
     jobs:
index 083be0a88ff28024bf6562a52c281f9ef60893bd..1324d4df2d9a97487e36edbcc48b28831719cf48 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 08da6af2cb5b49f9456f8ebb24b5820f3ed7d446..b34bcd5c4f8697e894c5ad4e4b78db32257fd942 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 5fb3dd0d21ae174b94f95a309990255ab2831598..cb3eec201424acf9b0a46d121903f26eed3d597e 100644 (file)
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
 - project:
     name: daexim-sonar
     jobs:
similarity index 81%
rename from jjb/releng-defaults.yaml
rename to jjb/defaults.yaml
index b0fc45b597c3dd70f95ad770dc965319f06896da..bbc01757f5108bc2cb5d1a31428596d0ab3fb9ed 100644 (file)
@@ -34,7 +34,7 @@
     nexus-snapshot-repo: opendaylight.snapshot
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
     lftools-version: <1.0.0
-    packer-version: 1.1.3
+    packer-version: 1.2.4
 
     # defaults for parameters installing openstack for csit jobs
     devstack-hash: ''
@@ -58,6 +58,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
 
     # openstack-infra-parameters defaults
@@ -82,7 +83,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
     odl_system_count: 1
     odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180611-1830
     openstack_system_count: 1
     openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/carbon
+    verify-branch: stable/oxygen
     # Value for ODL_STREAM
-    verify-stream: carbon
-    verify-karaf-version: karaf3
+    verify-stream: oxygen
+    verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
     # Maven / Java
         netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
         netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
-    csit-high-frequency-list-nitrogen: >
-        netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen
-    csit-high-frequency-list-carbon: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine
     csit-sanity-list-oxygen: >
         openflowplugin-csit-1node-sanity-only-oxygen,
         distribution-sanity-oxygen
-    csit-sanity-list-nitrogen: >
-        openflowplugin-csit-1node-sanity-only-nitrogen,
-        distribution-sanity-nitrogen
-    csit-sanity-list-carbon: >
-        openflowplugin-csit-1node-sanity-only-carbon,
-        distribution-sanity-carbon
     csit-weekly-list-fluorine: >
         controller-csit-1node-notifications-longevity-only-fluorine,
         controller-csit-3node-drb-partnheal-longevity-only-fluorine,
         controller-csit-3node-drb-precedence-longevity-only-fluorine,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine,
         bgpcep-csit-3node-bgpclustering-longevity-only-fluorine,
+        distribution-deploy-fluorine,
+        distribution-offline-fluorine,
         openflowplugin-csit-1node-longevity-only-fluorine
     csit-weekly-list-oxygen: >
         controller-csit-1node-notifications-longevity-only-oxygen,
         controller-csit-3node-drb-precedence-longevity-only-oxygen,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen,
         bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
+        distribution-deploy-oxygen,
+        distribution-offline-oxygen,
         openflowplugin-csit-1node-longevity-only-oxygen
-    csit-weekly-list-nitrogen: >
-        controller-csit-1node-notifications-longevity-only-nitrogen,
-        controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
-        controller-csit-3node-drb-precedence-longevity-only-nitrogen,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen,
-        bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
-        openflowplugin-csit-1node-longevity-only-nitrogen
-    csit-weekly-list-carbon: >
-        controller-csit-1node-notifications-longevity-only-carbon,
-        controller-csit-3node-cs-chasing-leader-longevity-only-carbon,
-        controller-csit-3node-cs-partnheal-longevity-only-carbon,
-        controller-csit-3node-drb-partnheal-longevity-only-carbon,
-        controller-csit-3node-drb-precedence-longevity-only-carbon,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon,
-        bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
-        openflowplugin-csit-1node-longevity-only-carbon
index ef01af1a4ed30241f64bec4af3f0c598f4f28183..b1e4b2014ae5d953a8fe442d3f7f775192e7ae19 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 30fd8f6d5108b3a7227cbc2ab00adaabeaeb9837..ff620ae1fe478ee3d760f0eb301c1787a2d5030f 100644 (file)
     # Used by the release job
     staging-profile-id: 96e6338c870f5
 
-- project:
-    name: didm-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-
-    # Used by the release job
-    staging-profile-id: 96e6338c870f5
-
 - project:
     name: didm-sonar
     jobs:
index e878163c46131ad9719990d7ab6058d4e3930bff..7c799b44a7a0b22daa45a348e54307dc0a7fc4b0 100644 (file)
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
-- project:
-    name: dlux-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
 - project:
     name: dlux-sonar
     jobs:
index b0c568b21a08d5f8c7432b9791fa80d1a862a50f..46f7ae5037a5e757a1484c26b911150e69b632ff 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a31fdfa213721024ce2cc43d03b08f16270ca407..ca850310b6221f86969c6fbf4cf8205a670cef8f 100644 (file)
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
-- project:
-    name: dluxapps-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
-- project:
-    name: dluxapps-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: carbon
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
 - project:
     name: dluxapps-sonar
     jobs:
index 1a8287d823d1a2474e749a87b0ecc1b8cc40533b..ac14197063a0523b4a5466bc3e2f2418f1c63a15 100644 (file)
@@ -10,8 +10,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     project: docs
     project-name: docs
index 31d0eba08fd4d7311cdf420e3d2e278f425d054a..3a3271a10c085e0335daacae148807b4b8626996 100644 (file)
     # Used by the release job
     staging-profile-id: 96e9352979521
 
-- project:
-    name: eman-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[eman]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: 96e9352979521
-
 - project:
     name: eman-sonar
     jobs:
index 39bef773b45e026000bbc1062e700d0412beb123..ea767f6e9ffeac6f7ba38acb4c1e6bbd1ee405c7 100644 (file)
     # Used by the release job
     staging-profile-id: 96f5ac591d858
 
-- project:
-    name: faas-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
 - project:
     name: faas-sonar
     jobs:
index 30fa052fa9236a3d496826e4e9191a47357c01c5..d08bc6a4610996b65ef7e48f20c09453d9fea00e 100644 (file)
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
 
-- project:
-    name: federation-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
 - project:
     name: federation-sonar
     jobs:
index 7fcab6c0bf70406fea718ae63b19856c3071a37a..056e8a3c103177184603d51e344d2d3247e7769d 100644 (file)
 
     install-features: 'odl-genius-rest'
 
-
-- project:
-    name: genius-csit-genius-carbon-nitrogen
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
-
-    project: 'genius'
-
-    functionality:
-      - 'upstream'
-      - 'gate'
-
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    testplan: 'genius-carbon-nitrogen.txt'
-
-    install:
-      - all:
-          scope: 'all'
-
-    tools_system_count: 3
-
-    install-features: 'odl-genius-rest'
-
-
 - project:
     name: genius-csit-genius-verify
     jobs:
index 64c7817bfd3310d625ef8614f8622df99f37f12d..b9f22ec4c11938b8bd41152152f8b5b3a28bbc95 100644 (file)
@@ -13,9 +13,6 @@
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
 
     jdk: 'openjdk8'
 
index bd092cc1ca7360af63a477236b2977ef68ee26dc..db5cc0958e999fa89410fc918eb0c4b61b51675a 100644 (file)
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
-- project:
-    name: genius-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: genius
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
-          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
 - project:
     name: genius-sonar
     jobs:
index 5a2ef9c64caf06ff737dfa040b61c4909c97e996..2b4fca8ba1a2f7862ebd771d0111c7cbd4e442bf 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5a2ef9c64caf06ff737dfa040b61c4909c97e996
+Subproject commit 2b4fca8ba1a2f7862ebd771d0111c7cbd4e442bf
index c71f008464c44231066f3d2435a2db44a380ff52..8b4b546395cc569bebb29ec70a0b8894a9cb5cd8 100644 (file)
@@ -25,9 +25,6 @@
       - oxygen:
           branch: 'stable/oxygen'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
       - ocata:
index 4467a8f6d0aa0032e4991439cf4c3b60ffcc1f0a..a0f6b62e87416948e328fe66710f4b3aff809b58 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 6c160b554ee743717ca02a8b1a65299384a35b02..191c88f1e8d3b6eef94c40035e9556d6bcbf5a0d 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 75c71ffbee854a41dab9c49e4b51419ed0af680d..6395c405255ff6d30cc160157e043296282d2539 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index f193d5e311e68fe648462fe08015d7ac9518fe55..3fa1a99c521aefcd31a1d7e624d4b90088513243 100644 (file)
@@ -15,8 +15,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index f7cdd20571eac7db12b7815cdb36ac21289b07bb..93534339a40e1275a161677344699b46b726a3bc 100644 (file)
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
-- project:
-    name: groupbasedpolicy-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-
-    # Used by the release job
-    staging-profile-id: 96fbb93f95a76
-
 - project:
     name: groupbasedpolicy-sonar
     jobs:
index ec193bb095994a1efec9e1bf61fd81eac49649dd..936c72b1e6f7aee0bfdca8028ef6ee99b616fece 100644 (file)
     # Used by the release job
     staging-profile-id: 96fc362c36862
 
-- project:
-    name: vbd-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
 - project:
     name: vbd-sonar
     jobs:
index 34a5f96907343905536423cafbaa521ae40e040b..3881314498d439d4ff376d8ba80f395db6233784 100644 (file)
@@ -13,9 +13,6 @@
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
 
     jdk: 'openjdk8'
 
index 0390cc3a0eb3d2e239589e54ca72a2535edbf67c..2a865fc9c4b4b1aeaafe675e708da40f21779f10 100644 (file)
@@ -4,6 +4,12 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: infrautils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
+          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs
 
     stream: fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: infrautils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
+          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs
 
     stream: oxygen
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
-- project:
-    name: infrautils-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
 - project:
     name: infrautils-sonar
     jobs:
index 836100b774e7c1fa3f266b4b4daa86caabe3f866..051377f03d4412f4b518f820c79df9119fd3a6e4 100644 (file)
@@ -125,3 +125,287 @@ function csv2ssv() {
 
     echo "${ssv}"
 } # csv2ssv
+
+SSH="ssh -t -t"
+
+# Collect the list of files on the hosts
+function collect_files() {
+    local -r ip=$1
+    local -r folder=$2
+    finddir=/tmp/finder
+    ${SSH} ${ip} "mkdir -p ${finddir}"
+    ${SSH} ${ip} "sudo find /etc > ${finddir}/find.etc.txt"
+    ${SSH} ${ip} "sudo find /opt/stack > ${finddir}/find.opt.stack.txt"
+    ${SSH} ${ip} "sudo find /var > ${finddir}/find2.txt"
+    ${SSH} ${ip} "sudo find /var > ${finddir}/find.var.txt"
+    ${SSH} ${ip} "sudo tar -cf - -C /tmp finder | xz -T 0 > /tmp/find.tar.xz"
+    scp ${ip}:/tmp/find.tar.xz ${folder}
+    mkdir -p ${finddir}
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${finddir}/rsync.etc.txt
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${finddir}/rsync.opt.stack.txt
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${finddir}/rsync.var.txt
+    tar -cf - -C /tmp finder | xz -T 0 > /tmp/rsync.tar.xz
+    cp /tmp/rsync.tar.xz ${folder}
+}
+
+# List of extra services to extract from journalctl
+# Add new services on a separate line, in alpha order, add \ at the end
+extra_services_cntl=" \
+    dnsmasq.service \
+    httpd.service \
+    libvirtd.service \
+    openvswitch.service \
+    ovs-vswitchd.service \
+    ovsdb-server.service \
+    rabbitmq-server.service \
+"
+
+extra_services_cmp=" \
+    libvirtd.service \
+    openvswitch.service \
+    ovs-vswitchd.service \
+    ovsdb-server.service \
+"
+
+# Collect the logs for the openstack services
+# First get all the services started by devstack which would have devstack@ as a prefix
+# Next get all the extra services
+function collect_openstack_logs() {
+    local -r ip=${1}
+    local -r folder=${2}
+    local -r node_type=${3}
+    local oslogs="${folder}/oslogs"
+
+    printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}\n"
+    rm -rf ${oslogs}
+    mkdir -p ${oslogs}
+    # There are always some logs in /opt/stack/logs and this also covers the
+    # pre-queens branches which always use /opt/stack/logs
+    rsync -avhe ssh ${ip}:/opt/stack/logs/* ${oslogs} # rsync to prevent copying of symbolic links
+
+    # Starting with queens break out the logs from journalctl
+    if [ "${OPENSTACK_BRANCH}" = "stable/queens" ]; then
+        cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF
+extra_services_cntl="${extra_services_cntl}"
+extra_services_cmp="${extra_services_cmp}"
+
+function extract_from_journal() {
+    local -r services=\${1}
+    local -r folder=\${2}
+    local -r node_type=\${3}
+    printf "extract_from_journal folder: \${folder}, services: \${services}\n"
+    for service in \${services}; do
+        # strip anything before @ and anything after .
+        # devstack@g-api.service will end as g-api
+        service_="\${service#*@}"
+        service_="\${service_%.*}"
+        sudo journalctl -u "\${service}" > "\${folder}/\${service_}.log"
+    done
+}
+
+rm -rf /tmp/oslogs
+mkdir -p /tmp/oslogs
+systemctl list-unit-files --all > /tmp/oslogs/systemctl.units.log 2>&1
+svcs=\$(grep devstack@ /tmp/oslogs/systemctl.units.log | awk '{print \$1}')
+extract_from_journal "\${svcs}" "/tmp/oslogs"
+if [ "\${node_type}" = "control" ]; then
+    extract_from_journal "\${extra_services_cntl}" "/tmp/oslogs"
+else
+    extract_from_journal "\${extra_services_cmp}" "/tmp/oslogs"
+fi
+ls -al /tmp/oslogs
+EOF
+# cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF
+        printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}, executing script\n"
+        cat ${WORKSPACE}/collect_openstack_logs.sh
+        scp ${WORKSPACE}/collect_openstack_logs.sh ${ip}:/tmp
+        ${SSH} ${ip} "bash /tmp/collect_openstack_logs.sh > /tmp/collect_openstack_logs.log 2>&1"
+        rsync -avhe ssh ${ip}:/tmp/oslogs/* ${oslogs}
+        scp ${ip}:/tmp/collect_openstack_logs.log ${oslogs}
+    fi # if [ "${OPENSTACK_BRANCH}" = "stable/queens" ]; then
+}
+
+function collect_netvirt_logs() {
+    set +e  # We do not want to create red dot just because something went wrong while fetching logs.
+
+    cat > extra_debug.sh << EOF
+echo -e "/usr/sbin/lsmod | /usr/bin/grep openvswitch\n"
+/usr/sbin/lsmod | /usr/bin/grep openvswitch
+echo -e "\nsudo grep ct_ /var/log/openvswitch/ovs-vswitchd.log\n"
+sudo grep "Datapath supports" /var/log/openvswitch/ovs-vswitchd.log
+echo -e "\nsudo netstat -punta\n"
+sudo netstat -punta
+echo -e "\nsudo getenforce\n"
+sudo getenforce
+echo -e "\nsudo systemctl status httpd\n"
+sudo systemctl status httpd
+echo -e "\nenv\n"
+env
+source /opt/stack/devstack/openrc admin admin
+echo -e "\nenv after openrc\n"
+env
+echo -e "\nsudo du -hs /opt/stack"
+sudo du -hs /opt/stack
+echo -e "\nsudo mount"
+sudo mount
+echo -e "\ndmesg -T > /tmp/dmesg.log"
+dmesg -T > /tmp/dmesg.log
+echo -e "\njournalctl > /tmp/journalctl.log\n"
+sudo journalctl > /tmp/journalctl.log
+echo -e "\novsdb-tool -mm show-log > /tmp/ovsdb-tool.log"
+ovsdb-tool -mm show-log > /tmp/ovsdb-tool.log
+EOF
+
+    # Since this log collection work is happening before the archive build macro which also
+    # creates the ${WORKSPACE}/archives dir, we have to do it here first.  The mkdir in the
+    # archives build step will essentially be a noop.
+    mkdir -p ${WORKSPACE}/archives
+
+    mv /tmp/changes.txt ${WORKSPACE}/archives
+    mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives
+
+    sleep 5
+    # FIXME: Do not create .tar and gzip before copying.
+    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        echo "collect_logs: for opendaylight controller ip: ${!CONTROLLERIP}"
+        NODE_FOLDER="odl_${i}"
+        mkdir -p ${NODE_FOLDER}
+        echo "Lets's take the karaf thread dump again..."
+        ssh ${!CONTROLLERIP} "sudo ps aux" > ${WORKSPACE}/ps_after.log
+        pid=$(grep org.apache.karaf.main.Main ${WORKSPACE}/ps_after.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
+        echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
+        ssh ${!CONTROLLERIP} "jstack ${pid}" > ${WORKSPACE}/karaf_${i}_${pid}_threads_after.log || true
+        echo "killing karaf process..."
+        ${SSH} "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
+        ${SSH} ${!CONTROLLERIP} "sudo journalctl > /tmp/journalctl.log"
+        scp ${!CONTROLLERIP}:/tmp/journalctl.log ${NODE_FOLDER}
+        ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
+        scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        ${SSH} ${!CONTROLLERIP} "tar -cf - -C /tmp/${BUNDLEFOLDER} etc | xz -T 0 > /tmp/etc.tar.xz"
+        scp ${!CONTROLLERIP}:/tmp/etc.tar.xz ${NODE_FOLDER}
+        ${SSH} ${!CONTROLLERIP} "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
+        ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
+        scp ${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar ${NODE_FOLDER}
+        ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_zrpcd.log.tar /tmp/zrpcd.init.log"
+        scp ${!CONTROLLERIP}:/tmp/odl${i}_zrpcd.log.tar ${NODE_FOLDER}
+        tar -xvf ${NODE_FOLDER}/odl${i}_karaf.log.tar -C ${NODE_FOLDER} --strip-components 2 --transform s/karaf/odl${i}_karaf/g
+        grep "ROBOT MESSAGE\| ERROR " ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err.log
+        grep "ROBOT MESSAGE\| ERROR \| WARN \|Exception" \
+            ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log
+        # Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context
+        sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log
+        mv /tmp/odl${i}_exceptions.txt ${NODE_FOLDER}
+        rm ${NODE_FOLDER}/odl${i}_karaf.log.tar
+        mv *_threads* ${NODE_FOLDER}
+        mv ps_* ${NODE_FOLDER}
+        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
+    done
+
+    print_job_parameters > ${WORKSPACE}/archives/params.txt
+
+    # Control Node
+    for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
+        OSIP=OPENSTACK_CONTROL_NODE_${i}_IP
+        echo "collect_logs: for openstack control node ip: ${!OSIP}"
+        NODE_FOLDER="control_${i}"
+        mkdir -p ${NODE_FOLDER}
+        scp extra_debug.sh ${!OSIP}:/tmp
+        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
+        scp ${!OSIP}:/etc/dnsmasq.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/keystone/keystone.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/keystone/keystone-uwsgi-admin.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/keystone/keystone-uwsgi-public.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/kuryr/kuryr.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/neutron/dhcp_agent.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/neutron/metadata_agent.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/neutron/neutron.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/neutron/neutron_lbaas.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/neutron/plugins/ml2/ml2_conf.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/neutron/services/loadbalancer/haproxy/lbaas_agent.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/nova/nova-api-uwsgi.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/nova/nova_cell1.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/nova/placement-uwsgi.ini ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/devstack/.stackenv ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
+        scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/tempest/etc/tempest.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
+        collect_files "${!OSIP}" "${NODE_FOLDER}"
+        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log rabbitmq | xz -T 0 > /tmp/rabbitmq.tar.xz "
+        scp ${!OSIP}:/tmp/rabbitmq.tar.xz ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone_access.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
+        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "control"
+        mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf
+        # qdhcp files are created by robot tests and copied into /tmp/qdhcp during the test
+        tar -cf - -C /tmp qdhcp | xz -T 0 > /tmp/qdhcp.tar.xz
+        mv /tmp/qdhcp.tar.xz ${NODE_FOLDER}
+        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
+    done
+
+    # Compute Nodes
+    for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
+        OSIP=OPENSTACK_COMPUTE_NODE_${i}_IP
+        echo "collect_logs: for openstack compute node ip: ${!OSIP}"
+        NODE_FOLDER="compute_${i}"
+        mkdir -p ${NODE_FOLDER}
+        scp extra_debug.sh ${!OSIP}:/tmp
+        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
+        scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/devstack/.stackenv ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
+        scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}/
+        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
+        collect_files "${!OSIP}" "${NODE_FOLDER}"
+        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log libvirt | xz -T 0 > /tmp/libvirt.tar.xz "
+        scp ${!OSIP}:/tmp/libvirt.tar.xz ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/nova-agent.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
+        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
+        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "compute"
+        mv local.conf_compute_${!OSIP} ${NODE_FOLDER}/local.conf
+        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
+    done
+
+    # Tempest
+    DEVSTACK_TEMPEST_DIR="/opt/stack/tempest"
+    TESTREPO=".stestr"
+    TEMPEST_LOGS_DIR=${WORKSPACE}/archives/tempest
+    # Look for tempest test results in the $TESTREPO dir and copy if found
+    if ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "sudo sh -c '[ -f ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0 ]'"; then
+        ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "for I in \$(sudo ls ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/ | grep -E '^[0-9]+$'); do sudo sh -c \"${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/subunit-1to2 < ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/\${I} >> ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt\"; done"
+        ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "sudo sh -c '${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/python ${DEVSTACK_TEMPEST_DIR}/.tox/tempest/lib/python2.7/site-packages/os_testr/subunit2html.py ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt ${DEVSTACK_TEMPEST_DIR}/tempest_results.html'"
+        mkdir -p ${TEMPEST_LOGS_DIR}
+        scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
+        scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
+    else
+        echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
+    fi
+} # collect_netvirt_logs()
index a782e56c60d7131d5d3cdaef6cdf8349a8d77448..a59e511c311621e311c266754a561a9d6b475e6e 100644 (file)
@@ -7,6 +7,7 @@ bgpcep-csit-1node-throughpcep-all-fluorine,
 bgpcep-csit-1node-userfeatures-all-fluorine,
 bgpcep-csit-3node-bgpclustering-all-fluorine,
 bgpcep-csit-3node-bgpclustering-ha-only-fluorine,
+coe-csit-1node-container-networking-all-fluorine,
 controller-csit-1node-akka1-all-fluorine,
 controller-csit-1node-benchmark-all-fluorine,
 controller-csit-1node-rest-cars-perf-all-fluorine,
@@ -41,6 +42,7 @@ netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-fluorine,
 netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-fluorine,
+openflowplugin-csit-1node-bundle-based-reconciliation-all-fluorine,
 openflowplugin-csit-1node-cbench-only-fluorine,
 openflowplugin-csit-1node-flow-services-all-fluorine,
 openflowplugin-csit-1node-perf-bulkomatic-only-fluorine,
diff --git a/jjb/integration/csit-jobs-nitrogen.lst b/jjb/integration/csit-jobs-nitrogen.lst
deleted file mode 100644 (file)
index 97cb4dd..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-aaa-csit-1node-authn-all-nitrogen,
-aaa-csit-1node-keystone-all-nitrogen,
-aaa-csit-1node-tls-only-nitrogen,
-alto-csit-1node-setup-all-nitrogen,
-bgpcep-csit-1node-bgp-ingest-all-nitrogen,
-bgpcep-csit-1node-bgp-ingest-mixed-all-nitrogen,
-bgpcep-csit-1node-throughpcep-all-nitrogen,
-bgpcep-csit-1node-userfeatures-all-nitrogen,
-bgpcep-csit-3node-bgpclustering-all-nitrogen,
-bgpcep-csit-3node-bgpclustering-ha-only-nitrogen,
-bier-csit-1node-basic-all-nitrogen,
-controller-csit-1node-akka1-all-nitrogen,
-controller-csit-1node-benchmark-all-nitrogen,
-controller-csit-1node-rest-cars-perf-all-nitrogen,
-controller-csit-3node-benchmark-all-nitrogen,
-controller-csit-3node-clustering-all-nitrogen,
-controller-csit-3node-rest-clust-cars-perf-only-nitrogen,
-daexim-csit-1node-basic-only-nitrogen,
-daexim-csit-3node-clustering-basic-only-nitrogen,
-distribution-csit-1node-userfeatures-all-nitrogen,
-dluxapps-csit-1node-yangman-all-nitrogen,
-genius-csit-1node-upstream-all-nitrogen,
-genius-csit-3node-upstream-all-nitrogen,
-groupbasedpolicy-csit-1node-3-node-all-nitrogen,
-groupbasedpolicy-csit-1node-6node-all-nitrogen,
-groupbasedpolicy-csit-1node-openstack-ocata-openstack-nitrogen,
-groupbasedpolicy-csit-1node-sxp-only-nitrogen,
-groupbasedpolicy-csit-3node-clustering-all-nitrogen,
-l2switch-csit-1node-host-scalability-daily-only-nitrogen,
-l2switch-csit-1node-scalability-all-nitrogen,
-l2switch-csit-1node-switch-all-nitrogen,
-lispflowmapping-csit-1node-msmr-all-nitrogen,
-lispflowmapping-csit-1node-performance-only-nitrogen,
-lispflowmapping-csit-3node-msmr-all-nitrogen,
-mdsal-csit-1node-bindingv1-only-nitrogen,
-messaging4transport-csit-1node-basic-all-nitrogen,
-nemo-csit-1node-engine-all-nitrogen,
-netconf-csit-1node-callhome-only-nitrogen,
-netconf-csit-1node-scale-all-nitrogen,
-netconf-csit-1node-userfeatures-all-nitrogen,
-netconf-csit-3node-cluster-stress-all-nitrogen,
-netconf-csit-3node-clustering-all-nitrogen,
-netconf-csit-3node-clustering-scale-all-nitrogen,
-netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-1node-openstack-queens-sfc-nitrogen,
-netvirt-csit-1node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-3node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-3node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-nitrogen,
-nic-csit-1node-basic-all-nitrogen,
-ocpplugin-csit-1node-get-all-nitrogen,
-ocpplugin-csit-1node-scalability-all-nitrogen,
-of-config-csit-1node-basic-all-nitrogen,
-openflowplugin-csit-1node-cbench-only-nitrogen,
-openflowplugin-csit-1node-flow-services-all-nitrogen,
-openflowplugin-csit-1node-perf-bulkomatic-only-nitrogen,
-openflowplugin-csit-1node-perf-stats-collection-only-nitrogen,
-openflowplugin-csit-1node-scale-link-only-nitrogen,
-openflowplugin-csit-1node-scale-only-nitrogen,
-openflowplugin-csit-1node-scale-switch-only-nitrogen,
-openflowplugin-csit-3node-clustering-bulkomatic-only-nitrogen,
-openflowplugin-csit-3node-clustering-only-nitrogen,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-nitrogen,
-ovsdb-csit-1node-upstream-southbound-all-nitrogen,
-ovsdb-csit-3node-upstream-clustering-only-nitrogen,
-packetcable-csit-1node-pcmm-all-nitrogen,
-sdninterfaceapp-csit-1node-basic-only-nitrogen,
-sfc-csit-3node-docker-full-deploy-all-nitrogen,
-sfc-csit-3node-rest-basic-all-nitrogen,
-sxp-csit-1node-basic-all-nitrogen,
-sxp-csit-1node-filtering-all-nitrogen,
-sxp-csit-1node-performance-all-nitrogen,
-sxp-csit-1node-topology-all-nitrogen,
-sxp-csit-3node-clustering-all-nitrogen,
-sxp-csit-3node-routing-all-nitrogen,
-topoprocessing-csit-1node-topology-operations-all-nitrogen,
-unimgr-csit-1node-basic-all-nitrogen,
-unimgr-csit-1node-legato-all-nitrogen,
-usc-csit-1node-channel-all-nitrogen,
-usc-csit-1node-tcp-all-nitrogen,
-usecplugin-csit-1node-basic-all-nitrogen,
-yangtools-csit-1node-system-only-nitrogen,
index 3f7231166da6c4df013db4543fa2d7a1aaeebcfb..8d5eb2be1c74f36950e721f9690c9ee686e4a596 100644 (file)
@@ -9,6 +9,7 @@ bgpcep-csit-1node-userfeatures-all-oxygen,
 bgpcep-csit-3node-bgpclustering-all-oxygen,
 bgpcep-csit-3node-bgpclustering-ha-only-oxygen,
 bier-csit-1node-basic-all-oxygen,
+coe-csit-1node-container-networking-all-oxygen,
 controller-csit-1node-akka1-all-oxygen,
 controller-csit-1node-benchmark-all-oxygen,
 controller-csit-1node-rest-cars-perf-all-oxygen,
@@ -54,6 +55,7 @@ netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-oxygen,
 of-config-csit-1node-basic-all-oxygen,
+openflowplugin-csit-1node-bundle-based-reconciliation-all-oxygen,
 openflowplugin-csit-1node-cbench-only-oxygen,
 openflowplugin-csit-1node-flow-services-all-oxygen,
 openflowplugin-csit-1node-perf-bulkomatic-only-oxygen,
index ece342a28a590b228a267f0f3649adc61dcca2fe..1285ce62235902203a34573669e437fec57800d0 100644 (file)
@@ -28,14 +28,14 @@ if [[ "$KARAF_VERSION" == "karaf3" ]]; then
     FEATURE_TEST_STRING="features-integration-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" ${FEATURESCONF}
 
 if [[ ! -z "${REPO_URL}" ]]; then
-   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+   sed -ie "s%featuresRepositories = %featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
 fi
 
 # Add actual boot features.
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
+sed -ie "s/\(featuresBoot= \|featuresBoot = \)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
 
 echo "Configuring the log..."
@@ -83,39 +83,20 @@ function dump_log_and_exit {
     exit 1
 }
 
-echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..."
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; then
-    # Only oxygen and above have the infrautils.ready feature, so using REST API to determine if the controller is ready.
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
-        echo ${RESP}
-        if [[ ${RESP} == *"200"* ]]; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-else
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-fi
+echo "Waiting up to 6 minutes for controller to come up, checking every 5 seconds..."
+COUNT="0"
+while true; do
+    COUNT=$(( ${COUNT} + 5 ))
+    sleep 5
+    echo "already waited ${COUNT} seconds..."
+    if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
+        echo "Controller is UP"
+        break
+    elif (( "${COUNT}" > "360" )); then
+        echo "Timeout Controller DOWN"
+        dump_log_and_exit
+    fi
+done
 
 # echo "Checking OSGi bundles..."
 # sshpass seems to fail with new karaf version
index 87665874a6846d4747d64b2390cc2753fee38efc..4c69b386c989004a5b4e73d64fb7bc868c077141 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index b9eaf1a2de892eabbe317693feebd32812e0471a..af7327a60a13af9f80fcc7d8efd18e00b1a2f6d1 100644 (file)
@@ -7,6 +7,7 @@
       - 'distribution-verify-{stream}'
       - 'distribution-check-{stream}'
       - 'distribution-sanity-{stream}'
+      - 'distribution-managed-{stream}'
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
-          sm-repos: >
-              mvn:org.opendaylight.sxp/features-sxp//xml/features
-          sm-features: >
-              odl-sxp-controller
+          sm-repos: mvn:org.opendaylight.sxp/features-sxp//xml/features
+          sm-features: odl-sxp-controller
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          karaf-version: karaf4
 
 - project:
     name: distribution-sonar
     name: 'distribution-sanity-{stream}'
     # Goal: Verify distribution starts with no issues when all features are loaded.
     # Operation: This job deploys odl-integration-all + list of UM features.
-    # This jobs works for both managed & self-managed distro.
+    # This job works for both managed & self-managed distro.
 
     project-type: freestyle
     node: centos7-builder-4c-4g
           email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
+
+- job-template:
+    name: 'distribution-managed-{stream}'
+    # Goal: Verify distribution starts with no issues when all features are loaded.
+    # Operation: This job deploys odl-integration-all.
+    # This job works for just managed distro.
+
+    project-type: freestyle
+    node: centos7-builder-4c-4g
+    concurrent: false
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: 'karaf4'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - integration-detect-variables
+      - distribution-check-bootup
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - integration-csit-archive-build
+      - lf-infra-publish
+
index d213584c9296deaf0032ca24877955276700b2e6..021161e61d6a10646aaf01618dba9d0eae810bc1 100644 (file)
@@ -155,70 +155,29 @@ if [[ "$USEFEATURESBOOT" != "True" ]]; then
                          feature:list -i
 fi
 
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ];
-then
-    echo "only oxygen and above have the infrautils.ready feature, so using REST API to /modules or /shards to determine if the controller is ready.";
-
-    COUNT="0"
-
-    while true; do
-        RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )"
-        echo \$RESP
-
-        if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
-            SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=\member-\$1-shard-inventory-config,type=DistributedConfigDatastore)"
-            echo \$SHARD
-        fi
-
-        if ([[ \$RESP == *"200"* ]] && ([[ "${ENABLE_HAPROXY_FOR_NEUTRON}" != "yes" ]] || [[ \$SHARD  == *'"status":200'* ]])); then
-            echo "Controller is UP"
-            break
-
-        elif (( "\$COUNT" > "600" )); then
-            echo Timeout Controller DOWN
-            echo "Dumping first 500K bytes of karaf log..."
-            head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-            echo "Dumping last 500K bytes of karaf log..."
-            tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-            echo "Listing all open ports on controller system"
-            netstat -pnatu
-            exit 1
-        else
-
-        COUNT=\$(( \${COUNT} + 1 ))
-        sleep 1
-
-        if [[ \$((\$COUNT % 5)) == 0 ]]; then
-            echo already waited \${COUNT} seconds...
-        fi
-    fi
-    done
-
-else
-    echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
-    for i in {1..36};
-        do sleep 5;
-        grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-        if [ \$? -eq 0 ]
-        then
-          echo "Controller is UP"
-          break
-        fi
-    done;
-
-    # if we ended up not finding ready status in the above loop, we can output some debugs
+echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
+for i in {1..36};
+    do sleep 5;
     grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-    if [ $? -ne 0 ]
+    if [ \$? -eq 0 ]
     then
-        echo "Timeout Controller DOWN"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
+      echo "Controller is UP"
+      break
     fi
+done;
+
+# if we ended up not finding ready status in the above loop, we can output some debugs
+grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+if [ $? -ne 0 ]
+then
+    echo "Timeout Controller DOWN"
+    echo "Dumping first 500K bytes of karaf log..."
+    head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+    echo "Dumping last 500K bytes of karaf log..."
+    tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+    echo "Listing all open ports on controller system"
+    netstat -pnatu
+    exit 1
 fi
 
 echo "Listing all open ports on controller system..."
@@ -363,6 +322,7 @@ pybot -N ${TESTPLAN} \
       -v CONTROLLER_USER:${USER} \
       -v JAVA_HOME:${JAVA_HOME} \
       -v JDKVERSION:${JDKVERSION} \
+      -v JENKINS_WORKSPACE:${WORKSPACE} \
       -v MININET1:${TOOLS_SYSTEM_2_IP} \
       -v MININET2:${TOOLS_SYSTEM_3_IP} \
       -v MININET3:${TOOLS_SYSTEM_4_IP} \
@@ -372,6 +332,7 @@ pybot -N ${TESTPLAN} \
       -v MININET_USER:${USER} \
       -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
       -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
+      -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
       -v ODL_STREAM:${DISTROSTREAM} \
       -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
       -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
index 4d80663ecc297feb0493e4393a3d3e9130555f07..7ce45c96dbc1e231f82b53c1b59370c9a041aa84 100644 (file)
@@ -20,7 +20,10 @@ python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folde
 
 printf "\nshowing recent changes that made it into integration/test used by this job:\n"
 cd ${WORKSPACE}/test
-git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10
+printf "Hash    Author Date                    Commit Date                    Author               Subject\n"
+printf "%s\n" "------- ------------------------------ ------------------------------ -------------------- -----------------------------"
+git --no-pager log --pretty=format:'%h %<(30)%ad %<(30)%cd %<(20,trunc)%an%d %s' -n20
+printf "\n"
 cd -
 
 cat << EOF
@@ -37,7 +40,6 @@ function trap_handler() {
     local lasterr="$2"
     echo "trap_hanlder: ${prog}: line ${lastline}: exit status of last command: ${lasterr}"
     echo "trap_handler: command: ${BASH_COMMAND}"
-    collect_logs
     exit 1
 } # trap_handler()
 
@@ -75,6 +77,7 @@ ENABLE_OS_PLUGINS: ${ENABLE_OS_PLUGINS}
 DISABLE_OS_SERVICES: ${DISABLE_OS_SERVICES}
 TENANT_NETWORK_TYPE: ${TENANT_NETWORK_TYPE}
 SECURITY_GROUP_MODE: ${SECURITY_GROUP_MODE}
+ENABLE_ITM_DIRECT_TUNNELS: ${ENABLE_ITM_DIRECT_TUNNELS}
 PUBLIC_PHYSICAL_NETWORK: ${PUBLIC_PHYSICAL_NETWORK}
 ENABLE_NETWORKING_L2GW: ${ENABLE_NETWORKING_L2GW}
 CREATE_INITIAL_NETWORKS: ${CREATE_INITIAL_NETWORKS}
@@ -309,7 +312,6 @@ EOF
     if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
         echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
     fi
-
     IFS=,
     for plugin_name in ${ENABLE_OS_PLUGINS}; do
         if [ "$plugin_name" == "networking-odl" ]; then
@@ -320,7 +322,8 @@ EOF
             ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
             IS_LBAAS_PLUGIN_ENABLED="yes"
         elif [ "$plugin_name" == "networking-sfc" ]; then
-            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
+            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master"
+            IS_SFC_PLUGIN_ENABLED="yes"
         else
             echo "Error: Invalid plugin $plugin_name, unsupported"
             continue
@@ -360,6 +363,9 @@ EOF
         if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
             SERVICE_PLUGINS+=", lbaasv2"
         fi
+        if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then
+            SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin"
+        fi
     fi #check for ODL_ENABLE_L3_FWD
 
     cat >> ${local_conf_file_name} << EOF
@@ -556,286 +562,6 @@ EOF
     ${SSH} ${MGRIP} "sudo bash /tmp/deploy_ha_proxy.sh"
 } # configure_haproxy_for_neutron_requests()
 
-# Collect the list of files on the hosts
-function collect_files() {
-    local -r ip=$1
-    local -r folder=$2
-    finddir=/tmp/finder
-    ${SSH} ${ip} "mkdir -p ${finddir}"
-    ${SSH} ${ip} "sudo find /etc > ${finddir}/find.etc.txt"
-    ${SSH} ${ip} "sudo find /opt/stack > ${finddir}/find.opt.stack.txt"
-    ${SSH} ${ip} "sudo find /var > ${finddir}/find2.txt"
-    ${SSH} ${ip} "sudo find /var > ${finddir}/find.var.txt"
-    ${SSH} ${ip} "sudo tar -cf - -C /tmp finder | xz -T 0 > /tmp/find.tar.xz"
-    scp ${ip}:/tmp/find.tar.xz ${folder}
-    mkdir -p ${finddir}
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${finddir}/rsync.etc.txt
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${finddir}/rsync.opt.stack.txt
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${finddir}/rsync.var.txt
-    tar -cf - -C /tmp finder | xz -T 0 > /tmp/rsync.tar.xz
-    cp /tmp/rsync.tar.xz ${folder}
-}
-
-# List of extra services to extract from journalctl
-# Add new services on a separate line, in alpha order, add \ at the end
-extra_services_cntl=" \
-    dnsmasq.service \
-    httpd.service \
-    libvirtd.service \
-    openvswitch.service \
-    ovs-vswitchd.service \
-    ovsdb-server.service \
-    rabbitmq-server.service \
-"
-
-extra_services_cmp=" \
-    libvirtd.service \
-    openvswitch.service \
-    ovs-vswitchd.service \
-    ovsdb-server.service \
-"
-
-# Collect the logs for the openstack services
-# First get all the services started by devstack which would have devstack@ as a prefix
-# Next get all the extra services
-function collect_openstack_logs() {
-    local -r ip=${1}
-    local -r folder=${2}
-    local -r node_type=${3}
-    local oslogs="${folder}/oslogs"
-
-    printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}\n"
-    rm -rf ${oslogs}
-    mkdir -p ${oslogs}
-    # There are always some logs in /opt/stack/logs and this also covers the
-    # pre-queens branches which always use /opt/stack/logs
-    rsync -avhe ssh ${ip}:/opt/stack/logs/* ${oslogs} # rsync to prevent copying of symbolic links
-
-    # Starting with queens break out the logs from journalctl
-    if [ "${OPENSTACK_BRANCH}" = "stable/queens" ]; then
-        cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF
-extra_services_cntl="${extra_services_cntl}"
-extra_services_cmp="${extra_services_cmp}"
-
-function extract_from_journal() {
-    local -r services=\${1}
-    local -r folder=\${2}
-    local -r node_type=\${3}
-    printf "extract_from_journal folder: \${folder}, services: \${services}\n"
-    for service in \${services}; do
-        # strip anything before @ and anything after .
-        # devstack@g-api.service will end as g-api
-        service_="\${service#*@}"
-        service_="\${service_%.*}"
-        sudo journalctl -u "\${service}" > "\${folder}/\${service_}.log"
-    done
-}
-
-rm -rf /tmp/oslogs
-mkdir -p /tmp/oslogs
-systemctl list-unit-files --all > /tmp/oslogs/systemctl.units.log 2>&1
-svcs=\$(grep devstack@ /tmp/oslogs/systemctl.units.log | awk '{print \$1}')
-extract_from_journal "\${svcs}" "/tmp/oslogs"
-if [ "\${node_type}" = "control" ]; then
-    extract_from_journal "\${extra_services_cntl}" "/tmp/oslogs"
-else
-    extract_from_journal "\${extra_services_cmp}" "/tmp/oslogs"
-fi
-ls -al /tmp/oslogs
-EOF
-        printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}, executing script\n"
-        cat ${WORKSPACE}/collect_openstack_logs.sh
-        scp ${WORKSPACE}/collect_openstack_logs.sh ${ip}:/tmp
-        ${SSH} ${ip} "bash /tmp/collect_openstack_logs.sh > /tmp/collect_openstack_logs.log 2>&1"
-        rsync -avhe ssh ${ip}:/tmp/oslogs/* ${oslogs}
-        scp ${ip}:/tmp/collect_openstack_logs.log ${oslogs}
-    fi
-}
-
-function collect_logs() {
-    set +e  # We do not want to create red dot just because something went wrong while fetching logs.
-
-    cat > extra_debug.sh << EOF
-echo -e "/usr/sbin/lsmod | /usr/bin/grep openvswitch\n"
-/usr/sbin/lsmod | /usr/bin/grep openvswitch
-echo -e "\nsudo grep ct_ /var/log/openvswitch/ovs-vswitchd.log\n"
-sudo grep "Datapath supports" /var/log/openvswitch/ovs-vswitchd.log
-echo -e "\nsudo netstat -punta\n"
-sudo netstat -punta
-echo -e "\nsudo getenforce\n"
-sudo getenforce
-echo -e "\nsudo systemctl status httpd\n"
-sudo systemctl status httpd
-echo -e "\nenv\n"
-env
-source /opt/stack/devstack/openrc admin admin
-echo -e "\nenv after openrc\n"
-env
-echo -e "\nsudo du -hs /opt/stack"
-sudo du -hs /opt/stack
-echo -e "\nsudo mount"
-sudo mount
-echo -e "\ndmesg -T > /tmp/dmesg.log"
-dmesg -T > /tmp/dmesg.log
-echo -e "\njournalctl > /tmp/journalctl.log\n"
-sudo journalctl > /tmp/journalctl.log
-echo -e "\novsdb-tool -mm show-log > /tmp/ovsdb-tool.log"
-ovsdb-tool -mm show-log > /tmp/ovsdb-tool.log
-EOF
-
-    # Since this log collection work is happening before the archive build macro which also
-    # creates the ${WORKSPACE}/archives dir, we have to do it here first.  The mkdir in the
-    # archives build step will essentially be a noop.
-    mkdir -p ${WORKSPACE}/archives
-
-    mv /tmp/changes.txt ${WORKSPACE}/archives
-    mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives
-
-    sleep 5
-    # FIXME: Do not create .tar and gzip before copying.
-    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
-        CONTROLLERIP=ODL_SYSTEM_${i}_IP
-        echo "collect_logs: for opendaylight controller ip: ${!CONTROLLERIP}"
-        NODE_FOLDER="odl_${i}"
-        mkdir -p ${NODE_FOLDER}
-        echo "Lets's take the karaf thread dump again..."
-        ssh ${!CONTROLLERIP} "sudo ps aux" > ${WORKSPACE}/ps_after.log
-        pid=$(grep org.apache.karaf.main.Main ${WORKSPACE}/ps_after.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
-        echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
-        ssh ${!CONTROLLERIP} "jstack ${pid}" > ${WORKSPACE}/karaf_${i}_${pid}_threads_after.log || true
-        echo "killing karaf process..."
-        ${SSH} "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
-        ${SSH} ${!CONTROLLERIP} "sudo journalctl > /tmp/journalctl.log"
-        scp ${!CONTROLLERIP}:/tmp/journalctl.log ${NODE_FOLDER}
-        ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
-        scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
-        ${SSH} ${!CONTROLLERIP} "tar -cf - -C /tmp/${BUNDLEFOLDER} etc | xz -T 0 > /tmp/etc.tar.xz"
-        scp ${!CONTROLLERIP}:/tmp/etc.tar.xz ${NODE_FOLDER}
-        ${SSH} ${!CONTROLLERIP} "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
-        ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
-        scp ${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar ${NODE_FOLDER}
-        ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_zrpcd.log.tar /tmp/zrpcd.init.log"
-        scp ${!CONTROLLERIP}:/tmp/odl${i}_zrpcd.log.tar ${NODE_FOLDER}
-        tar -xvf ${NODE_FOLDER}/odl${i}_karaf.log.tar -C ${NODE_FOLDER} --strip-components 2 --transform s/karaf/odl${i}_karaf/g
-        grep "ROBOT MESSAGE\| ERROR " ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err.log
-        grep "ROBOT MESSAGE\| ERROR \| WARN \|Exception" \
-            ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log
-        # Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context
-        sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log
-        rm ${NODE_FOLDER}/odl${i}_karaf.log.tar
-        mv *_threads* ${NODE_FOLDER}
-        mv ps_* ${NODE_FOLDER}
-        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
-    done
-
-    print_job_parameters > ${WORKSPACE}/archives/params.txt
-
-    # Control Node
-    for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
-        OSIP=OPENSTACK_CONTROL_NODE_${i}_IP
-        echo "collect_logs: for openstack control node ip: ${!OSIP}"
-        NODE_FOLDER="control_${i}"
-        mkdir -p ${NODE_FOLDER}
-        scp extra_debug.sh ${!OSIP}:/tmp
-        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
-        scp ${!OSIP}:/etc/dnsmasq.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/keystone/keystone.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/keystone/keystone-uwsgi-admin.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/keystone/keystone-uwsgi-public.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/kuryr/kuryr.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/neutron/dhcp_agent.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/neutron/metadata_agent.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/neutron/neutron.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/neutron/neutron_lbaas.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/neutron/plugins/ml2/ml2_conf.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/neutron/services/loadbalancer/haproxy/lbaas_agent.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/nova/nova-api-uwsgi.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/nova/nova_cell1.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/nova/placement-uwsgi.ini ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
-        scp ${!OSIP}:/opt/stack/devstack/.stackenv ${NODE_FOLDER}
-        scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
-        scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
-        scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
-        scp ${!OSIP}:/opt/stack/tempest/etc/tempest.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
-        collect_files "${!OSIP}" "${NODE_FOLDER}"
-        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log rabbitmq | xz -T 0 > /tmp/rabbitmq.tar.xz "
-        scp ${!OSIP}:/tmp/rabbitmq.tar.xz ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone_access.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
-        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "control"
-        mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf
-        # qdhcp files are created by robot tests and copied into /tmp/qdhcp during the test
-        tar -cf - -C /tmp qdhcp | xz -T 0 > /tmp/qdhcp.tar.xz
-        mv /tmp/qdhcp.tar.xz ${NODE_FOLDER}
-        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
-    done
-
-    # Compute Nodes
-    for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
-        OSIP=OPENSTACK_COMPUTE_NODE_${i}_IP
-        echo "collect_logs: for openstack compute node ip: ${!OSIP}"
-        NODE_FOLDER="compute_${i}"
-        mkdir -p ${NODE_FOLDER}
-        scp extra_debug.sh ${!OSIP}:/tmp
-        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1"
-        scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
-        scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
-        scp ${!OSIP}:/opt/stack/devstack/.stackenv ${NODE_FOLDER}
-        scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
-        scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
-        scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}/
-        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
-        collect_files "${!OSIP}" "${NODE_FOLDER}"
-        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log libvirt | xz -T 0 > /tmp/libvirt.tar.xz "
-        scp ${!OSIP}:/tmp/libvirt.tar.xz ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/nova-agent.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
-        collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "compute"
-        mv local.conf_compute_${!OSIP} ${NODE_FOLDER}/local.conf
-        mv ${NODE_FOLDER} ${WORKSPACE}/archives/
-    done
-
-    # Tempest
-    DEVSTACK_TEMPEST_DIR="/opt/stack/tempest"
-    TESTREPO=".stestr"
-    TEMPEST_LOGS_DIR=${WORKSPACE}/archives/tempest
-    # Look for tempest test results in the $TESTREPO dir and copy if found
-    if ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "sudo sh -c '[ -f ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0 ]'"; then
-        ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "for I in \$(sudo ls ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/ | grep -E '^[0-9]+$'); do sudo sh -c \"${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/subunit-1to2 < ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/\${I} >> ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt\"; done"
-        ${SSH} ${OPENSTACK_CONTROL_NODE_1_IP} "sudo sh -c '${DEVSTACK_TEMPEST_DIR}/.tox/tempest/bin/python ${DEVSTACK_TEMPEST_DIR}/.tox/tempest/lib/python2.7/site-packages/os_testr/subunit2html.py ${DEVSTACK_TEMPEST_DIR}/subunit_log.txt ${DEVSTACK_TEMPEST_DIR}/tempest_results.html'"
-        mkdir -p ${TEMPEST_LOGS_DIR}
-        scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
-        scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
-    else
-        echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
-    fi
-} # collect_logs()
-
 # Following three functions are debugging helpers when debugging devstack changes.
 # Keeping them for now so we can simply call them when needed.
 ctrlhn=""
@@ -1025,18 +751,8 @@ if [ -n "${DEVSTACK_HASH}" ]; then
     echo "git checkout ${DEVSTACK_HASH}"
     git checkout ${DEVSTACK_HASH}
 fi
-echo "workaround: Restore NEUTRON_CREATE_INITIAL_NETWORKS flag"
-if [ "${OPENSTACK_BRANCH}" == "stable/queens" ]; then
-    git config --local user.email jenkins@opendaylight.org
-    git config --local user.name jenkins
-    git fetch https://git.openstack.org/openstack-dev/devstack refs/changes/99/550499/1 && git cherry-pick FETCH_HEAD
-fi
 git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s%b' -n20
 echo
-echo "workaround: adjust wait from 60s to 1800s (30m)"
-sed -i 's/wait_for_compute 60/wait_for_compute 1800/g' /opt/stack/devstack/lib/nova
-# TODO: modify sleep 1 to sleep 60, search wait_for_compute, then first sleep 1
-# that would just reduce the number of logs in the compute stack.log
 
 echo "workaround: do not upgrade openvswitch"
 sudo yum install -y yum-plugin-versionlock
@@ -1134,7 +850,6 @@ if [ ${NUM_OPENSTACK_COMPUTE_NODES} -gt 0 ]; then
       echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
     else
       echo "rabbitmq was not ready in ${WAIT_FOR_RABBITMQ_MINUTES}m"
-      collect_logs
       exit 1
     fi
 fi
@@ -1210,7 +925,6 @@ while [ ${in_progress} -eq 1 ]; do
             continue
         elif [ "$stacking_status" == "Stacking Failed" ]; then
             echo "node $index ${os_node_list[index]}: stacking has failed"
-            collect_logs
             exit 1
         elif [ "$stacking_status" == "Stacking Complete" ]; then
             echo "node $index ${os_node_list[index]}: stacking complete"
@@ -1224,7 +938,6 @@ while [ ${in_progress} -eq 1 ]; do
     sleep 60
     if [ ${iteration} -eq 60 ]; then
         echo "stacking has failed - took longer than 60m"
-        collect_logs
         exit 1
     fi
 done
@@ -1256,17 +969,9 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
     num_hypervisors=$(${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; openstack hypervisor list -f value | wc -l" | tail -1 | tr -d "\r")
     if ! [ "${num_hypervisors}" ] || ! [ ${num_hypervisors} -eq ${expected_num_hypervisors} ]; then
         echo "Error: Only $num_hypervisors hypervisors detected, expected $expected_num_hypervisors"
-        collect_logs
         exit 1
     fi
 
-    # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
-    # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
-    # of these libs that are not working for tempest.
-    ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
-    ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
-    ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
-
     # Gather Compute IPs for the site
     for j in `seq 1 ${NUM_COMPUTES_PER_SITE}`; do
         COMPUTE_INDEX=$(((i-1) * NUM_COMPUTES_PER_SITE + j))
@@ -1448,11 +1153,13 @@ for suite in ${SUITES}; do
     -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \
     -v CONTROLLER_USER:${USER} \
     -v DEVSTACK_DEPLOY_PATH:/opt/stack/devstack \
+    -v ENABLE_ITM_DIRECT_TUNNELS:${ENABLE_ITM_DIRECT_TUNNELS} \
     -v HA_PROXY_IP:${HA_PROXY_IP} \
     -v HA_PROXY_1_IP:${HA_PROXY_1_IP} \
     -v HA_PROXY_2_IP:${HA_PROXY_2_IP} \
     -v HA_PROXY_3_IP:${HA_PROXY_3_IP} \
     -v JDKVERSION:${JDKVERSION} \
+    -v JENKINS_WORKSPACE:${WORKSPACE} \
     -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
     -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
     -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \
@@ -1501,7 +1208,6 @@ ssh ${ODL_SYSTEM_IP} "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"
 ssh ${ODL_SYSTEM_IP} "du -hs /tmp/${BUNDLEFOLDER}/data/log/*"
 
 echo "Tests Executed"
-collect_logs
 
 true  # perhaps Jenkins is testing last exit code
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index 366e4f2ec77b0347398df3477240d2b04e3325fb..36479f2fdeaf6ebc63048ed3ec9db8e6838d074d 100644 (file)
@@ -12,7 +12,7 @@
 - parameter:
     name: distribution-karaf-version
     # Arguments:
-    #   karaf-version: Provide, otherwise releng-defaults value is used.
+    #   karaf-version: Provide, otherwise defaults.yaml value is used.
     parameters:
       - string:
           name: KARAF_VERSION
                     fi
                     rm ${HOME}/.netrc
           mark-unstable-if-failed: true
+
+- publisher:
+    name: integration-csit-collect-netvirt-logs
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - inject:
+                    properties-file: 'slave_addresses.txt'
+                - shell: |
+                    #!/bin/bash
+                    source /tmp/common-functions.sh ${BUNDLEFOLDER}
+                    collect_netvirt_logs
+          mark-unstable-if-failed: true
index 4ce0682170e8090514dd09e8a31506b231b22180..8a548b938df0ffd7f8982873f0f36ccf6e6464ed 100644 (file)
@@ -130,15 +130,34 @@ else
 fi
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} \
--v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} -v JAVA_HOME:${JAVA_HOME} \
--v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
--v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
-${odl_variables} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} -v \
-TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} -v TOOLS_SYSTEM_USER:${USER} \
--v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
--v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
-# FIXME: Sort (at least -v) options alphabetically.
+pybot -N ${TESTPLAN} \
+      --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+      -v BUNDLEFOLDER:${BUNDLEFOLDER} \
+      -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
+      -v CONTROLLER:${ODL_SYSTEM_IP} \
+      -v CONTROLLER1:${ODL_SYSTEM_2_IP} \
+      -v CONTROLLER2:${ODL_SYSTEM_3_IP} \
+      -v CONTROLLER_USER:${USER} \
+      -v JAVA_HOME:${JAVA_HOME} \
+      -v JDKVERSION:${JDKVERSION} \
+      -v JENKINS_WORKSPACE:${WORKSPACE} \
+      -v MININET:${TOOLS_SYSTEM_IP} \
+      -v MININET1:${TOOLS_SYSTEM_2_IP} \
+      -v MININET2:${TOOLS_SYSTEM_3_IP} \
+      -v MININET_USER:${USER} \
+      -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
+      -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
+      -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
+      -v ODL_STREAM:${DISTROSTREAM} \
+      -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} ${odl_variables} \
+      -v ODL_SYSTEM_USER:${USER} \
+      -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} \
+      -v TOOLS_SYSTEM_USER:${USER} \
+      -v USER_HOME:${HOME} \
+      -v WORKSPACE:/tmp \
+      ${TESTOPTIONS} ${SUITES} || true
+
+
 
 echo "Examining the files in data/log and checking filesize"
 ssh ${ODL_SYSTEM_1_IP} "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"
index 74fb386fa2dc30dac9b4680a34da99533b9d0192..c7634c551af5b3387f3bc04f5021be784a4f0d68 100644 (file)
           name: SECURITY_GROUP_MODE
           default: '{security-group-mode}'
           description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
       - string:
           name: PUBLIC_PHYSICAL_NETWORK
           default: '{public-physical-network}'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
+      - integration-csit-collect-netvirt-logs
       - integration-csit-archive-build
       - integration-csit-run-postscript
       - releng-openstack-stack-delete
           name: SECURITY_GROUP_MODE
           default: '{security-group-mode}'
           description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
       - string:
           name: PUBLIC_PHYSICAL_NETWORK
           default: '{public-physical-network}'
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
+      - integration-csit-collect-netvirt-logs
       - integration-csit-archive-build
       - integration-csit-run-postscript
       - releng-openstack-stack-delete
index 15aa436b89e18cb219867d2aa591b1caadf391c9..cfde9c0501a6f10d58bd92170efda939b0313e7a 100644 (file)
@@ -15,7 +15,7 @@
           branch: master
           stream: master
 
-    # CSIT Lists in releng-defaults.yaml
+    # CSIT Lists in defaults.yaml
     stream:
       - fluorine:
           branch: 'master'
               infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
               lispflowmapping openflowplugin coe genius sfc netvirt
 
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-nitrogen.lst
-          build-order: >
-              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
-              lispflowmapping openflowplugin coe genius sfc netvirt
-
 - project:
     name: integration-distribution
     project: integration/test
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
-    # CSIT Lists in releng-defaults.yaml
+    # CSIT Lists in defaults.yaml
     stream:
       - fluorine:
           branch: 'master'
           csit-blacklist: >
-              alto bier capwap centinel coe didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
+              alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
               sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-fluorine.lst
       - oxygen:
           branch: 'stable/oxygen'
           csit-blacklist: >
-              capwap centinel coe didm iotdm jsonrpc lacp messaging4transport netide nic
+              capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
               ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-oxygen.lst
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
 
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          csit-blacklist: capwap centinel coe didm iotdm jsonrpc lacp netide tsdr gate longevity sanity tdd wip
-          csit-list: !include: csit-jobs-nitrogen.lst
-          csit-weekly-list: '{csit-weekly-list-nitrogen}'
-          csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-
 - project:
     name: integration-sanity
     project: integration/test
           branch: 'stable/oxygen'
           karaf-version: karaf4
           csit-sanity-list: '{csit-sanity-list-oxygen}'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          karaf-version: karaf4
-          csit-sanity-list: '{csit-sanity-list-nitrogen}'
 
 - job-template:
     name: 'integration-distribution-test-{stream}'
           gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'auto-update-csit-jobs-{stream}'
           gerrit-commit-message: 'Auto Update CSIT Jobs to run for {stream}'
-          reviewers-email: 'integration-dev@lists.opendaylight.org'
+          reviewers-email: 'jluhrsen@redhat.com'
 
     publishers:
       - lf-infra-publish
old mode 100644 (file)
new mode 100755 (executable)
index ae9791d..cd7fbbe
@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -e
+
 # TODO: 1) clean up inline todo's below :)
 # TODO: 2) Use just a topic branch to create a distribution.  see this email:
 #          https://lists.opendaylight.org/pipermail/discuss/2015-December/006040.html
@@ -18,7 +22,7 @@ MAVEN_OPTIONS="$(echo --show-version \
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
-cd $BUILD_DIR || exit 1
+cd $BUILD_DIR
 
 # Set up git committer name and email, needed for commit creation when cherry-picking.
 export EMAIL="sandbox@jenkins.opendaylight.org"
@@ -83,6 +87,10 @@ fi
 echo "Patches to build: ${PATCHES_TO_BUILD}"
 IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 
+# First phase: clone the necessary repos and set the patches up
+
+declare -a PROJECTS
+
 # For each patch:
 # * Clone the project.
 # * Optionally, checkout a specific (typically unmerged) Gerrit patch. If none,
@@ -114,9 +122,10 @@ do
         distribution_status="included"
     fi
     PROJECT_SHORTNAME="${PROJECT##*/}"  # http://stackoverflow.com/a/3162500
+    PROJECTS+=("${PROJECT_SHORTNAME}")
     echo "cloning project ${PROJECT}"
     git clone "https://git.opendaylight.org/gerrit/p/${PROJECT}"
-    cd ${PROJECT_SHORTNAME} || exit 1
+    cd ${PROJECT_SHORTNAME}
     if [ "$(echo -n ${proto_patch} | tail -c 1)" == 'r' ]; then
         pure_patch="$(echo -n $proto_patch | head -c -1)"
     else
@@ -142,38 +151,48 @@ do
         git fetch "https://git.opendaylight.org/gerrit/${PROJECT}" "refs/changes/${pick}"
         git cherry-pick --ff --keep-redundant-commits FETCH_HEAD
     done
-    if [ "$(echo -n ${proto_patch} | tail -c 1)" == 'r' ]; then
+    # Check whether the patch ends with 'r', and the patch isn't the project
+    # (to avoid releasing controller...)
+    if [ "${proto_patch: -1}" = "r" ] && [ "${proto_patch}" != "${PROJECT}" ]; then
         # Here 'r' means release. Useful for testing Nitrogen Odlparent changes.
         find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
     fi
-    # Build project
-    "$MVN" clean install \
-    -e ${fast_option} \
-    -Dstream=oxygen \
-    -Dgitid.skip=false \
-    -Dmaven.gitcommitid.skip=false \
-    --global-settings "$GLOBAL_SETTINGS_FILE" \
-    --settings "$SETTINGS_FILE" \
-    $MAVEN_OPTIONS
-    cd "${BUILD_DIR}" || exit 1
-    # Since we've installed the artifacts, we can delete the build and save
-    # disk space
-    rm -rf "${PROJECT_SHORTNAME}"
+    cd "${BUILD_DIR}"
 done
 
 if [ "${distribution_status}" == "not_included" ]; then
     echo "adding integration/distribution"
+    PROJECTS+=(distribution)
     # clone distribution and add it as a module in root pom
     git clone "https://git.opendaylight.org/gerrit/p/integration/distribution"
-    cd distribution || exit 1
+    cd distribution
     git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
+    cd "${BUILD_DIR}"
+fi
+
+# Second phase: build everything
+
+for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
+    pushd "${PROJECT_SHORTNAME}"
     # Build project
     "$MVN" clean install \
-    -e -Pq \
+    -e ${fast_option} \
     -Dstream="$DISTROSTREAM" \
+    -Dgitid.skip=false \
+    -Dmaven.gitcommitid.skip=false \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     $MAVEN_OPTIONS
-    cd "${BUILD_DIR}" || exit 1
-fi
+    # Since we've installed the artifacts, we can clean the build and save
+    # disk space
+    "$MVN" clean \
+    -e ${fast_option} \
+    -Dstream="$DISTROSTREAM" \
+    -Dgitid.skip=false \
+    -Dmaven.gitcommitid.skip=false \
+    --global-settings "$GLOBAL_SETTINGS_FILE" \
+    --settings "$SETTINGS_FILE" \
+    $MAVEN_OPTIONS
+    popd
+done
 
index d703d35a762c34d5fa60affa763bcb08f4964001..faac19f1eee7238132133e9159cfc8fe7a667425 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 00d7b9769f4d00fa45e56533f60f8d34d006d26e..fd58902819db0203602a16f910e6e54b55f07335 100644 (file)
     # Used by the release job
     staging-profile-id: 96fd6e9453970
 
-- project:
-    name: iotdm-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96fd6e9453970
-
 - project:
     name: iotdm-sonar
     jobs:
index c83d90cb8ea77aac820f78baa0a75328ff8bd7d6..49f1336b668df0a31972acc4914ca9680a59092e 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          karaf-version: karaf3
-          # yamllint disable-line rule:line-length
-          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip'
 
     install:
       - only:
index 168fa943b8074721b15c7cb2d3e98c1f1dbf31dd..4b0311c705e2044a3197e8efc3fe2e7f03d3ee2b 100644 (file)
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
 - project:
     name: jsonrpc-sonar
     jobs:
index 8509c013974a76f26f5da48c92a7fc1e65b3f937..5b7bd6afc08e9d5bfca702d7d451cffc90357534 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index c85c9f64deda3d6d17a3b84f8fa1d342a082f1b9..615aee50e6c43633bac02b7d170200a02889efc6 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 62e8620c0a38de91e1f974476beb9390eb79eb73..52756aa828f01e59293d5220a9c4036c774cee09 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index b3a3a205d0ab23ac484970284c847b214a67e429..d579e9f51ba3f92db5009dcf4ff62353a1fa6f8a 100644 (file)
@@ -13,8 +13,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     feature:
       - all:
index c55bb6ced91892e54a1b4f2906b885f60ce66b77..ab0fc666c97f585c050c179cb3b784301a3f1a74 100644 (file)
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
-- project:
-    name: l2switch-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
 - project:
     name: l2switch-sonar
     jobs:
index 53fee1754fdb6424df9944eb73427ca38681d75b..4996065d7c94eff2b11ffccf547662f140083622 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 792f5ddb91495dff4b3bbb18512e3988e04920e4..cdeed106f7d379aa7c5032ebb09d929ad00528f5 100644 (file)
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
 
-- project:
-    name: lacp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96ff6c0ff6ab1
-
 - project:
     name: lacp-sonar
     jobs:
index d373f1327717672927247b617c168cf85b1839c4..82641eef30c49d2b9f14c8046a45df1cb4718b83 100644 (file)
 - project:
     name: lf-infra-common-packer
     jobs:
+      - '{project-name}-rtd-jobs'
       - gerrit-tox-verify
 
     project-name: lf-infra-common-packer
     project: releng/common-packer
+    project-pattern: releng/common-packer
     build-node: centos7-builder-2c-8g
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-common-packer/38930/
+    rtd-token: 0cdf727cc22f8f888ffec0e69f46d89031018776
     stream: any
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
 
-- project:
-    name: lf-infra-lf-ansible
-    jobs:
-      - gerrit-tox-verify
-
-    project-name: lf-infra-lf-ansible
-    project: releng/lf-ansible
-    project-pattern: releng/lf-ansible
-    build-node: centos7-docker-2c-8g
-    build-timeout: 60
-    stream: any
-    branch: '*'
-
-    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
-
 - project:
     name: lf-infra-lftools
     jobs:
index 0067ee76a90651a1b7719118fc7e530ac82fb74d..3ed9a65064bf09d82557ea38f2124dbeb5e0dbae 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 9a8a7b434dc1f9ef265f8d3676310756c253979d..85662fa097cda07cbe0d466bfc259a5c15eb7a82 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 5fa2f1e67bce1c591ab001759fbd216fe843d1b4..a14c7ffc8fec72427f6e5a5c303b2f18b65af5e9 100644 (file)
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: >
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
 - project:
     name: lispflowmapping-sonar
     jobs:
index 8fd766fd6aedfe1306810a01caa89552e8fd551c..70cebc427a5d6a4b66231ee00a6fd57f356c762d 100644 (file)
@@ -15,8 +15,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
new file mode 100644 (file)
index 0000000..136bd49
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: mdsal-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'mdsal'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 86cb2c3efde11765f82bdbb524c2b3c5db977404..2f9a39a92e283e9fe73a6aedba1ec320d243bd61 100644 (file)
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
-- project:
-    name: mdsal-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-8c-8g
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
 - project:
     name: mdsal-sonar
     jobs:
index df3049ed028f33008e08db6684a37d810c3d3793..3c620626f5aca03ad20b3f8464304cb900db2a25 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index aba72d8c29fb9df2e8e6ad769285bb0cd37d31ce..f1cc04467fe9e61b91b043f3c796f3bad8dafc7d 100644 (file)
     # Used by the release job
     staging-profile-id: a677283157db4
 
-- project:
-    name: messaging4transport-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'messaging4transport-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[messaging4transport]'
-
-    # Used by the release job
-    staging-profile-id: a677283157db4
-
 - project:
     name: messaging4transport-sonar
     jobs:
index 4b0235ec409a20bad19c9c6e6f4dc71727a3d506..f42bc0c8a1dcb255eb2539a09f00b47056aa5fab 100644 (file)
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
 
-- project:
-    name: natapp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a679c0f4f08a8
-
 - project:
     name: natapp-sonar
     jobs:
index ea5003956d0a392971f0b4f44a16a73ed3ab3170..e856c23bc968b8ae789c4f342d7b7d0c56d00355 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index eefa87c6e41d054953ca0de7042a9fdba2fa32a1..97c35cdbe55a06440c55f7cc900999477b6dc530 100644 (file)
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
-- project:
-    name: nemo-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[nemo]'
-
-    # Used by the release job
-    staging-profile-id: a67a9890f6202
-
 - project:
     name: nemo-sonar
     jobs:
index 1227599900e0a2755da7bed96a29fd972622bb3b..e107549d24855354edeaa2a24102c981726580b3 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 9b992e5760cdd4e3ac0353364ab82d619916336d..35393c283ec5a1c8d53adaef248536e7d3f16bd8 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1cc6053f4174ccd514ca52276d9f1f864e47b1e5..0deef710b81d9bff5fb259e1f93e5ad17044c318 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 9579718bcfa8dfa8f8fc738901bc73de1e060833..0a400d422b6b56c1579331f949f4f749d4ed39cb 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index c64b959d0c5f02078fcbc8b8c98a5d45b2b82733..3834975a3cf20c9bdfa6698b366063ea9532e47b 100644 (file)
@@ -4,23 +4,30 @@
     jobs:
       - inttest-patch-test
 
-    # The project name
     project: 'netconf'
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          os-branch: 'queens'
 
     feature:
       - core:
           csit-list: >
                 netconf-csit-1node-gate-userfeatures-all-{stream},
                 netconf-csit-1node-gate-callhome-only-{stream}
+
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index b736bc20a33480c5c9f977417900cd0b90c54604..7c63b90f2710bedda099e907c7d9b2564a76d62e 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 90f8760655ec93fdf2cea04b0859df52b5b740c4..9b6af63a8b3a509f1621c33f0fba18695dcbdf9b 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 5e5054050696ab99aca8ba30262b54208c2915d8..67246a2fddd4d280e9ade05a0288b0393a008aaf 100644 (file)
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
-- project:
-    name: netconf-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
 - project:
     name: netconf-sonar
     jobs:
index 0ce1d8122861597eff92e5041f80977ae9966517..7677a6596a1889ff82e925624fdcb1ca74d0831e 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 3599f849aed23ad086b4d079fea105b91e0102f0..8fbfacff1c6f9ee15c814ffd510f0d5e5e5ae597 100644 (file)
     # Used by the release job
     staging-profile-id: a67bab3755815
 
-- project:
-    name: netide-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a67bab3755815
-
 - project:
     name: netide-sonar
     jobs:
index 8128ee3114725ca8457595ebb01d6b167389feb3..86cf45cc6f52daa7c682883fe56a599e9248139c 100644 (file)
 
     topology:
       - 1node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     topology:
       - 1node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
index 136062d5b7d027758c11c91525d61ec3c721cfb9..c17dee868ab736cc2186fac4250e93ee1c4fa262 100644 (file)
@@ -31,6 +31,8 @@
 
     functionality:
       - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
       - gate-stateful
@@ -81,6 +83,7 @@
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
@@ -89,6 +92,8 @@
 
     functionality:
       - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
       - gate-stateful
index d9369a1096f1a5b808cb701a5a153e91b72868bb..c31887a919c621ef7ff5ce0b670338fe6cdb6a5b 100644 (file)
@@ -4,10 +4,8 @@
     jobs:
       - inttest-patch-test
 
-    # The project name
     project: 'netvirt'
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
@@ -40,3 +38,9 @@
       - tdd-wip:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream}
+      - coe:
+          csit-list: >
+              coe-csit-1node-container-networking-all-{stream}
+      - itm-direct-tunnels:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-upstream-stateful-itm-direct-tunnels-{stream}
index ec10ee5b7f16f91da05829a9a2867abc3cf3028c..47e065edd25d2af3d748b20768356fd56c75a236 100644 (file)
       - netvirt:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index b51ce7ad241f2e393528e736886ab23fbdf87ad9..48bd2756b3409ee45db5694df9ed7bfd748ee476 100644 (file)
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/nitrogen'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs:
index c3025ee070b9966f4584a516c763c1cc0a96b11f..86b6a16d8a687e33323a137f57a70c30adf7b8f0 100644 (file)
     # Used by the release job
     staging-profile-id: a67e7c516f385
 
-- project:
-    name: next-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-
-    # Used by the release job
-    staging-profile-id: a67e7c516f385
-
 - project:
     name: next-sonar
     jobs:
diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
deleted file mode 100644 (file)
index 59b60a8..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- project:
-    name: nic-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'nic'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-nic-intent-common'
-
-    # Robot custom options
-    robot-options: ''
index f79f0cf591fef4d75ce5b4807088c10719791c4c..8bf2afef336f56828e2b6a716fa88125e5ff5b6f 100644 (file)
     # Used by the release job
     staging-profile-id: a67ef386204aa
 
-- project:
-    name: nic-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
 - project:
     name: nic-sonar
     jobs:
diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
deleted file mode 100644 (file)
index 6b3da1b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- project:
-    name: ocpplugin-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'ocpplugin'
-
-    # The functionality under test
-    functionality: 'get'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
deleted file mode 100644 (file)
index a1ee88d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- project:
-    name: ocpplugin-csit-scalability
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'ocpplugin'
-
-    # The functionality under test
-    functionality: 'scalability'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all'
-
-    # Robot custom options
-    robot-options: ''
index 87c429e09b1666b1b9d23d6c0738c3f004f0c5fa..496e31ec7e2b14fcb1fec297ca721dc83bbefe2f 100644 (file)
     # Used by the release job
     staging-profile-id: a687673279f9c
 
-- project:
-    name: ocpplugin-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a687673279f9c
-
 - project:
     name: ocpplugin-sonar
     jobs:
index 980e70e15f798f28feaea8c65f41d8845897dfe7..77a669e0bbbe6a59628228f4c87284677ce35f8e 100644 (file)
@@ -20,9 +20,15 @@ echo "---> Check image protection"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 
+declare -a yaml_images
+readarray -t yaml_images <<< "$(grep -r _system_image: --include \*.yaml \
+    | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort -u)"
+declare -a cfg_images
+readarray -t cfg_images <<< "$(grep -r IMAGE_NAME --include \*.cfg \
+    | awk -F'=' -e '{print $2}' | sort -u)"
+combined=("${yaml_images[@]}" "${cfg_images[@]}")
 declare -a images
-readarray -t images <<< "$(grep -r _system_image: --include \*.yaml \
-    | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort | uniq)"
+readarray -t images <<< "$(printf '%s\n' "${combined[@]}" | sort -u)"
 
 for image in "${images[@]}"; do
     os_image_protected=$(openstack --os-cloud "$OS_CLOUD" image show "$image" -f value -c protected)
index 23886f7ee5f95555d782120c7b9cb37b1f5d574c..6524ed5722241d10e9831bf12cab1c54cb2fb0af 100644 (file)
@@ -15,5 +15,5 @@ virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 pip install --upgrade "pip<10.0.0" setuptools
-pip install --upgrade lftools python-openstackclient python-heatclient
+pip install --upgrade lftools[openstack] python-openstackclient python-heatclient
 pip freeze
diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
new file mode 100644 (file)
index 0000000..72c78e9
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: odlparent-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'odlparent'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 5c89996ce736f8a91e274f12c31dc2ff8d1394c6..6b87b0719cc3eafeb0cbdcacfccc137897e07449 100644 (file)
@@ -30,7 +30,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.1.x
+    name: odlparent-3.2.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -38,8 +38,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.x
+    stream: 3.2.x
+    branch: 3.2.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
@@ -60,7 +60,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.0.x
+    name: odlparent-3.1.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -68,8 +68,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.0.x
-    branch: 3.0.x
+    stream: 3.1.x
+    branch: 3.1.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
@@ -90,7 +90,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-2.0.x
+    name: odlparent-3.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -98,8 +98,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 2.0.x
-    branch: 2.0.x
+    stream: 3.0.x
+    branch: 3.0.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml
new file mode 100644 (file)
index 0000000..c6cdd36
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- project:
+    name: odltools
+    jobs:
+      - gerrit-tox-verify
+
+    stream:
+      - fluorine:
+          branch: 'master'
+
+    project: odltools
+    project-name: odltools
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60
index f806380c17a8bba99da899cf31f20ffed7e9fc27..5af38839360fd11953c29e576003843441fb4ea7 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 998c03f21a40031358013041a9019b07897a6d97..b9366d2c9ea2324858602dfcd020c2ded6aa6e32 100644 (file)
     # Used by the release job
     staging-profile-id: a6880455efe67
 
-- project:
-    name: of-config-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: netconf-merge-{stream}'
-    email-upstream: '[of-config] [netconf]'
-
-    # Used by the release job
-    staging-profile-id: a6880455efe67
-
 - project:
     name: of-config-sonar
     jobs:
index 77ea9f218c8b5103dd401aa526acfe5257fffb2d..4198831a93a588c4e330cce3bcbf7878fd46af66 100644 (file)
     # Used by the release job
     staging-profile-id: a68970cf5b25c
 
-- project:
-    name: circuitsw-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[circuitsw]'
-
-    # Used by the release job
-    staging-profile-id: a68970cf5b25c
-
 - project:
     name: circuitsw-sonar
     jobs:
diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh
new file mode 100755 (executable)
index 0000000..3a4c8af
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 Ericsson AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# This script creates ArtifactPublishedEvent (APE)
+# The JMS Messaging Plugin doesn't handle the newlines well so the eventBody is
+# constructed on a single line. This is something that needs to be fixed properly
+
+cat << EOF > $WORKSPACE/event.properties
+type=$PUBLISH_EVENT_TYPE
+origin=$PUBLISH_EVENT_ORIGIN
+eventBody="{ 'type': '$PUBLISH_EVENT_TYPE', 'id': '$(uuidgen)', \
+'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$PUBLISH_EVENT_ORIGIN', \
+'buildUrl': '$BUILD_URL', 'branch': 'master', 'artifactLocation': '$ARTIFACT_LOCATION', \
+'confidenceLevel': { $CONFIDENCE_LEVEL } }"
+EOF
+echo "Constructed $PUBLISH_EVENT_TYPE"
+echo "--------------------------------------------"
+cat $WORKSPACE/event.properties
+echo "--------------------------------------------"
diff --git a/jjb/openci/openci-odl-daily-jobs.yaml b/jjb/openci/openci-odl-daily-jobs.yaml
new file mode 100644 (file)
index 0000000..1ef00f0
--- /dev/null
@@ -0,0 +1,103 @@
+---
+- project:
+    name: openci-odl
+
+    project: '{name}'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+
+    jobs:
+      - 'openci-odl-autorelease-daily-{stream}'
+      - 'openci-odl-promote-daily-{stream}'
+
+# This job gets triggered manually for the demo purposes.
+#
+# In prototype, either what this job does needs to be integrated to
+# ODL autorelease job or triggered by the upstream autorelease job.
+- job-template:
+    name: 'openci-odl-autorelease-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    build-node: centos7-builder-2c-2g
+
+    parameters:
+      - string:
+          name: PUBLISH_EVENT_TYPE
+          default: ArtifactPublishedEvent
+          description: 'The type of the event this job publishes'
+      - string:
+          name: PUBLISH_EVENT_ORIGIN
+          default: ODL
+          description: 'Originating community'
+      - string:
+          name: ARTIFACT_LOCATION
+          default: https://url/to/artifact/on/odl/nexus/$BUILD_NUMBER
+          description: 'The location of the artifact on ODL Nexus'
+      - string:
+          name: CONFIDENCE_LEVEL
+          default: "'autorelease': 'SUCCESS'"
+          description: 'The confidence level the published artifact gained'
+
+    builders:
+      # first build step in the job executes create-ape.sh to construct the
+      # ArtifactPublishedEvent (ape)
+      - shell:
+          !include-raw-escape: ./create-ape.sh
+      # constructed event gets injected into environment so JME Messaging
+      # plugin can publish the event and its properties in post-build step
+      - inject:
+          properties-file: "$WORKSPACE/event.properties"
+
+    publishers:
+      - jms-messaging:
+          provider-name: openci.activemq
+          msg-type: Custom
+          msg-props: |
+            type=$type
+            origin=$origin
+          msg-content:
+            $eventBody
+
+# This job gets triggered by a ConfidenceLevelModifiedEvent published
+# by OPNFV jobs so ODL can promote the autorelease artifact even further.
+#
+# This job is created for the demo purposes and might not be there for
+# the prototype.
+- job-template:
+    name: 'openci-odl-promote-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    build-node: centos7-builder-2c-2g
+
+    triggers:
+      - jms-messaging:
+          provider-name: openci.activemq
+          selector: CI_TYPE = 'custom'
+          checks:
+            - field: origin
+              expected-value: 'OPNFV'
+            - field: type
+              expected-value: 'ConfidenceLevelModifiedEvent'
+            - field: scenario
+              expected-value: 'os-odl-nofeature'
+
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          echo
+          echo "Triggered by $type"
+          echo "----------------------------------"
+          echo $CI_MESSAGE
+          echo "----------------------------------"
+          echo " Promoted ODL Autorelease artifact as release candidate!"
index 381f9bec3f6a981992609e3d8d8f9359290a72b9..af5d2fa13ed7e5bc1034242eb184af610d349717 100644 (file)
@@ -13,7 +13,9 @@ virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 pip install --upgrade "pip<10.0.0" setuptools
-pip install --upgrade python-openstackclient python-heatclient
+# hardcoding cmd2 version as the most recent version seems to be broken.
+# reference: https://pypi.org/project/cmd2/#history
+pip install --upgrade cmd2==0.8.5 python-openstackclient python-heatclient
 pip freeze
 
 cd /builder/openstack-hot || exit 1
index a6c61b25101394cdc99817dba28a3e264f62e054..1122dbd609e4dc9c78ad7ac799e39e4aa4adaf45 100644 (file)
@@ -13,7 +13,7 @@ virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 pip install --upgrade --quiet "pip<10.0.0" setuptools
-pip install --upgrade --quiet python-openstackclient python-heatclient
+pip install --upgrade --quiet python-openstackclient
 pip freeze
 
 cat > "$WORKSPACE/docs/cloud-images.rst" << EOF
diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
deleted file mode 100644 (file)
index e207ab8..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: openflowjava-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'master'
-    mvn-settings: 'openflowjava-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a68a1507dae22
-
-- project:
-    name: openflowjava-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'master'
-    mvn-settings: 'openflowjava-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
new file mode 100644 (file)
index 0000000..ec8e0f1
--- /dev/null
@@ -0,0 +1,27 @@
+---
+- project:
+    name: openflowplugin-csit-bundle-based-reconciliation
+    jobs:
+      - inttest-csit-1node
+
+    project: 'openflowplugin'
+
+    functionality: 'bundle-based-reconciliation'
+
+    # Project branches
+    stream:
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+
+    install:
+      - all:
+          scope: 'all'
+
+    # Job images
+    tools_system_count: 2
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-rest'
index 7bf4f2a3b8a7ef17c4d1907da6ffac35cbc2386f..0dbd48791b1fd2724aee378512f5fb9a84cf1d8b 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 9a22ec92b92de8ed843e71b2dac68d683f8a4805..3bdae033aa327bba636614d205791deacc310398 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index c4740342c2349d8fdb3d8dc44db75bf7ccc354c4..4f284d2eab29f50889a1d6e4d4eb3c9cccab3318 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
@@ -37,7 +35,7 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125'
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2500'
 
     # Plot Info
     01-plot-title: 'Flow Add rate'
index da1520e4b31878aba570dcf1bf341480d29d3ad3..9dbcd65dc3d546ebe50233e03a4fd71ee4e5c595 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 0d41cc9ded03564d9c28b6cc3c78a253a52f0952..abf8635579e346fe6cf6f2dd55eeb267327c155f 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 38b8e609a3c68d96ae039a0e4e51151119ec7200..936c67d836cd4ec5b6a6d566ab249f6f3098b114 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index bd2808eff0c3cede83c2cf2a59c23f6e92dd0c7c..7bf25d470d7462672ef412f9066f84db33473471 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 981ad1064077658c4111bbc3ed8a53e28cd4b486..e45e444cadc58056974b11a34268ba3e98fb7b31 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 6cccdbf838e38131be6aeaf2143d80c1dc62a916..7154b80d0f4c9c07a90a15a64d944c638ffc6b96 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 567959a2014280fb4c8e92a8d722aec67858c68a..32d727a13593cb63e7aadf364e05985ba602abf8 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 21202836b04d9c00a55c515e462d916ff59ce4f0..fb43dd5991c9ef84011a951596d2f59e0a35bb4c 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index a93ea5e084d1499648e061332104c2073a242fcc..ed891598f6e1f9912cad5b744d802d8ef57e78f2 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 6f50fbc52be71fe346e9b4f788373bbca85b93ee..6af721d6c11e1da36e117ae312cacc4cd83b528b 100644 (file)
@@ -15,9 +15,6 @@
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
 
     jdk: 'openjdk8'
 
@@ -39,3 +36,7 @@
       - cluster-netvirt:
           csit-list: >
               netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 07582f1f8d72b63f2c0d12a8bd9949cc7e6e9fb2..e591415ce2f79cdc54affde85003b780543641f1 100644 (file)
@@ -4,6 +4,12 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
     stream: fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
     stream: oxygen
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
-
 - project:
     name: openflowplugin-sonar
     jobs:
index 593d22a9778acc8cb9a9897c1045c1385f69bda4..4490a389877efc7e9403c0605dc525b1d1fe175c 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
index b018d80d73e228ffc844689683d475060663a9a2..a0f30f7244813921eac626511a9cbabc81254e3c 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
 
index 323de7492ab9b60676416a573ea99245e7952f0d..c3c7a6699b8b6b4c5a39f0c7ed8d8745d35f5750 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     project-name: 'opflex'
index 1ab742cb4b17d6184eaced748552d5e7210f319a..d819198819a94e4a42e66d1610eb88d24caa50e1 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index ed3a0a02133d57f0994eb0741773d16cb44c1829..bb00aba5f0791842259ffc0ba11aaafec337cb5a 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 0e24962d8046d150eafb5cc7030a3ed2717faaa4..034696f571437adbe2a17c7285bebdb9e0a287e7 100644 (file)
@@ -9,11 +9,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
index 5a45af0b36947cd1945381852fa3f1f14ae1ba40..e3a26d71c46d519f72e4a3680d851f1fe534433a 100644 (file)
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
 
     jdk: 'openjdk8'
 
     feature:
       - genius:
           csit-list: >
-              genius-csit-1node-genius-all-{stream}
+              genius-csit-1node-gate-all-{stream}
       - netvirt:
           csit-list: >
               netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
index ee9d84b7fc9c83a7d7b058e005ef32051fb9d06c..7fcc646addbc950920f5dc82feee938ed6672f76 100644 (file)
@@ -4,6 +4,11 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: ovsdb
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
+          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs
 
     stream: fluorine
 
     # Used by the release job
     staging-profile-id: a68b188166958
-
-- project:
-    name: ovsdb-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
index 20f632e71618c02e6da44196c18478497d5d1725..cffc29bdbbb79b39716f2ada594d6d5fd570cc09 100644 (file)
@@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Convert stream to numeric ODL major version
-if [ "$STREAM" == "nitrogen" ]; then
-  VERSION_MAJOR=7
-elif [ "$STREAM" == "oxygen" ]; then
+if [ "$STREAM" == "oxygen" ]; then
   VERSION_MAJOR=8
 elif [ "$STREAM" == "fluorine" ]; then
   VERSION_MAJOR=9
index 0465cf603f5c4afc1f24f5a535d79cff2db022ab..b0bc0c073c5765e8ac21f9f22dff444451687c13 100644 (file)
@@ -26,7 +26,6 @@
 
     stream:
       - fluorine
-      - nitrogen
       - oxygen
     distro:
       - opensuse-42
@@ -68,7 +67,7 @@
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
       - string:
           name: CHANGELOG_NAME
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Nitrogen tarball
+      # Test Oxygen SR2 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen pre-release autorelease tarball
+      # Test latest Oxygen snapshot
+      - inject:
+          properties-content: 'STREAM=oxygen'
+      - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
+
+      # Test Fluorine pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2131/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen multipatch zip (no parallel tarball available)
+      # Test Fluorine multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.1-SNAPSHOT/karaf-0.8.1-20180417.030111-15.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Oxygen snapshot
+      # Test latest Fluorine snapshot
       - inject:
-          properties-content: 'STREAM=oxygen'
+          properties-content: 'STREAM=fluorine'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Nitrogen tarball
+      # Test Oxygen SR2 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Nitrogen SR1 tarball
+      # Test Oxygen pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2192/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Nitrogen multipatch zip (no parallel tarball available)
+      # Test Oxygen multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.3-SNAPSHOT/karaf-0.7.3-20180408.214158-1.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.2-SNAPSHOT/karaf-0.8.2-20180524.145206-1.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Nitrogen snapshot
+      # Test latest Oxygen snapshot
       - inject:
-          properties-content: 'STREAM=nitrogen'
+          properties-content: 'STREAM=oxygen'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen pre-release autorelease tarball
+      # Test Fluorine pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2131/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen multipatch zip (no parallel tarball available)
+      # Test Fluorine multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.1-SNAPSHOT/karaf-0.8.1-20180417.030111-15.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Oxygen snapshot
+      # Test latest Fluorine snapshot
       - inject:
-          properties-content: 'STREAM=oxygen'
+          properties-content: 'STREAM=fluorine'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo'
+          default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-9-devel.repo'
           description: 'Link to .repo or .rpm file'
 
     scm:
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-release.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-8-release.repo'
           description: 'Link to .repo or .rpm file'
       - string:
           name: UPGRADE_URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-devel.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-8-devel.repo'
           description: 'Link to .repo or .rpm file'
 
     scm:
           artifacts: '{archive-artifacts}'
       - string:
           name: PACKAGE
-          default: 'ppa:odl-team/nitrogen'
+          default: 'ppa:odl-team/oxygen'
           description: 'Link to .deb package or name of PPA repo'
 
     scm:
index 5ef7d58efb1af09a798d0768477f4319a98e8e05..0fd69b51c6ae0c04102384507a0fbe391e5bcf35 100644 (file)
@@ -15,8 +15,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
index a6cc205e184b80e8a12430d6bcf6731582b32c9e..84f4a6968d0110cbe2502b3b3b987fe00ee41868 100644 (file)
@@ -13,8 +13,7 @@ set -ex -o pipefail
 declare -a expected_ports=("1099" "8101" "44444")
 
 # Ports that should only be open after odl-nevirt-openstack is installed
-# 8080 is Nitrogen and Carbon only, not Oxygen
-declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8080" "8181" "8185")
+declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8181" "8185")
 
 # Make sure expected ports open
 COUNT="0"
index 11ebc0952bc8b7c3d07d0882838f508b8487c6fb..44a7263f0885b323e864ac11a7f14b76a1775f8e 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index ed16d18cba618c2b607fc06007a6691c43fcae8f..ebf860f78bd1baf7dc91c45a2eb2a818c89da504 100644 (file)
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
-- project:
-    name: packetcable-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
-
-    # Used by the release job
-    staging-profile-id: a68ca4a24655c
-
 - project:
     name: packetcable-sonar
     jobs:
index f9b73e441aee77b7b7bad599411fa7bef9044e0f..4d6d1ff3837bed6b41b9bb1c39d2c41313a0d16c 100644 (file)
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
 
-- project:
-    name: persistence-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/nitrogen'
-    jdk: openjdk7
-    mvn-settings: 'persistence-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[persistence]'
-
-    # Used by the release job
-    staging-profile-id: a68d3c2bb44d1
-
 - project:
     name: persistence-sonar
     jobs:
index f07f229d5ca47717323ae2112ab8eaefefaca325..d195b8a16241bd5da9717228eaea13252394c75f 100644 (file)
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.0.6
+    jjb-version: 2.0.10
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
 
-- project:
-    name: packer-jobs
-    # packer jobs templates are defined in global-jjb
-    jobs:
-      - '{project-name}-packer-jobs'
-    project: 'releng/builder'
-    project-name: builder
-    branch: master
-    archive-artifacts: '**/*.log'
-    build-node: centos7-builder-2c-1g
-
-    platforms:
-      - centos
-      - ubuntu-14.04
-      - ubuntu-16.04
-
-    templates:
-      - devstack
-      - devstack-pre-pip-ocata:
-          build-timeout: 75
-      - devstack-pre-pip-pike:
-          build-timeout: 75
-      - gbp
-      - mininet-ovs-2.5:
-          build-timeout: 60
-      - mininet-ovs-2.6:
-          build-timeout: 75
-
-    exclude:
-      - platforms: centos
-        templates: gbp
-      - platforms: centos
-        templates: mininet-ovs-2.5
-      - platforms: centos
-        templates: mininet-ovs-2.6
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-ocata
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-pike
-      - platforms: ubuntu-14.04
-        templates: devstack
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.5
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.6
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-ocata
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-pike
-      - platforms: ubuntu-16.04
-        templates: devstack
-
 - job-template:
     name: builder-check-poms
     node: centos7-builder-2c-1g
       - string:
           name: OS_CLOUD
           default: '{os-cloud}'
-          description: Artifacts to archive to the logs server.
+          description: |
+              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
+              variable name that is significant to openstack client as a
+              environment variable. Please refer to the documentation for
+              further details.
+              https://docs.openstack.org/developer/python-openstackclient/
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
index 72007f085080da54d8457d20350b0dd3078203ab..e6b79cb35df4ecc45a8d674051b5acee4ebe774a 100644 (file)
@@ -1,4 +1,13 @@
 ---
+- project:
+    name: packer-packer-verify-jobs
+    jobs:
+      - gerrit-packer-verify
+
+    project: releng/builder
+    project-name: builder
+    build-node: centos7-builder-2c-1g
+
 - project:
     name: packer-builder-jobs
     jobs:
 
     build-node: centos7-builder-2c-1g
     build-timeout: 90
+    cron: '00 H 1 * *'
 
     platforms: centos-7
     templates: builder
 
+- project:
+    name: packer-devstack-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
+    cron: '00 H 1 * *'
+
+    templates: devstack
+    platforms: centos-7
+
+- project:
+    name: packer-devstack-pre-pip-ocata-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 75
+    cron: '00 H 1 * *'
+
+    templates: devstack-pre-pip-ocata
+    platforms: centos-7
+
+- project:
+    name: packer-devstack-pre-pip-pike-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 75
+    cron: '00 H 1 * *'
+
+    templates: devstack-pre-pip-pike
+    platforms: centos-7
+
 - project:
     name: packer-docker-jobs
     jobs:
 
     build-node: centos7-builder-2c-1g
     build-timeout: 60
+    cron: '00 H 1 * *'
 
     platforms: centos-7
     templates: docker
 
 - project:
-    name: packer-mininet-jobs
+    name: packer-gbp-jobs
     jobs:
       - gerrit-packer-merge
 
 
     build-node: centos7-builder-2c-1g
     build-timeout: 90
+    cron: '00 H 1 * *'
+
+    templates: gbp
+    platforms:
+      - ubuntu-14.04
+      - ubuntu-16.04
+
+- project:
+    name: packer-mininet-ovs-2.5-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 60
+    cron: '00 H 1 * *'
+
+    templates: mininet-ovs-2.5
+    platforms: ubuntu-16.04
+
+- project:
+    name: packer-mininet-ovs-2.6-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
 
+    build-node: centos7-builder-2c-1g
+    build-timeout: 75
+    cron: '00 H 1 * *'
+
+    templates: mininet-ovs-2.6
     platforms: ubuntu-16.04
+
+- project:
+    name: packer-mininet-ovs-2.8-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
+    cron: '00 H 1 * *'
+
     templates: mininet-ovs-2.8
+    platforms: ubuntu-16.04
 
 - project:
     name: packer-robot-jobs
     archive-artifacts: '**/*.log'
 
     build-node: centos7-builder-2c-1g
+    build-timeout: 60
+    cron: '00 H 1 * *'
 
     platforms: centos-7
     templates: robot
+
+- project:
+    name: packer-kubernetes-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
+    cron: '00 H 1 * *'
+
+    platforms: ubuntu-16.04
+    templates: kubernetes
index 3f001989e03f86ceb4dfe49d45be272709dfb94e..4afb8dbdbdc806b4662051823ca40ad8ae42cfe2 100644 (file)
@@ -21,6 +21,8 @@
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
+    mvn-version: mvn35
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
index 5be4d2b18ac02568f87ccf93635c8eceb5511198..62c83c0fd4742307ae23cf2290866f7f61ea194b 100644 (file)
@@ -1,4 +1,20 @@
 ---
+- integration_view_csit: &integration_view_csit
+    name: integration-view-csit
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - robot-list
+    recurse: false
+
 - releng_view: &releng_view_common
     name: releng-view-common
     view-type: list
       - last-failure
       - last-duration
       - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
     recurse: false
 
-# Note: most-recent Job Filter requires JJB 2.1 to be released.
 - view:
-    name: 01-recent
+    name: 01-Recent
     regex: '.*'
     description: 'List of most recent jobs'
     job-filters:
 - view:
     name: CLM
     description: 'List of CLM jobs'
-    regex: '.*-clm$'
-    <<: *releng_view_common
+    regex: '.*-clm-.*'
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - policy-violations
+    recurse: false
 
 - view:
     name: CSIT-1node
     description: 'List of CSIT 1node jobs'
     regex: '^.*-csit-1node.*'
-    <<: *releng_view_common
+    <<: *integration_view_csit
 
 - view:
     name: CSIT-3node
     description: 'List of CSIT 3node jobs'
     regex: '^.*-csit-3node.*'
-    <<: *releng_view_common
+    <<: *integration_view_csit
 
 - view:
     name: CSIT
     description: 'List of CSIT jobs'
     regex: '^.*-csit-.*'
-    <<: *releng_view_common
+    <<: *integration_view_csit
 
 - view:
     name: CSIT-Verify
     description: 'List of CSIT Verify jobs'
     regex: '^.*-csit-verify.*'
-    <<: *releng_view_common
+    <<: *integration_view_csit
 
 - view:
     name: Distribution-Check
     <<: *releng_view_common
 
 - view:
-    name: intrautils
+    name: infrautils
     description: 'List of infrautils jobs'
     regex: '^infrautils-.*'
     <<: *releng_view_common
     name: netvirt-csit
     description: 'List of netvirt-csit jobs'
     regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
-    <<: *releng_view_common
+    <<: *integration_view_csit
 
 - view:
     name: neutron
     <<: *releng_view_common
 
 - view:
-    name: openflowjava
-    description: 'List of openflowjava jobs'
-    regex: '^openflowjava-.*'
+    name: openci
+    description: 'List of openci jobs'
+    regex: '^openci-.*'
     <<: *releng_view_common
 
 - view:
     regex: '^openflowplugin-.*'
     <<: *releng_view_common
 
-- view:
-    name: openflowplugin-carbon
-    description: 'List of openflowplugin carbon jobs'
-    regex: 'openflowplugin-.*-carbon'
-    <<: *releng_view_common
-
-- view:
-    name: openflowplugin-nitrogen
-    description: 'List of openflowplugin nitrogen jobs'
-    regex: 'openflowplugin-.*-nitrogen'
-    <<: *releng_view_common
-
 - view:
     name: openflowplugin-oxygen
     description: 'List of openflowplugin oxygen jobs'
     regex: '^persistence-.*'
     <<: *releng_view_common
 
-- view:
-    name: potn
-    description: 'List of potn jobs'
-    regex: '^potn-.*'
-    <<: *releng_view_common
-
 - view:
     name: reservation
     description: 'List of reservation jobs'
     <<: *releng_view_common
 
 - view:
-    name: sptn
-    description: 'List of sptn jobs'
-    regex: '^sptn-.*'
-    <<: *releng_view_common
-
-- view:
-    name: spx
-    description: 'List of spx jobs'
+    name: sxp
+    description: 'List of sxp jobs'
     regex: '^sxp-.*'
     <<: *releng_view_common
 
     regex: '^vbd-.*'
     <<: *releng_view_common
 
-- view:
-    name: verify-python
-    description: 'List of pyhton-verify jobs'
-    regex: '.*-python-.*'
-    <<: *releng_view_common
-
-- view:
-    name: vpnservice
-    description: 'List of vpnservice jobs'
-    regex: '^vpnservice-.*'
-    <<: *releng_view_common
-
-- view:
-    name: vtn
-    description: 'List of vtn jobs'
-    regex: '^vtn-.*'
-    <<: *releng_view_common
-
 - view:
     name: yang-push
     description: 'List of yang-push jobs'
index b6e748b49aec3b693dd3ac6b523a19eadde0e84c..e70d924a56bb39be376e20fa094c61b77fc0e2bc 100644 (file)
@@ -1 +1 @@
-jenkins-job-builder==2.0.6
+jenkins-job-builder==2.0.10
index bb02d193828f2e83855558af6b299ef182c68bf3..33c6313e209f27fa38cf46847dc0ac08f9ab2ae2 100644 (file)
     # Used by the release job
     staging-profile-id: a68d9bc504037
 
-- project:
-    name: reservation-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'reservation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[reservation]'
-
-    # Used by the release job
-    staging-profile-id: a68d9bc504037
-
 - project:
     name: reservation-sonar
     jobs:
index 1e1df4fc9ea32371ca3e816a14beea65695479f9..91b9e89bc30c824401d0548fbad5dbbecc62568b 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 0d06515aee127d07a16c66d6ca47d9fddf742cc7..664877e84b247505f703d66605df9535eba3e291 100644 (file)
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
 
-- project:
-    name: sdninterfaceapp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-
-    # Used by the release job
-    staging-profile-id: a68e3d1ff55e3
-
 - project:
     name: sdninterfaceapp-sonar
     jobs:
diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
new file mode 100644 (file)
index 0000000..b76c175
--- /dev/null
@@ -0,0 +1,51 @@
+---
+- project:
+    name: serviceutils
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: serviceutils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
+          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - odl-maven-jobs
+
+    stream:
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+
+    project: 'serviceutils'
+    project-name: 'serviceutils'
+    build-node: centos7-builder-2c-2g
+    mvn-settings: 'serviceutils-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    dependencies: >
+        controller-merge-{stream},
+        yangtools-merge-{stream},
+        odlparent-merge-{stream},
+        infrautils-merge-{stream}
+    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
+
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-sonar
+    jobs:
+      - gerrit-maven-sonar
+    project: 'serviceutils'
+    project-name: 'serviceutils'
+    branch: 'master'
+    build-node: centos7-builder-4c-4g
+    mvn-settings: 'serviceutils-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: serviceutils
+    description: 'List of serviceutils jobs'
+    regex: '^serviceutils-.*'
+    <<: *releng_view_common
index d9d576e42275702797a5f382a87828d955742e9e..56d49f56369cbe042b0bc0fa8e053d8acc498bb3 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index e6be93e35e489f12ef8f672299f2ebabf9d960f7..e085c8e68d93aa262e18cf4d064c6f842936f9be 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 0d155f72fedc72c959a28da24b7eeae39cf858f5..2ee117d46d6bad5a37873e18361f6b0895f02aa7 100644 (file)
@@ -13,8 +13,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     feature:
       - basic:
index 54ea866be7aa0c8b7dfc68492f0387edb887f8bd..ec17b9949bdd5855d21a78587ea16048ae7a6515 100644 (file)
@@ -9,8 +9,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     project: 'sfc'
     project-name: 'sfc'
index 75d1bd250bbc7cb8e528111496c63e920588bab2..f0fb8ca71785f92c5d1b3efe7aeb460e465f6d91 100644 (file)
@@ -3,6 +3,11 @@
     name: sfc-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sfc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
+          rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
 
     stream: fluorine
     name: sfc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sfc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
+          rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
 
     stream: oxygen
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
-- project:
-    name: sfc-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: a68eb361ca48a
-
 - project:
     name: sfc-sonar
     jobs:
index 045e7a8a28d8f6ad0fc760e112cad9bd92f95d47..84a9ca9fe8483cda0b81f51175b3f8d735e73180 100644 (file)
     # Used by the release job
     staging-profile-id: a68f328cefed6
 
-- project:
-    name: snbi-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-
-    # Used by the release job
-    staging-profile-id: a68f328cefed6
-
 - project:
     name: snbi-sonar
     jobs:
index a66bf0a18fdc8e9677bb7740a21f6187532fc697..c959329d84046c20a612635bc1b71a368280f7e6 100644 (file)
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
-- project:
-    name: snmp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a68fb236b93a6
-
 - project:
     name: snmp-sonar
     jobs:
index 0eac9f8d5de59dd5ed32143c6fa48c917d7831c2..87431891b5c7f8546a531df9d9665191c6dac586 100644 (file)
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
-- project:
-    name: snmp4sdn-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a69034a4b6ef5
-
 - project:
     name: snmp4sdn-sonar
     jobs:
index b6656a02cdbb8faf64eda99a6d8ae1d8f323d6d0..4c3271bc68c813ea192070d2f144be3757b41241 100644 (file)
@@ -19,8 +19,6 @@
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index a54a2f697ab06b1471d178b189260d764e613d71..71d140be32282a95c9a656d1838f0f85fa7feefe 100644 (file)
@@ -19,8 +19,6 @@
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 2013f744b0b38cb4b4ca20ab08679c1646e1d973..f4488e2474b0313127c8caa85a896a2646373cee 100644 (file)
@@ -19,8 +19,6 @@
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 2314008f8de69ddd530e339190557e4d142634ad..922b788958cf024f96fa2a2ab145a1302d3f5999 100644 (file)
@@ -19,8 +19,6 @@
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index cb63fe7b3bbdceb05ff5cacbaf5cd042310fc193..9a4f593310f11c741be0c4957834959a9bee3892 100644 (file)
@@ -19,8 +19,6 @@
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 4b0ab51c7b3ef5100f3433d336049f05c74fbfbd..3db08c4126a0692f33dd874ecb23c43d1ffcd9c4 100644 (file)
@@ -19,8 +19,6 @@
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 9d661fad5ae534e30976c737465a194b7f496afc..e8b6c02b50bbcaf818d69115123a809bddbe09d4 100644 (file)
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
-- project:
-    name: sxp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
 - project:
     name: sxp-sonar
     jobs:
index cf76a47f9980fbf336dbf6b3ffd0c3bdfbb395b3..d3bd2887352ebb07bdd41fc97786aae795c5838f 100644 (file)
     # Used by the release job
     staging-profile-id: a69113575458e
 
-- project:
-    name: systemmetrics-oxygen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: oxygen
-    branch: 'stable/oxygen'
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
-- project:
-    name: systemmetrics-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
 - project:
     name: systemmetrics-sonar
     jobs:
diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
deleted file mode 100644 (file)
index a1d4714..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- project:
-    name: topoprocessing-csit-topology-operations
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'topoprocessing'
-
-    # The functionality under test
-    functionality: 'topology-operations'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf'
-
-    # Robot custom options
-    robot-options: ''
index 97b7e3630c62c1e943ed9c8fd41e99d6408f1436..8ee0a78fb30ff1c2130f457499caef8ba6a0c6c4 100644 (file)
     # Used by the release job
     staging-profile-id: a691bbe2328cb
 
-- project:
-    name: topoprocessing-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a691bbe2328cb
-
 - project:
     name: topoprocessing-sonar
     jobs:
index e17f3469b06e0bd1bd4e47366708b8f6b08f3203..d1ab65f8db34aeb04c0051645c828b787c07e6db 100644 (file)
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'transportpce'
-    project-name: 'transportpce'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
 - project:
     name: transportpce-sonar
     jobs:
index 6e9a43ba30f01ce1c4666557cf878e7206eb2932..e173dc988d933f896891b6f6282007fc71590f54 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 57f60b33582a6f7388071f7565343379af2ecc08..ad5229baee45ac7adf91aff26218d64864d5e4fe 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index a034c1b0009fb22781b2808d6d69079ff2620c7d..6b1c235c4ff93fbd4d09a79d36e9b87d121115a4 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 0e35d1c50f7dca54f2df559a4e07ed24880a5628..a9fbd4761062d821184479335b1e7fbe01936cc9 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 2fe38b4c17b25829174cad38ef3a5987ec279dfd..564849dd854d67929f0ebb9b71c8c7fb4e227ced 100644 (file)
     # Used by the release job
     staging-profile-id: a69373036303c
 
-- project:
-    name: tsdr-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
-
-    # Used by the release job
-    staging-profile-id: a69373036303c
-
 - project:
     name: tsdr-sonar
     jobs:
index 8d4fbdf700d0e3e2f763bd313854a04d164e311f..b52b0245cc9554f36c69711202812cf14836e432 100644 (file)
     # Used by the release job
     staging-profile-id: a693f948563d5
 
-- project:
-    name: ttp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
 - project:
     name: ttp-sonar
     jobs:
diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
deleted file mode 100644 (file)
index a775332..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- project:
-    name: unimgr-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'unimgr'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Mininet configuration
-    tools_system_count: 2
-
-    # Features to install
-    install-features: 'odl-unimgr-ui'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
deleted file mode 100644 (file)
index c221e79..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: unimgr-csit-legato
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'unimgr'
-
-    # The functionality under test
-    functionality: 'legato'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Mininet configuration
-    tools_system_count: 2
-
-    # Features to install
-    install-features: 'odl-unimgr-ui,odl-unimgr-netvirt'
-
-    # Robot custom options
-    robot-options: ''
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
index ebc5171c08f2c1c43bd17a4024f5b88bd05da4e1..4c63ee1e642a45dc12bebb0902800a4951215fc6 100644 (file)
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
-- project:
-    name: unimgr-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
-
 - project:
     name: unimgr-sonar
     jobs:
index 0ef3a94d96a5ce3a41e627cb780c748603ef2c2e..72846d311e8ee0c48b8649ea2cf7b70dfa1731d2 100644 (file)
@@ -20,8 +20,6 @@
           repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 02a1d544c5493965ddb1f980903d122c4f645868..c0a3cf701d6b60cf1de9671cb3acad824b6ca5c0 100644 (file)
@@ -19,8 +19,6 @@
           repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index e447eca17d0b94d2dc0a23fdbfbc315c0a6c782f..f7dfeb8c561c68ddf99d28c043c91e79e9b29049 100644 (file)
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
-- project:
-    name: usc-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a697b633b3ffe
-
 - project:
     name: usc-sonar
     jobs:
index 83d3b707bd4fb3219df248dd7d12a1887b71cfcf..edbf3601e11341dd357f2663b24af4bd0696157f 100644 (file)
@@ -17,8 +17,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index 5a372d08da87486de2e8b4a68b9dd2d75dfe1326..1b017719b5a1825da9a3e8b65c20f758151203a2 100644 (file)
     # Used by the release job
     staging-profile-id: a69902281e037
 
-- project:
-    name: usecplugin-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a69902281e037
-
 - project:
     name: usecplugin-sonar
     jobs:
index d943a07e516011d13afa23c40a9af6094410ead3..5083bbfae3726a11004c210f7da8984ca6822884 100644 (file)
     # Used by the release job
     staging-profile-id: a69aae2832869
 
-- project:
-    name: yang-push-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'yang-push-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[yang-push]'
-
-    # Used by the release job
-    staging-profile-id: a69aae2832869
-
 - project:
     name: yang-push-sonar
     jobs:
index 2cfe449b6f4d7345e1e08580735f5489e560e070..be65fd219b5c788ef68a3eae8a13348936f2c0c9 100644 (file)
     # Used by the release job
     staging-profile-id: fba306956f98
 
-- project:
-    name: yangide-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'yangide'
-    project-name: 'yangide'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'yangide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[yangide] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: fba306956f98
-
 - project:
     name: yangide-sonar
     jobs:
index 7d53f7fc560f5f3b41983c767d3eb7826cef6017..5a68f2b1ecdf6d30c556fdb32561eff381245082 100644 (file)
 
     # Project branches.
     stream:
-      # The tested component was only introduced in Carbon.
       - fluorine:
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
new file mode 100644 (file)
index 0000000..8792126
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: yangtools-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'yangtools'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index c7d14dab5d96bc97902928474a71307104d034c3..0e5ccb848922500275dcb3312f5f2f8640d59aa8 100644 (file)
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'v1.2.x'
-    distribution_branch: 'stable/nitrogen'
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: 1271cf710cc09d
-
 - project:
     name: yangtools-sonar
     jobs:
index 54119a6668c212276639e556ce36ba54c0960f2b..e0319f3a5796486e27933827cb2b0c075c04dd70 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 54119a6668c212276639e556ce36ba54c0960f2b
+Subproject commit e0319f3a5796486e27933827cb2b0c075c04dd70
diff --git a/packer/provision/examples/apache-e-w.yaml b/packer/provision/examples/apache-e-w.yaml
new file mode 100644 (file)
index 0000000..bb84fa1
--- /dev/null
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    name: apacheservice
+    role: service
+  name: apacheservice
+spec:
+  ports:
+    - port: 8800
+      targetPort: 80
+      protocol: TCP
+      name: tcp
+  selector:
+    name: webserver
diff --git a/packer/provision/examples/apache-n-s.yaml b/packer/provision/examples/apache-n-s.yaml
new file mode 100644 (file)
index 0000000..7b774e4
--- /dev/null
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    name: apacheexternal
+    role: service
+  name: apacheexternal
+spec:
+  ports:
+    - port: 8800
+      targetPort: 80
+      protocol: TCP
+      name: tcp
+  selector:
+    name: webserver
+  type: NodePort
diff --git a/packer/provision/examples/apache-pod.yaml b/packer/provision/examples/apache-pod.yaml
new file mode 100644 (file)
index 0000000..cb97d13
--- /dev/null
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: apachetwin
+  labels:
+    name: webserver
+spec:
+  containers:
+  - name: apachetwin
+    image: fedora/apache
diff --git a/packer/provision/examples/busybox.yaml b/packer/provision/examples/busybox.yaml
new file mode 100644 (file)
index 0000000..babb765
--- /dev/null
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: busybox
+  namespace: default
+spec:
+  containers:
+  - image: busybox
+    command:
+      - sleep
+      - "3600"
+    imagePullPolicy: IfNotPresent
+    name: busybox
+  restartPolicy: Always
diff --git a/packer/provision/examples/nginx-pod.yaml b/packer/provision/examples/nginx-pod.yaml
new file mode 100644 (file)
index 0000000..d72959e
--- /dev/null
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: nginxtwin
+  labels:
+    name: webserver
+spec:
+  containers:
+  - name: nginxtwin
+    image: nginx
diff --git a/packer/provision/kubernetes.yaml b/packer/provision/kubernetes.yaml
new file mode 100644 (file)
index 0000000..ecf9e5f
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  vars:
+    openvswitch_version: 2.8.2
+    openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
+    k8s_version: 1.9.4
+
+  pre_tasks:
+    - include_role: name=lfit.system-update
+
+  roles:
+    - lfit.docker-install
+    - fkautz.bridge-utils-install
+    - fkautz.golang-install
+    - fkautz.kubernetes-install
+    - fkautz.openvswitch-install
+
+- hosts: all
+  tasks:
+    - name: Make example directory
+      file:
+        path: /opt/k8s-examples
+        state: directory
+      become: true
+    - name: Copy example files to example directory
+      synchronize:
+        src: ../provision/examples/
+        dest: /opt/k8s-examples/
+      become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true
index 0e9fd5f889be88216632248f7520c156a5b7b6f0..462005323af31ede51a2a035b23d20be3fc4cf87 100644 (file)
@@ -16,7 +16,7 @@
     - include_role: name=lfit.system-update
 
   roles:
-    - mono-install
+    - lfit.mono-install
 
   tasks:
     - name: Install Cassandra Server
@@ -76,7 +76,7 @@
           git:
             repo: https://github.com/6WIND/zrpcd.git
             dest: /tmp/build_quagga/zrpcd
-            version: 20170731
+            version: master
         - name: Set compile script executable
           file:
             path: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
index 88509d60ce90d0d1f50e2cdf40b31efd133c76c2..9ab7610d861587ec561a91f833d49aec0067d49c 100644 (file)
@@ -6,7 +6,7 @@
   become_method: sudo
 
   pre_tasks:
-    - include_role: name=system-update
+    - include_role: name=lfit.system-update
 
   tasks:
     - name: Install robot dependencies
diff --git a/packer/provision/roles/coe/requirements.yaml b/packer/provision/roles/coe/requirements.yaml
new file mode 100644 (file)
index 0000000..c4e1b21
--- /dev/null
@@ -0,0 +1,5 @@
+---
+- src: fkautz.bridge-utils-install
+- src: fkautz.openvswitch-install
+- src: fkautz.kubernetes-install
+- src: fkautz.golang-install
diff --git a/packer/provision/templates/odlovs-cni.conf.j2 b/packer/provision/templates/odlovs-cni.conf.j2
new file mode 100644 (file)
index 0000000..3782908
--- /dev/null
@@ -0,0 +1,22 @@
+{
+    "cniVersion": "0.3.0",
+    "name": "odl-cni",
+    "type": "odlovs-cni",
+    "mgrPort": {{ manager_port }},
+    "mgrActive": true,
+    "manager": "{{ manager_ip }}",
+    "ovsBridge": "br-int",
+    "ctlrPort": {{ controller_port }},
+    "ctlrActive": true,
+    "controller": "{{ controller_ip }}",
+    "externalIntf": "{{ external_interface }}",
+    "externalIp": "{{ external_ip }}",
+    "ipam": {
+        "type": "host-local",
+        "subnet": "{{ subnet }}",
+        "routes": [{
+            "dst": "0.0.0.0/0"
+        }],
+        "gateway": "{{ gateway }}"
+    }
+}
index 3fb4a0b9d01f21193507edd7c2b6ff6d12824fcd..418b2e19e2b9520e671c1fe2317e5c27c6800c6f 100644 (file)
@@ -23,7 +23,8 @@
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-devstack-ocata-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
index c33f502fca08aba64f1e5bf9a4234d5f73fa0a51..97ae02430ea594982d49fae4cec3c7651514e263 100644 (file)
@@ -23,7 +23,8 @@
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-devstack-pike-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
index 022e93c7ec4753d331fd9f7c7ae397404ca0ee0a..864d7b6c7c850b70ac74acf867ba944ba3d33a62 100644 (file)
@@ -23,7 +23,8 @@
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-devstack-queens-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
index fd4634c15735abaeeec682920608cc8f28922b52..625ad3784112f3d13dfb8503cd96c856e6ba7fda 100644 (file)
@@ -23,7 +23,8 @@
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-devstack-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
index 026c2eba8c5036b156528748200d644f65d8d310..3fc43e09bc0fbf91d79818b4517613bfb8e5e5ee 100644 (file)
@@ -23,7 +23,8 @@
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-gbp-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json
new file mode 100644 (file)
index 0000000..25823cd
--- /dev/null
@@ -0,0 +1,65 @@
+{
+  "variables": {
+    "ansible_roles_path": "roles/coe",
+    "base_image": null,
+    "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
+    "cloud_user_data": null,
+    "ssh_user": null,
+    "ssh_proxy_host": ""
+  },
+  "builders": [
+    {
+      "name": "vexxhost",
+      "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-kubernetes-{{uuid}}",
+      "source_image_name": "{{user `base_image`}}",
+      "type": "openstack",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "domain_name": "Default",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
+      "networks": [
+        "{{user `cloud_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "ssh_username": "{{user `ssh_user`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "flavor": "v1-standard-1",
+      "metadata": {
+        "ci_managed": "yes"
+      }
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "common-packer/provision/install-python.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    },
+    {
+      "type": "shell-local",
+      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}} provision/roles/coe/requirements.yaml"
+    },
+    {
+      "type": "ansible",
+      "playbook_file": "provision/kubernetes.yaml",
+      "ansible_env_vars": [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=True",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+      ]
+    }
+  ]
+}
index 3433c09a5dc970fc706d4421594fe0a65cf890d3..e96ade7d71b5846041e4c82667a3b5b7708474f5 100644 (file)
@@ -23,7 +23,8 @@
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
index b6ec6998b0a92a426aa91458a0f2378019baef79..86ddf455a6f3af0e279ca2d299839334ae11f32a 100644 (file)
@@ -23,7 +23,8 @@
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-mininet-ovs-26-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
index 142d492e3c2884d5ca8791815617b5d9c5466f59..1f668dbe95d5ddc975775c88e8f1c9ba209ece23 100644 (file)
@@ -1,5 +1,6 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -14,7 +15,8 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-mininet-ovs-28-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",
@@ -50,7 +52,7 @@
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
         "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ]
index 33aa9f6547ebc637d11ea1c3e84a29afc941cfc8..cff9a0e1c3041e359262bdda74bd287ed601977d 100644 (file)
@@ -1,5 +1,6 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -14,7 +15,8 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-robot-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",
@@ -50,7 +52,7 @@
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
         "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ]
diff --git a/packer/vars/centos.json b/packer/vars/centos.json
deleted file mode 100644 (file)
index 678a903..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "base_image": "LF - CentOS 7.1711 (2017-11-05)",
-  "distro": "CentOS 7",
-  "ssh_user": "centos",
-  "cloud_user_data": "provision/rh-user_data.sh"
-}
diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
deleted file mode 100644 (file)
index b55f96b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "base_image": "LF - Ubuntu 16.04 LTS (2017-12-01)",
-  "distro": "Ubuntu 16.04",
-  "ssh_user": "ubuntu",
-  "cloud_user_data": "provision/null_data.sh"
-}
index 9ee5dafd623d32e8fb3093c1ae816c2ecfb70cbe..4fade0a72d1c0373d0b2d1955e66534fcd785589 100755 (executable)
@@ -11,7 +11,7 @@
 ##############################################################################
 
 # List of directories, files to exclude
-declare -a excludes=("releng-defaults.yaml"
+declare -a excludes=("defaults.yaml"
                      "releng-macros.yaml"
                      "global-jjb"
                      "lf-infra"
diff --git a/tox.ini b/tox.ini
index 1f08557af6439aa72a091dd8f1435cf641dc5b2e..ad3eb318862cd1cc2fe2b1778348254eac2b07cd 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = coala,docs,pep8,robot
+envlist = coala,docs,pep8,prefix,robot
 skipsdist = true
 
 [testenv:coala]