Merge "enable driver_type gre and ml2_gre"
authorSam Hague <shague@redhat.com>
Tue, 11 Sep 2018 10:21:19 +0000 (10:21 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 11 Sep 2018 10:21:19 +0000 (10:21 +0000)
260 files changed:
.gitmodules
docs/cloud-images.rst
jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-32g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.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/cloud.cfg
jenkins-config/global-vars-releng.sh
jenkins-config/global-vars-sandbox.sh
jenkins-scripts/README [deleted file]
jenkins-scripts/basic_settings.sh [deleted file]
jenkins-scripts/builder.sh [deleted file]
jenkins-scripts/create_jenkins_user.sh [deleted file]
jenkins-scripts/devstack.sh [deleted file]
jenkins-scripts/disable_firewall.sh [deleted file]
jenkins-scripts/docker.sh [deleted file]
jenkins-scripts/jenkins-init-script-local-env.sh [deleted file]
jenkins-scripts/jenkins-init-script.sh [deleted file]
jenkins-scripts/mininet-ubuntu.sh [deleted file]
jenkins-scripts/robot.sh [deleted file]
jenkins-scripts/system_type.sh [deleted file]
jenkins-scripts/ubuntu-docker-ovs.sh [deleted file]
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/archetypes/archetypes.yaml
jjb/atrium/atrium.yaml [deleted file]
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/branch-cut.sh
jjb/autorelease/prepare-release.sh
jjb/autorelease/update-validate-autorelease-projects.sh
jjb/autorelease/validate-autorelease-fluorine.yaml
jjb/autorelease/validate-autorelease-neon.yaml [new file with mode: 0644]
jjb/autorelease/view-autorelease-neon.yaml [new file with mode: 0644]
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-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
jjb/coe/coe-patch-test.yaml
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
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
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/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-neon.lst [new file with mode: 0644]
jjb/integration/csit-jobs-oxygen.lst
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/integration-compare-distributions.sh
jjb/integration/integration-configure-clustering.sh
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-detect-variables.sh
jjb/integration/integration-get-slave-addresses.sh
jjb/integration/integration-install-robotframework.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/multipatch-distribution.sh
jjb/integration/update-csit-tests.sh
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/lfn/lfn.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
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml [deleted file]
jjb/messaging4transport/messaging4transport.yaml [deleted file]
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 [deleted file]
jjb/netide/netide.yaml
jjb/netvirt/netvirt-apex-images.yaml [new file with mode: 0644]
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent-patch-test.yaml
jjb/odltools/odltools.yaml
jjb/of-config/of-config-csit-basic.yaml [deleted file]
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml [deleted file]
jjb/opendaylight-infra-apex-image-management.sh [new file with mode: 0644]
jjb/opendaylight-infra-stack.sh
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
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.yaml
jjb/ovil/ovil.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-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin-csit-basic.yaml [deleted file]
jjb/p4plugin/p4plugin.yaml
jjb/packaging/ansible.yaml
jjb/packaging/packaging.yaml
jjb/packaging/test-ansible-rpm.sh
jjb/packaging/test-odl-logs.sh [new file with mode: 0644]
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml [deleted file]
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/reservation/reservation.yaml [deleted file]
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml [deleted file]
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.yaml
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-binding-origin.yaml [new file with mode: 0644]
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/telemetry/telemetry.yaml
jjb/topoprocessing/topoprocessing.yaml [deleted file]
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.yaml
jjb/usc/usc-csit-channel.yaml [deleted file]
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml [deleted file]
jjb/usecplugin/usecplugin.yaml
jjb/yang-push/yang-push.yaml [deleted file]
jjb/yangide/yangide-releng.yaml [deleted file]
jjb/yangide/yangide.yaml [deleted file]
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml
openstack-hot/apex-server.yaml [new file with mode: 0644]
openstack-hot/csit-apex-3-instance-type.yaml [new file with mode: 0644]
openstack-hot/generic-server.yaml
packer/common-packer
packer/provision/devstack-pre-pip.sh
packer/provision/devstack.sh

index 721507894789e094e340ca8a999249717a42ea29..6536c9b8b63a16bb74967de74838d07c9b84546c 100644 (file)
@@ -3,4 +3,4 @@
        url = https://github.com/lfit/releng-global-jjb
 [submodule "packer/common-packer"]
        path = packer/common-packer
-       url = https://gerrit.linuxfoundation.org/infra/releng/common-packer.git
+       url = https://github.com/lfit/releng-common-packer.git
index 3afbee1be73122b5b6365b92d8a4cd250b46a0bd..cb87663208630687bd95207e16d2469ffe8245c6 100644 (file)
@@ -4,6 +4,8 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - CentOS 7 - builder - 20180201-2139
 * ZZCI - CentOS 7 - builder - 20180611-1830
 * ZZCI - CentOS 7 - builder - 20180723-235310.638
+* ZZCI - CentOS 7 - builder - 20180802-220823.782
+* ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 * ZZCI - CentOS 7 - devstack - 20171208-1648
 * ZZCI - CentOS 7 - devstack - 20180723-235345.727
 * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
new file mode 100644 (file)
index 0000000..c74c467
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
+VOLUME_SIZE=100
+HARDWARE_ID=odl-highcpu-2
index eef00fc3c027341eb48e00b734daa9c264a13a2b..3732ebd4cea169eb187188b062dceb7df6782496 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-4
index 6b6e7950188f04bfd04831705fea2b2be376cdbd..caf98e7fde9bb1203fd4f9124371e347fa4601b0 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-8
index bfba06ad33c02639f6584de80773a7d4f14fe561..94ce68f349682c08fa1ccc4b2c248a54b69d26f4 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 VOLUME_SIZE=150
 HARDWARE_ID=odl-highcpu-8
index 801537908cfa0ff2095215d769dfddbfee7d4c7f..4deec3b3669518967ba53b7e2779c3ce980dbbe5 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=v1-standard-1
index b427a79085b6dc494caf2d4648f3c38445a34023..c1bd86443d81009aa09dd9e4c54d60f96218edef 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-highcpu-2
index 98c246af22cabf503c3fe7c49095d15e2bd84eb2..c72b9aa052280fe026680d15c083744c4be05865 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-standard-2
index f40f2d88bb9e18a7742fc9af43097ae00f190b0b..107592b269fe27a25e35da977326e102ed7f20f5 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-standard-4
index e943f33b7be367a56bd2ac255884ca0be45a1d61..b078b81d6f44fdb3081fb095b015028d37f48828 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-highcpu-4
index 4ffea7f22443fd0b2aedad05c64554805860cc03..52246911f6aa960b0613cc523df8c9dc3bf2ed5e 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=odl-highcpu-8
index 93e04006a655703069816693dc326c92bf0120e9..ca6ef5f939d63e39c1f6422e587faa9560ae96ec 100644 (file)
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180802-220823.782
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
index 83b3cb51ff5bda34b10ca014bf2b5e9b3b338d3f..d05b8531c13e82025aaf64788b718577f0699cb1 100644 (file)
@@ -5,5 +5,7 @@ JENKINS_HOSTNAME=vex-yul-odl-jenkins-1
 LOGS_SERVER=https://logs.opendaylight.org
 NEXUS_URL=https://nexus.opendaylight.org
 ODLNEXUSPROXY=https://nexus.opendaylight.org
+SIGUL_BRIDGE_IP=10.30.168.3
+SIGUL_KEY=odl-release-2018
 SILO=releng
 SONAR_URL=https://sonar.opendaylight.org
index 62de193e3a21c5ab19cd026c399986a76329ec17..e34e0fb48e9f147477be8e2489de0460839303a8 100644 (file)
@@ -5,5 +5,7 @@ JENKINS_HOSTNAME=vex-yul-odl-jenkins-2
 LOGS_SERVER=https://logs.opendaylight.org
 NEXUS_URL=https://nexus.opendaylight.org
 ODLNEXUSPROXY=https://nexus.opendaylight.org
+SIGUL_BRIDGE_IP=10.30.168.3
+SIGUL_KEY=odl-sandbox
 SILO=sandbox
 SONAR_URL=https://sonar.opendaylight.org
diff --git a/jenkins-scripts/README b/jenkins-scripts/README
deleted file mode 100644 (file)
index 3095daa..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-The scripts in this directory are used by the Jenkins spin-up component
-for dynamic slaves.
-
-The spinup script will be as follows (${system_type} will be replaced
-with the appropriate system_type script)
-
-git clone https://git.opendaylight.org/gerrit/p/releng/builder.git
-cd builder/jenkins-scripts
-./basic_settings.sh
-./${system_type}.sh
diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh
deleted file mode 100755 (executable)
index a80b9ff..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-#Increase limits
-cat <<EOF > /etc/security/limits.d/jenkins.conf
-jenkins         soft    nofile          16000
-jenkins         hard    nofile          16000
-EOF
-
-cat <<EOSSH >> /etc/ssh/ssh_config
-Host *
-  ServerAliveInterval 60
-
-# we don't want to do SSH host key checking on Rackspace spin-up systems
-# Dallas (ODL)
-Host 10.29.12.* 10.29.13.* 10.29.14.* 10.29.15.*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
-# Private Cloud (ODL)
-Host 10.29.8.* 10.29.9.* 10.29.10.* 10.29.11.*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
-# Vexxhost (ODL)
-Host 10.30.170.* 10.30.171.*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-EOSSH
-
-cat <<EOKNOWN >  /etc/ssh/ssh_known_hosts
-[140.211.169.26]:29418,[git.opendaylight.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyRXyHEw/P1iZr/fFFzbodT5orVV/ftnNRW59Zh9rnSY5Rmbc9aygsZHdtiWBERVVv8atrJSdZool75AglPDDYtPICUGWLR91YBSDcZwReh5S9es1dlQ6fyWTnv9QggSZ98KTQEuE3t/b5SfH0T6tXWmrNydv4J2/mejKRRLU2+oumbeVN1yB+8Uau/3w9/K5F5LgsDDzLkW35djLhPV8r0OfmxV/cAnLl7AaZlaqcJMA+2rGKqM3m3Yu+pQw4pxOfCSpejlAwL6c8tA9naOvBkuJk+hYpg5tDEq2QFGRX5y1F9xQpwpdzZROc5hdGYntM79VMMXTj+95dwVv/8yTsw==
-EOKNOWN
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
-
-# vim: sw=2 ts=2 sts=2 et :
diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh
deleted file mode 100755 (executable)
index 367451f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# vim: sw=2 ts=2 sts=2 et :
-
-yum clean all
-
-# disable the firewall
-/bin/bash ./disable_firewall.sh
-
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: ALL
-EOF
diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh
deleted file mode 100755 (executable)
index 6af25df..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-#######################
-# Create Jenkins User #
-#######################
-
-OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
-
-useradd -m -s /bin/bash jenkins
-
-# Check if docker group exists
-if grep -q docker /etc/group
-then
-    # Add jenkins user to docker group
-    usermod -a -G docker jenkins
-fi
-
-# Check if mock group exists
-if grep -q mock /etc/group
-then
-    # Add jenkins user to mock group so they can build Int/Pack's RPMs
-    usermod -a -G mock jenkins
-fi
-
-mkdir /home/jenkins/.ssh
-mkdir /w
-cp -r "/home/${OS}/.ssh/authorized_keys" /home/jenkins/.ssh/authorized_keys
-# Generate ssh key for use by Robot jobs
-echo -e 'y\n' | ssh-keygen -N "" -f /home/jenkins/.ssh/id_rsa -t rsa
-chown -R jenkins:jenkins /home/jenkins/.ssh /w
-chmod 700 /home/jenkins/.ssh
diff --git a/jenkins-scripts/devstack.sh b/jenkins-scripts/devstack.sh
deleted file mode 100755 (executable)
index d8a8732..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# It looks like the devstack gate is stomping on our dnsmasq setup which
-# therefore kills our ability to do proper lookups of some resources.
-# Let's capture the 3 nexus IPs into /etc/hosts
-cat <<EOHOSTS >> /etc/hosts
-# the internal address for nexus
-$(dig +short nexus.opendaylight.org) nexus.opendaylight.org
-# all the nexus proxies
-$(dig +short nexus01.dfw.opendaylight.org) nexus01.dfw.opendaylight.org
-$(dig +short nexus02.dfw.opendaylight.org) nexus02.dfw.opendaylight.org
-$(dig +short nexus03.ord.opendaylight.org) nexus03.ord.opendaylight.org
-EOHOSTS
-
-# make sure we don't require tty for sudo operations
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: ALL
-EOF
-
-# vim: sw=2 ts=2 sts=2 et :
diff --git a/jenkins-scripts/disable_firewall.sh b/jenkins-scripts/disable_firewall.sh
deleted file mode 100755 (executable)
index f779122..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-OS=$(facter operatingsystem)
-
-case "$OS" in
-    Fedora)
-        systemctl stop firewalld
-    ;;
-    CentOS|RedHat)
-        if [ "$(facter operatingsystemrelease | cut -d '.' -f1)" -lt "7" ]; then
-            service iptables stop
-        else
-            systemctl stop firewalld
-        fi
-    ;;
-    *)
-        # nothing to do
-    ;;
-esac
-
-# vim: ts=4 ts=4 sts=4 et :
diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
deleted file mode 100755 (executable)
index d896318..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# make sure we don't require tty for sudo operations
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: ALL
-EOF
-
-# make sure jenkins is part of the docker only if jenkins has already been
-# created
-
-if grep -q jenkins /etc/passwd
-then
-  /usr/sbin/usermod -a -G docker jenkins
-fi
-
-# vim: sw=2 ts=2 sts=2 et :
diff --git a/jenkins-scripts/jenkins-init-script-local-env.sh b/jenkins-scripts/jenkins-init-script-local-env.sh
deleted file mode 100755 (executable)
index 0e490f4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-## will be added in local environment
diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh
deleted file mode 100755 (executable)
index 3309b00..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-
-cd /builder/jenkins-scripts || exit 1
-chmod +x -- *.sh
-./system_type.sh
-
-# shellcheck disable=SC1091
-source /tmp/system_type.sh
-./basic_settings.sh
-"./${SYSTEM_TYPE}.sh"
-
-# Create the jenkins user last so that hopefully we don't have to deal with
-# guard files
-./create_jenkins_user.sh
-
-## add local environment changes post scripts
-./jenkins-init-script-local-env.sh
-
-# Create a swap file
-dd if=/dev/zero of=/swap count=1024 bs=1MiB
-chmod 600 /swap
-mkswap /swap
-swapon /swap
diff --git a/jenkins-scripts/mininet-ubuntu.sh b/jenkins-scripts/mininet-ubuntu.sh
deleted file mode 100755 (executable)
index 7f0cd56..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# make sure we don't require tty for sudo operations
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: ALL
-EOF
-
-# disable the firewall
-/bin/bash ./disable_firewall.sh
-
-# Add 'hostname' into /etc/hosts during node spinup time to avoid sudo returning
-# an 'unable to resolve host' message or some Java API's returning an unknown
-# host exception. The workaround on adding "myhostname" into /etc/nss-switch.conf
-# does not work on Ubuntu flavours.
-sed -i "/127.0.0.1/s/$/\t$(hostname)/" /etc/hosts
diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
deleted file mode 100755 (executable)
index 5fc0579..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# make sure we don't require tty for sudo operations
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: ALL
-EOF
-
-# make sure the firewall is stopped
-service iptables stop
-
-# vim: sw=2 ts=2 sts=2 et :
diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh
deleted file mode 100755 (executable)
index c5b141a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-
-HOST=$(/bin/hostname)
-SYSTEM_TYPE=''
-
-IFS=','
-for i in "java-builder,builder" \
-         "builder,builder" \
-         "devstack,devstack" \
-         "docker,docker" \
-         "gbp,ubuntu-docker-ovs" \
-         "kubernetes,mininet-ubuntu" \
-         "robot,robot" \
-         "mininet,mininet-ubuntu"
-do set -- $i
-    if [[ $HOST == *"$1"* ]]; then
-        SYSTEM_TYPE="$2"
-        break
-    fi
-done
-
-# Write out the system type to an environment file to then be sourced
-echo "SYSTEM_TYPE=${SYSTEM_TYPE}" > /tmp/system_type.sh
-
-# vim: sw=4 ts=4 sts=4 et :
diff --git a/jenkins-scripts/ubuntu-docker-ovs.sh b/jenkins-scripts/ubuntu-docker-ovs.sh
deleted file mode 100755 (executable)
index 743255b..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# make sure we don't require tty for sudo operations
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: ALL
-EOF
-
-# Add 'hostname' into /etc/hosts during node spinup time to avoid sudo returning
-# an 'unable to resolve host' message or some Java API's returning an unknown
-# host exception. The workaround on adding "myhostname" into /etc/nss-switch.conf
-# does not work on Ubuntu flavours.
-sed -i "/127.0.0.1/s/$/\t$(hostname)/" /etc/hosts
-
-# Do the final install of OVS that the has to be done at boot time for
-# some reason due to how the snapshots keep behaving.
-dpkg --install /root/openvswitch-datapath-dkms* && \
-dpkg --install /root/openvswitch-{common,switch}*
-
-# add user jenkins to docker group
-/usr/sbin/usermod -a -G docker jenkins
-
-# pull docker images
-docker pull alagalah/odlpoc_ovs230
-
-# vim: sw=2 ts=2 sts=2 et :
index 36bdb6040e1291e60e926f79b2881a5dbfad8fee..8d328842cf906a2be04e5f9c5acb88bcd482e58d 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index b50de45b9cc87f4caf603e00192378425d70f231..614ef0465451b27d8ca82e308706f47f569e9106 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 2936489dfd2449ec9103d63d108d3a287ddeb60d..9afe09314192da169c3fb1968aec9476ec5d0768 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 15dfe5b32b13ec35e26b83e22215fd767f6de8bb..435bbf8cf825f19a1defbbd6fff288c3d117f415 100644 (file)
@@ -7,9 +7,12 @@
     project: 'aaa'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index 10bcf36044f9897140cb90c2b31b9c160bb86365..98d4f58faa1d4f9102d0f5ae8a42eba6a43e005d 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: aaa-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'aaa'
+    project-name: 'aaa'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -8,7 +26,7 @@
     stream: fluorine
     project: 'aaa'
     project-name: 'aaa'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index c0c1c0434eb3f498b07c7bd86945878f583da388..ef5c322acfaa0ffa1d0913ce7f5d02ec8bce5d94 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 52ace6034d55997b2f6d6f1a7e999aec08975dc2..2c06d8482bd62e28db47c0d8ca0926129f0665a7 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: alto-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'alto'
+    project-name: 'alto'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +25,7 @@
     stream: fluorine
     project: 'alto'
     project-name: 'alto'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 111686ce4eede3328c6fbd326c994031494c67e5..99518b74bed06e538a1d49ff86052b0203e47a6a 100644 (file)
@@ -1,4 +1,28 @@
 ---
+- project:
+    name: archetypes-neon
+    jobs:
+      - gerrit-maven-clm
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          cron: '@daily'
+          mvn-goals: clean install -V -Dmaven.compile.fork=true
+      - gerrit-maven-release
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
+    stream: neon
+    project: 'archetypes'
+    project-name: 'archetypes'
+    branch: 'master'
+    mvn-settings: 'archetypes-settings'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: d88dcfe6ce48d
+
 - project:
     name: archetypes-fluorine
     jobs:
@@ -15,7 +39,7 @@
     stream: fluorine
     project: 'archetypes'
     project-name: 'archetypes'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'archetypes-settings'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
deleted file mode 100644 (file)
index be3daed..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- project:
-    name: atrium-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'master'
-    mvn-settings: 'atrium-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: atrium
-    description: 'List of atrium jobs'
-    regex: '^atrium-.*'
-    <<: *releng_view_common
index 79d679cc10bfb683bab1ddf7b1879336c8173bc4..7818f8045d759551a6b5cb73e8667c8a73c21e2a 100644 (file)
@@ -6,6 +6,7 @@
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}':
           build-node: centos7-autorelease-8c-32g
+      - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}':
           build-node: centos7-autorelease-8c-32g
       - gerrit-tox-verify
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+          integration-test: neon
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
+      - fluorine:
+          branch: 'stable/fluorine'
           integration-test: fluorine
           extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
               -Dskip.karaf.featureTest=true
index 64383697f16539d99839d1ac151df5891af76733..5280e00a3292df4bae64ee20acab2f547f783029 100644 (file)
           mark-unstable-if-failed: false
       - lf-infra-publish
 
+- job-template:
+    name: 'autorelease-update-submodules-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    cron: 'H 0 * * *'
+
+    #####################
+    # Job configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-builder-2c-2g
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: releng/autorelease
+          branch: '{branch}'
+          stream: '{stream}'
+          refspec: 'refs/heads/{branch}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-recursive: true
+          choosing-strategy: default
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+
+    triggers:
+      - timed: '{obj:cron}'
+
+    builders:
+      # Fetch latest head of branch
+      - shell: |
+          git checkout $GERRIT_BRANCH
+          git submodule update --remote
+          git add .
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
+          gerrit-topic: 'autorelease-update-submodules'
+          gerrit-commit-message: 'Update submodules to latest HEAD of branch'
+          reviewers-email: ''
+
+    publishers:
+      - lf-infra-publish
+
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
 
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
-      # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
-      - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom || true
       - maven-target:
           maven-version: mvn35
           pom: pom.xml
index 5c5df61e99e2de20b08eafde6c6d7eaab4dc36bd..20b96a4343088dbd7a0f8d9f72cd903956116f68 100644 (file)
@@ -11,7 +11,9 @@
     build-node: centos7-builder-2c-8g
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
index 3ae2d2a58c90c39639f7d963f2673eca676063de..fd0055f6a475823f116a5743bb3d5901bda21b34 100644 (file)
@@ -34,6 +34,10 @@ if [ -z "$RELEASE" ]; then
     exit 1
 fi
 
+git config gitreview.username jenkins-releng
+git submodule foreach git review -s
+git review -s
+
 # --- Start create new maintenance branch
 echo "---> Creating new mainenance branch"
 git submodule foreach git fetch origin
index b20b845fefea3cc401e5eca5f911dd26ccc85d99..d60364ee06588904401f62f7ff3de09fa324fb0b 100644 (file)
@@ -39,6 +39,10 @@ git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG
 echo "$RELEASE_TAG"
 find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
 
+# Ignore changes to Final distribution since that will be released separately
+pushd integration/distribution || exit 1
+    git checkout -f opendaylight/pom.xml
+popd || exit 1
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
index 327fb1abfd45925cb390f4c7a85b7c7a2d066c20..e7691cb130a680a8934a53bade38776ca350169f 100644 (file)
@@ -38,6 +38,11 @@ cat > "$YAML_FILE" << EOF
 EOF
 
 for module in "${modules[@]}"; do
+    # TODO: Remove this once mdsal fully becomes an MRI project.
+    if [ "$module" == "mdsal" ] && [ "$BRANCH" == "master" ]; then
+        continue
+    fi
+
     echo "Include $module"
     echo "      - ${module//\//-}:" >> "$YAML_FILE"
     echo "          project: $module" >> "$YAML_FILE"
index 7f2d8dab45565473b982b3496481022facd70634..7a399b56fc9423c310fb4785864794dfb93a82e3 100644 (file)
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
     stream: fluorine
-    branch: master
+    branch: stable/fluorine
     project-name:
       - aaa:
           project: aaa
diff --git a/jjb/autorelease/validate-autorelease-neon.yaml b/jjb/autorelease/validate-autorelease-neon.yaml
new file mode 100644 (file)
index 0000000..9a31828
--- /dev/null
@@ -0,0 +1,41 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-neon
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: neon
+    branch: master
+    project-name:
+      - aaa:
+          project: aaa
+      - bgpcep:
+          project: bgpcep
+      - controller:
+          project: controller
+      - coe:
+          project: coe
+      - daexim:
+          project: daexim
+      - genius:
+          project: genius
+      - infrautils:
+          project: infrautils
+      - integration-distribution:
+          project: integration/distribution
+      - lispflowmapping:
+          project: lispflowmapping
+      - netconf:
+          project: netconf
+      - netvirt:
+          project: netvirt
+      - neutron:
+          project: neutron
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils
+      - sfc:
+          project: sfc
diff --git a/jjb/autorelease/view-autorelease-neon.yaml b/jjb/autorelease/view-autorelease-neon.yaml
new file mode 100644 (file)
index 0000000..20b90f0
--- /dev/null
@@ -0,0 +1,42 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_neon
+    name: releng-view-autorelease-neon
+    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-Neon
+    description: 'List of Neon Merge jobs for Autorelease'
+    job-name:
+      - 'aaa-maven-merge-neon'
+      - 'bgpcep-maven-merge-neon'
+      - 'controller-maven-merge-neon'
+      - 'coe-maven-merge-neon'
+      - 'daexim-maven-merge-neon'
+      - 'genius-maven-merge-neon'
+      - 'infrautils-maven-merge-neon'
+      - 'integration/distribution-maven-merge-neon'
+      - 'lispflowmapping-maven-merge-neon'
+      - 'mdsal-maven-merge-neon'
+      - 'netconf-maven-merge-neon'
+      - 'netvirt-maven-merge-neon'
+      - 'neutron-maven-merge-neon'
+      - 'openflowplugin-maven-merge-neon'
+      - 'ovsdb-maven-merge-neon'
+      - 'serviceutils-maven-merge-neon'
+      - 'sfc-maven-merge-neon'
+    <<: *releng_autorelease_view_common_neon
index 846e07ad0c4825e4aadff15aff71aee8fad5c274..7347ea018976bc677bfc8c29c26ec5ce788d2608 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index ca9fa8ce9af901641f68f34ee6aebe933fad7f81..31794be641cde9ee810b5f90d6f4d1983315f139 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 248aeec6ebe5dfc808e000838e3bac2e1d0a15a0..b6f0ca61dab511d6dc0a12ff224c8cfe4c59f9cb 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 4c19390a4afe49f2a7d3e01bff06f198be6ae771..84e5bb2a603d317f20b132e4b25d06ac362a8b69 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index dd72b0f53c63692705838e7f07793a9bda7c73f1..c8902b46ba191342973358e3423a74453e2948b1 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 986e53e2964a7e8eb74bc636d805c3c6ea713aa7..534b08f25b4e6a101d88d25b967590e5cbff00f0 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 98542632cce26e47bd6e08809bbdeb0dda319e6e..40e58d612ae23af1fc2febc2b8297b20128b7692 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index f1e2b7a4a2cd6286bc3f7e56242521862eb8247a..2405fe4bd5969eb25aa03658aad74e543d2fe089 100644 (file)
@@ -9,8 +9,10 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 11f560f5b32a590554391dec3c8928aad298b499..fb8ebd152d58eb07a250289e2d165fb48b23f2bf 100644 (file)
@@ -1,4 +1,30 @@
 ---
+- project:
+    name: bgpcep-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'bgpcep'
+    project-name: 'bgpcep'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 120
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -11,7 +37,7 @@
     project-name: 'bgpcep'
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
     dependencies: >
index 67dcb5c018458403ead684230a222ba0f3d60d43..dc38606699874d43a08207f3bb817b1db153001f 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 943205bdfb3ba6d24c1a432502976bf6f4e91f66..953bfee2def412af6c2c00779c20d090e075c5a5 100644 (file)
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: bier-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    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-fluorine
     jobs:
@@ -7,7 +26,7 @@
     stream: fluorine
     project: 'bier'
     project-name: 'bier'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
index 1ed2c5d6ccac3bebf7821aeaaed35dcbcc58652f..1e2c783a5ce79cf185de9f169d82f76afd7a5ae4 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 95c26f5048430817793a0bd6b52ab23070cecd5a..3ecfeb5f1d20b904ce10d75ee8cf67494200764c 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: capwap-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index ba42c4da8822306b345e327768a313f9b2ddb344..e13cf73b3ee6c38babbe7cf70a22a4e86d01bd0a 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: cardinal-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'cardinal'
+    project-name: 'cardinal'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'cardinal'
     project-name: 'cardinal'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
index 47ba93e7713b46b4eb703eaa65bccb6d64cf5398..71988d3ae93d538acd51951d01d9f4aed5a48a1e 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index efc2054ff5528ceb9d0a4cc92f8fc876e199fd6e..ac2a045fb4051adf13953806a62cbd54e8361ae9 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: centinel-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'centinel'
+    project-name: 'centinel'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'centinel'
     project-name: 'centinel'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'centinel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 9af24570a9021d0ed0a70323c512682735a2a620..1b0722bd9242240b81579960094357a0db295d7d 100644 (file)
     install-features: 'odl-netvirt-coe'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index e838bbab607e71496cfcaec46a24a74cee1f7251..e79ddf59b82ac8d2000d6d40c380cc0ef085b2b2 100644 (file)
@@ -7,8 +7,10 @@
     project: 'coe'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 5c0a5f5dbc9e6c1b186c30c3d9b81520d72daac7..e18132ae8b474fe008620c888a092e85f6433fc4 100644 (file)
@@ -1,4 +1,28 @@
 ---
+- project:
+    name: coe-neon
+    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'
+    project-name: 'coe'
+    stream: neon
+    branch: 'master'
+    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]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 96c0be46aac33
+
 - project:
     name: coe-fluorine
     jobs:
@@ -13,7 +37,7 @@
     project: 'coe'
     project-name: 'coe'
     stream: fluorine
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index e3488469e024870ebd399510226791b1b297d638..2b655baa6582b70bd6912cca0b55da38bfdd7de7 100644 (file)
     functionality: 'akka1'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 36beac1219ae0e030beb5706778d4b79732d31b4..d65db362b2d073b9d8f301eb5e16523b6aa0c2d8 100644 (file)
@@ -9,8 +9,10 @@
     functionality: 'clustering'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index b8cc17ed8b0e66c6382248aa5f102eae9161ab3c..7397512ac038a9d542e7a00139c4caf456176a8c 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 14b1725da8cd7152e54bafab962a4bb8e760601a..db10859a7bd9748b58d3084dcc977a41832646f5 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 33c84f63280265cda7f4074b73ed97331baeca2f..250ce7da19cc298d378ab615a5592c326ecfe6f9 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index f0b6362b97eca9bcd66b398d7a8ac19f5c223bd2..0aefef94dd6d8eb48f184c6fd5e9eb8044a3abcd 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 8cad5fe09dfab2cf6ac2226fd4760ce7e787a3bf..1239d74f6667f80c6e320cf37a7a065172072a58 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 742d2b90fb19e41f7c03ff80ce8b412a6a7979b2..6f95f90c47b96fb2948bb08d4483d1fe1b3344b2 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 472c2fa7517aee370f2228f1301d0b8d2f39695c..9f14470e84f77e6d69956dc4f4582182aca12f2d 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 3c8973cb107bb4fbefe1c66ceb89b6fec3d05749..b54e60c4ae0c3491e7d7c7c967172c385d89f6d4 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 82196035cb2932b2b7c4a4733a4e201980938aef..a631e6282d62aa4fef3e040c35a9241d158c0ddf 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 0c8043371e37e2e00c6a4240442a8a3b25cb9777..a1546a218aa08daacc23b88c97db1d725b2bd4b2 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index ef786c01c42d5d6dc0092babbe857704be4117a1..3eadc236e1ed442057513db60e20f03d69d1b46b 100644 (file)
@@ -7,9 +7,12 @@
     project: 'controller'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index c6b7b4c13c0e6b63b4d8c056ba7a94bbbaa88c94..3d9a339fe8173ac0fc44b1d6e2a73d07fd491616 100644 (file)
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: controller-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -9,7 +31,7 @@
     stream: fluorine
     project: 'controller'
     project-name: 'controller'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
index 824580b2cdd63e571bfb4889910067735f10420f..c62b1b4079c3a609859d44bf968f34d4a3be1e53 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: coretutorials-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +25,7 @@
     stream: fluorine
     project: 'coretutorials'
     project-name: 'coretutorials'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'coretutorials-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 1324d4df2d9a97487e36edbcc48b28831719cf48..731844dea318efb09327c0648ef03025425f452e 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index b34bcd5c4f8697e894c5ad4e4b78db32257fd942..bf041892ca6dbe24596ac07db4fb0a74a85ac0ff 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index af0cb15599e7fa84650d99f678f14d2ca347f9fc..027cadcd84bb15d007ef3cd439a402947e0af6c6 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: daexim-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: neon
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -8,7 +26,7 @@
     project: 'daexim'
     project-name: 'daexim'
     stream: fluorine
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 27e67e78fc50d2af8deb6668d1946ad5294c0998..ef92697ecbff63d92955bc83e228d88e77099aa6 100644 (file)
@@ -74,6 +74,7 @@
     os-ctl-cnt: 0
     os-cmp-cnt: 0
     os-std-topo: '0cmb-1ctl-2cmp'
+    ovs-install: ''
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -97,7 +98,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
     odl_system_count: 1
     odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180802-220823.782
+    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
     openstack_system_count: 1
     openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20180723-235345.727
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-neon: >
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
     csit-high-frequency-list-fluorine: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
+    csit-sanity-list-neon: >
+        openflowplugin-csit-1node-sanity-only-neon,
+        distribution-sanity-neon
     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-weekly-list-neon: >
+        controller-csit-1node-notifications-longevity-only-neon,
+        controller-csit-3node-drb-partnheal-longevity-only-neon,
+        controller-csit-3node-drb-precedence-longevity-only-neon,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-neon,
+        bgpcep-csit-3node-bgpclustering-longevity-only-neon,
+        distribution-deploy-neon,
+        distribution-offline-neon,
+        openflowplugin-csit-1node-longevity-only-neon
     csit-weekly-list-fluorine: >
         controller-csit-1node-notifications-longevity-only-fluorine,
         controller-csit-3node-drb-partnheal-longevity-only-fluorine,
index b1e4b2014ae5d953a8fe442d3f7f775192e7ae19..2c630ac722928fe39be851ae3b756168b00a5b5b 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index b7a6e8704ac5d45cff68fe1b94e39cc6d5465174..11a7b2cd01a0128694173fb016f5536af94d9ba2 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: didm-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'didm'
     project-name: 'didm'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'didm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 5cf48822e7a6a3d2ca6cd89a7beaac3af7f755b3..4308da7d41a7a9ecec40f2e39d6ef81c4fcb9a1b 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: dlux-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'dlux'
     project-name: 'dlux'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
index 46f7ae5037a5e757a1484c26b911150e69b632ff..65f5c6f85880dbb7566e835b4f51f6c450422316 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index d006b15402ca639645ace06a62c50346b18314b9..85aefe9de3fafb1b6dd2f4859b6ae895c812c598 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: dluxapps-neon
+    jobs:
+      - odl-maven-jobs
+
+    project: 'dluxapps'
+    project-name: 'dluxapps'
+    stream: neon
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +25,7 @@
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: fluorine
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index a3a9bea5b96850aa58df8dc45f85b915562c3609..7ce8b8cc3712bdcb1ada11df28be85e6afaaf248 100644 (file)
@@ -6,8 +6,10 @@
       - gerrit-tox-verify
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 82b6c628a5bb51c2e987099f22f8836466c6daa7..919c4719b1b4fcde7d78f5c6d302692cacea6f42 100644 (file)
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: eman-neon
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'eman'
+    project-name: 'eman'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -8,7 +27,7 @@
     stream: fluorine
     project: 'eman'
     project-name: 'eman'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 9c6292c5a0d35e59f13855c527dbd61bf4e931b4..bf762128ab8c9aab115a1c2a6226952b06f254df 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: faas-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'faas'
     project-name: 'faas'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 1cb290d7650ce8f0445bc02137e6fde154a3af59..114719cb31352821c6ac40a033cc577a77fd74c6 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: federation-neon
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: neon
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -8,7 +26,7 @@
     project: 'federation'
     project-name: 'federation'
     stream: fluorine
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 056e8a3c103177184603d51e344d2d3247e7769d..416058edc6794fde7096a0d8ff69117e58ce4deb 100644 (file)
           testplan: '{project}-tdd-wip.txt'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
@@ -26,6 +28,7 @@
     tools_system_count: 3
 
     install-features: 'odl-genius-rest'
+    robot-options: '-v FAIL_ON_EXCEPTIONS:False'
 
 - project:
     name: genius-csit-genius-verify
index 354b441520103bfb5da521edad4e620a70151d12..6b400ad862fa02627d640256ecbc44f3242eb293 100644 (file)
@@ -7,9 +7,12 @@
     project: 'genius'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index ba9fcf5fe7c98600776c20ec8e01b269c4581353..6461944d360e8373e671587ac4907dedf51941e8 100644 (file)
@@ -1,4 +1,35 @@
 ---
+- project:
+    name: genius-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{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: neon
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'genius-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    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-fluorine
     jobs:
@@ -14,7 +45,7 @@
     stream: fluorine
     project: 'genius'
     project-name: 'genius'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 57d8b73a6ba6a0dea9985ec61a38a28f1e820b66..6b33561b93d8f4454f90d24cf641402fe58cd379 100644 (file)
     functionality: 'openstack'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - fluorine:
+          branch: 'stable/fluorine'
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
       - oxygen:
           branch: 'stable/oxygen'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
index 4a3b08f98fb58a7fddbca619c00fcfa59c92c60c..5589adb53cc981946f1fd51c3888ebac10c95ae8 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 4397cb80f631e65fdd5c791991cb7462cbab5d51..5779e1a1dfc34ba75b1864d9ed73bc71b067ec50 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 6395c405255ff6d30cc160157e043296282d2539..10dbc33ad7b23f1340b857c0d09d888d60f4b681 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 3fa1a99c521aefcd31a1d7e624d4b90088513243..6a826d4746648029e82bda1b61eb9981c18b7d78 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index aff6ca8dae27ab7ecaa99ef2b0aec7f086cda13f..607b26b738692e0676e517b5a28c11fd54c85153 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: groupbasedpolicy-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'groupbasedpolicy'
+    project-name: 'groupbasedpolicy'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'groupbasedpolicy-settings'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
+    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-fluorine
     jobs:
@@ -7,7 +32,7 @@
     stream: fluorine
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
index ef481385fa9db2a3f56e903805c1a5cef837a340..ff6d95171693d78e337f3e82a6351e84818bdde8 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: vbd-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 687f3b5d67d19091cbf18b662efdc6078ac532e2..0ad48be4ec91671d9478547688a3ead3cf300fe7 100644 (file)
@@ -7,9 +7,12 @@
     project: 'infrautils'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index dc6294200695fa84e2b8d77d733f16ff93a5d162..6ccd941b0e96a5a5bfcfda659a26b1b0e2705381 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: infrautils-neon
+    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: neon
+    project: 'infrautils'
+    project-name: 'infrautils'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -15,7 +40,7 @@
     stream: fluorine
     project: 'infrautils'
     project-name: 'infrautils'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
index 4695ccdbe470bda2139c3739f16d12dbff356e58..48280d1cd994eadf9bc5ec47882d36e4c676cc70 100644 (file)
@@ -256,7 +256,6 @@ PUBLIC_PHYSICAL_NETWORK: ${PUBLIC_PHYSICAL_NETWORK}
 ENABLE_NETWORKING_L2GW: ${ENABLE_NETWORKING_L2GW}
 CREATE_INITIAL_NETWORKS: ${CREATE_INITIAL_NETWORKS}
 LBAAS_SERVICE_PROVIDER: ${LBAAS_SERVICE_PROVIDER}
-NUM_OPENSTACK_SITES: ${NUM_OPENSTACK_SITES}
 ODL_SFC_DRIVER: ${ODL_SFC_DRIVER}
 ODL_SNAT_MODE: ${ODL_SNAT_MODE}
 
@@ -508,6 +507,7 @@ EOF
         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/install_ovs.txt ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/tcpdump_start.log ${NODE_FOLDER}
@@ -550,6 +550,7 @@ EOF
         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/install_ovs.txt ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/tcpdump_start.log ${NODE_FOLDER}
@@ -582,3 +583,396 @@ EOF
         echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
     fi
 } # collect_netvirt_logs()
+
+# Utility function for joining strings.
+function join() {
+    delim=' '
+    final=$1; shift
+
+    for str in "$@" ; do
+        final=${final}${delim}${str}
+    done
+
+    echo ${final}
+}
+
+function get_nodes_list() {
+    # Create the string for nodes
+    for i in `seq 1 ${NUM_ODL_SYSTEM}` ; do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        nodes[$i]=${!CONTROLLERIP}
+    done
+
+    nodes_list=$(join "${nodes[@]}")
+    echo ${nodes_list}
+}
+
+function get_features() {
+    if [ ${CONTROLLERSCOPE} == 'all' ]; then
+        ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
+        export CONTROLLERMEM="3072m"
+    else
+        ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
+    fi
+
+    # Some versions of jenkins job builder result in feature list containing spaces
+    # and ending in newline. Remove all that.
+    ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
+    echo "ACTUALFEATURES: ${ACTUALFEATURES}"
+
+    # In the case that we want to install features via karaf shell, a space separated list of
+    # ACTUALFEATURES IS NEEDED
+    SPACE_SEPARATED_FEATURES=$(echo "${ACTUALFEATURES}" | tr ',' ' ')
+    echo "SPACE_SEPARATED_FEATURES: ${SPACE_SEPARATED_FEATURES}"
+
+    export ACTUALFEATURES
+    export SPACE_SEPARATED_FEATURES
+}
+
+# Create the configuration script to be run on controllers.
+function create_configuration_script() {
+    cat > ${WORKSPACE}/configuration-script.sh <<EOF
+set -x
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
+
+echo "Changing to /tmp"
+cd /tmp
+
+echo "Downloading the distribution from ${ACTUAL_BUNDLE_URL}"
+wget --progress=dot:mega '${ACTUAL_BUNDLE_URL}'
+
+echo "Extracting the new controller..."
+unzip -q ${BUNDLE}
+
+echo "Adding external repositories..."
+sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
+cat ${MAVENCONF}
+
+if [[ "$USEFEATURESBOOT" == "True" ]]; then
+    echo "Configuring the startup features..."
+    sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
+fi
+
+FEATURE_TEST_STRING="features-integration-test"
+KARAF_VERSION=${KARAF_VERSION:-karaf4}
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+if [[ ! -z "${REPO_URL}" ]]; then
+   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+fi
+cat ${FEATURESCONF}
+
+configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
+
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"
+
+echo "Listing all open ports on controller system..."
+netstat -pnatu
+
+# Copy shard file if exists
+if [ -f /tmp/custom_shard_config.txt ]; then
+    echo "Custom shard config exists!!!"
+    echo "Copying the shard config..."
+    cp /tmp/custom_shard_config.txt /tmp/${BUNDLEFOLDER}/bin/
+fi
+
+echo "Configuring cluster"
+/tmp/${BUNDLEFOLDER}/bin/configure_cluster.sh \$1 ${nodes_list}
+
+echo "Dump akka.conf"
+cat ${AKKACONF}
+
+echo "Dump modules.conf"
+cat ${MODULESCONF}
+
+echo "Dump module-shards.conf"
+cat ${MODULESHARDSCONF}
+EOF
+# cat > ${WORKSPACE}/configuration-script.sh <<EOF
+}
+
+# Create the startup script to be run on controllers.
+function create_startup_script() {
+    cat > ${WORKSPACE}/startup-script.sh <<EOF
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p /tmp/${BUNDLEFOLDER}/data/log
+
+echo "Starting controller..."
+/tmp/${BUNDLEFOLDER}/bin/start
+EOF
+# cat > ${WORKSPACE}/startup-script.sh <<EOF
+}
+
+function create_post_startup_script() {
+    cat > ${WORKSPACE}/post-startup-script.sh <<EOF
+if [[ "$USEFEATURESBOOT" != "True" ]]; then
+
+    # wait up to 60s for karaf port 8101 to be opened, polling every 5s
+    loop_count=0;
+    until [[ \$loop_count -ge 12 ]]; do
+        netstat -na | grep 8101 && break;
+        loop_count=\$[\$loop_count+1];
+        sleep 5;
+    done
+
+    echo "going to feature:install --no-auto-refresh ${SPACE_SEPARATED_FEATURES} one at a time"
+    for feature in ${SPACE_SEPARATED_FEATURES}; do
+        sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+                             -o UserKnownHostsFile=/dev/null \
+                             -o LogLevel=error \
+                             -p 8101 karaf@localhost \
+                             feature:install --no-auto-refresh \$feature;
+    done
+
+    echo "ssh to karaf console to list -i installed features"
+    sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+                         -o UserKnownHostsFile=/dev/null \
+                         -o LogLevel=error \
+                         -p 8101 karaf@localhost \
+                         feature:list -i
+fi
+
+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
+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..."
+netstat -pnatu
+
+function exit_on_log_file_message {
+    echo "looking for \"\$1\" in log file"
+    if grep --quiet "\$1" "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"; then
+        echo ABORTING: found "\$1"
+        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"
+        exit 1
+    fi
+}
+
+exit_on_log_file_message 'BindException: Address already in use'
+exit_on_log_file_message 'server is unhealthy'
+EOF
+# cat > ${WORKSPACE}/post-startup-script.sh <<EOF
+}
+
+# Copy over the configuration script and configuration files to each controller
+# Execute the configuration script on each controller.
+function copy_and_run_configuration_script() {
+    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        echo "Configuring member-${i} with IP address ${!CONTROLLERIP}"
+        scp ${WORKSPACE}/configuration-script.sh ${!CONTROLLERIP}:/tmp/
+        ssh ${!CONTROLLERIP} "bash /tmp/configuration-script.sh ${i}"
+    done
+}
+
+# Copy over the startup script to each controller and execute it.
+function copy_and_run_startup_script() {
+    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        echo "Starting member-${i} with IP address ${!CONTROLLERIP}"
+        scp ${WORKSPACE}/startup-script.sh ${!CONTROLLERIP}:/tmp/
+        ssh ${!CONTROLLERIP} "bash /tmp/startup-script.sh"
+    done
+}
+
+function copy_and_run_post_startup_script() {
+    seed_index=1
+    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        echo "Execute the post startup script on controller ${!CONTROLLERIP}"
+        scp ${WORKSPACE}/post-startup-script.sh ${!CONTROLLERIP}:/tmp
+        ssh ${!CONTROLLERIP} "bash /tmp/post-startup-script.sh $(( seed_index++ ))"
+        if [ $(( $i % ${NUM_ODL_SYSTEM} )) == 0 ]; then
+            seed_index=1
+        fi
+    done
+}
+
+function create_controller_variables() {
+    echo "Generating controller variables..."
+    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
+        echo "Lets's take the karaf thread dump"
+        ssh ${!CONTROLLERIP} "sudo ps aux" > ${WORKSPACE}/ps_before.log
+        pid=$(grep org.apache.karaf.main.Main ${WORKSPACE}/ps_before.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
+        echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
+        ssh ${!CONTROLLERIP} "${JAVA_HOME}/bin/jstack -l ${pid}" > ${WORKSPACE}/karaf_${i}_${pid}_threads_before.log || true
+    done
+}
+
+# Function to build OVS from git repo
+function build_ovs() {
+    local -r ip=$1
+    local -r version=$2
+    local -r rpm_path="$3"
+
+    echo "Building OVS ${version} on ${ip} ..."
+    cat > ${WORKSPACE}/build_ovs.sh << EOF
+set -ex -o pipefail
+
+echo '---> Building openvswitch version ${version}'
+
+# Install running kernel devel packages
+K_VERSION=\$(uname -r)
+YUM_OPTS="-y --disablerepo=* --enablerepo=base,updates,extra,C*-base,C*-updates,C*-extras"
+# Install centos-release to update vault repos from which to fetch
+# kernel devel packages
+sudo yum \${YUM_OPTS} install centos-release yum-utils @'Development Tools' rpm-build
+sudo yum \${YUM_OPTS} install kernel-{devel,headers}-\${K_VERSION}
+
+TMP=\$(mktemp -d)
+pushd \${TMP}
+
+git clone https://github.com/openvswitch/ovs.git
+cd ovs
+
+if [ "${version}" = "v2.6.1-nsh" ]; then
+    git checkout v2.6.1
+    echo "Will apply nsh patches for OVS version 2.6.1"
+    git clone https://github.com/yyang13/ovs_nsh_patches.git ../ovs_nsh_patches
+    git apply ../ovs_nsh_patches/v2.6.1_centos7/*.patch
+else
+    git checkout ${version}
+fi
+
+# On early versions of OVS, flake warnings would fail the build.
+# Remove it.
+sudo pip uninstall -y flake8
+
+# Get rid of sphinx dep as it conflicts with the already
+# installed one (via pip). Docs wont be built.
+sed -i "/BuildRequires:.*sphinx.*/d" rhel/openvswitch-fedora.spec.in
+
+sed -e 's/@VERSION@/0.0.1/' rhel/openvswitch-fedora.spec.in > /tmp/ovs.spec
+sed -e 's/@VERSION@/0.0.1/' rhel/openvswitch-kmod-fedora.spec.in > /tmp/ovs-kmod.spec
+sed -e 's/@VERSION@/0.0.1/' rhel/openvswitch-dkms.spec.in > /tmp/ovs-dkms.spec
+sudo yum-builddep \${YUM_OPTS} /tmp/ovs.spec /tmp/ovs-kmod.spec /tmp/ovs-dkms.spec
+rm /tmp/ovs.spec /tmp/ovs-kmod.spec /tmp/ovs-dkms.spec
+./boot.sh
+./configure --build=x86_64-redhat-linux-gnu --host=x86_64-redhat-linux-gnu --with-linux=/lib/modules/\${K_VERSION}/build --program-prefix= --disable-dependency-tracking --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-libcapng --enable-ssl --with-pkidir=/var/lib/openvswitch/pki PYTHON=/usr/bin/python2
+make rpm-fedora RPMBUILD_OPT="--without check"
+# Build dkms only for now
+# make rpm-fedora-kmod RPMBUILD_OPT='-D "kversion \${K_VERSION}"'
+rpmbuild -D "_topdir \$(pwd)/rpm/rpmbuild" -bb --without check rhel/openvswitch-dkms.spec
+
+mkdir -p /tmp/ovs_rpms
+cp -r rpm/rpmbuild/RPMS/* /tmp/ovs_rpms/
+
+popd
+rm -rf \${TMP}
+EOF
+
+    scp ${WORKSPACE}/build_ovs.sh ${ip}:/tmp
+    ${SSH} ${ip} " bash /tmp/build_ovs.sh >> /tmp/install_ovs.txt 2>&1"
+    scp -r ${ip}:/tmp/ovs_rpms/* "${rpm_path}/"
+    ${SSH} ${ip} "rm -rf /tmp/ovs_rpms"
+}
+
+# Install OVS RPMs from yum repo
+function install_ovs_from_repo() {
+    local -r ip=$1
+    local -r rpm_repo="$2"
+
+    echo "Installing OVS from repo ${rpm_repo} on ${ip} ..."
+    cat > ${WORKSPACE}/install_ovs.sh << EOF
+set -ex -o pipefail
+
+echo '---> Installing openvswitch from ${rpm_repo}'
+
+# We need repoquery from yum-utils.
+sudo yum -y install yum-utils
+
+# Get openvswitch packages offered by custom repo.
+# dkms package will have priority over kmod.
+OVS_REPO_OPTS="--repofrompath=ovs-repo,${rpm_repo} --disablerepo=* --enablerepo=ovs-repo"
+OVS_PKGS=\$(repoquery \${OVS_REPO_OPTS} openvswitch)
+OVS_SEL_PKG=\$(repoquery \${OVS_REPO_OPTS} openvswitch-selinux-policy)
+OVS_DKMS_PKG=\$(repoquery \${OVS_REPO_OPTS} openvswitch-dkms)
+OVS_KMOD_PKG=\$(repoquery \${OVS_REPO_OPTS} openvswitch-kmod)
+[ -n "\${OVS_SEL_PKG}" ] && OVS_PKGS="\${OVS_PKGS} \${OVS_SEL_PKG}"
+[ -n "\${OVS_DKMS_PKG}" ] && OVS_PKGS="\${OVS_PKGS} \${OVS_DKMS_PKG}"
+[ -z "\${OVS_DKMS_PKG}" ] && [ -n "\${OVS_KMOD_PKG}" ] && OVS_PKGS="\${OVS_PKGS} \${OVS_KMOD_PKG}"
+
+# Bail with error if custom repo was provided but we could not
+# find suitable packages there.
+[ -z "\${OVS_PKGS}" ] && echo "No OVS packages found in custom repo." && exit 1
+
+# Install kernel & devel packages for the openvswitch dkms package.
+if [ -n "\${OVS_DKMS_PKG}" ]; then
+    # install centos-release to update vault repos from which to fetch
+    # kernel devel packages
+    sudo yum -y install centos-release
+    K_VERSION=\$(uname -r)
+    YUM_OPTS="-y --disablerepo=* --enablerepo=base,updates,extra,C*-base,C*-updates,C*-extras"
+    sudo yum \${YUM_OPTS} install kernel-{headers,devel}-\${K_VERSION} @'Development Tools' python-six
+fi
+
+PREV_MOD=\$(sudo modinfo -n openvswitch || echo '')
+
+# Install OVS offered by custom repo.
+sudo yum-config-manager --add-repo "${rpm_repo}"
+sudo yum -y versionlock delete openvswitch-*
+sudo yum -y remove openvswitch-*
+sudo yum -y --nogpgcheck install \${OVS_PKGS}
+sudo yum -y versionlock add \${OVS_PKGS}
+
+# Most recent OVS versions have some incompatibility with certain versions of iptables
+# This below line will overcome that problem.
+sudo modprobe openvswitch
+
+# Start OVS and print details
+sudo systemctl start openvswitch
+sudo systemctl enable openvswitch
+sudo ovs-vsctl --retry -t 5 show
+sudo modinfo openvswitch
+
+# dkms rpm install can fail silently (probably because the OVS version is
+# incompatible with the running kernel), verify module was updated.
+NEW_MOD=\$(sudo modinfo -n openvswitch || echo '')
+[ "\${PREV_MOD}" != "\${NEW_MOD}" ] || (echo "Kernel module was not updated" && exit 1)
+EOF
+
+    scp ${WORKSPACE}/install_ovs.sh ${ip}:/tmp
+    ${SSH} ${ip} "bash /tmp/install_ovs.sh >> /tmp/install_ovs.txt 2>&1"
+}
+
+# Install OVS RPMS from path
+function install_ovs_from_path() {
+    local -r ip=$1
+    local -r rpm_path="$2"
+
+    echo "Creating OVS RPM repo on ${ip} ..."
+    ${SSH} ${ip} "mkdir -p /tmp/ovs_rpms"
+    scp -r "${rpm_path}"/* ${ip}:/tmp/ovs_rpms
+    ${SSH} ${ip} "sudo yum -y install createrepo && createrepo --database /tmp/ovs_rpms"
+    install_ovs_from_repo ${ip} file:/tmp/ovs_rpms
+}
+
+
index ced59e9470bf6df48b9ad5f3797cb6b89ca3b388..8756caf3f608b6665159c13b3c57ecc1bf05299b 100644 (file)
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-fluorine,
-aaa-csit-1node-keystone-all-fluorine,
 aaa-csit-1node-tls-only-fluorine,
 bgpcep-csit-1node-bgp-ingest-all-fluorine,
 bgpcep-csit-1node-bgp-ingest-mixed-all-fluorine,
@@ -31,20 +30,16 @@ netconf-csit-1node-userfeatures-all-fluorine,
 netconf-csit-3node-cluster-stress-all-fluorine,
 netconf-csit-3node-clustering-all-fluorine,
 netconf-csit-3node-clustering-scale-all-fluorine,
+netvirt-csit-1node-0cmb-1ctl-1cmp-openstack-queens-sfc-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-fluorine,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-fluorine,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-fluorine,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-fluorine,
diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst
new file mode 100644 (file)
index 0000000..93c0fdb
--- /dev/null
@@ -0,0 +1,66 @@
+aaa-csit-1node-authn-all-neon,
+aaa-csit-1node-tls-only-neon,
+bgpcep-csit-1node-bgp-ingest-all-neon,
+bgpcep-csit-1node-bgp-ingest-mixed-all-neon,
+bgpcep-csit-1node-throughpcep-all-neon,
+bgpcep-csit-1node-userfeatures-all-neon,
+bgpcep-csit-3node-bgpclustering-all-neon,
+bgpcep-csit-3node-bgpclustering-ha-only-neon,
+coe-csit-1node-container-networking-all-neon,
+controller-csit-1node-akka1-all-neon,
+controller-csit-1node-benchmark-all-neon,
+controller-csit-1node-rest-cars-perf-all-neon,
+controller-csit-3node-benchmark-all-neon,
+controller-csit-3node-clustering-all-neon,
+controller-csit-3node-rest-clust-cars-perf-ask-only-neon,
+controller-csit-3node-rest-clust-cars-perf-tell-only-neon,
+daexim-csit-1node-basic-only-neon,
+daexim-csit-3node-clustering-basic-only-neon,
+distribution-csit-1node-userfeatures-all-neon,
+distribution-csit-managed-neon,
+genius-csit-1node-upstream-all-neon,
+genius-csit-3node-upstream-all-neon,
+lispflowmapping-csit-1node-msmr-all-neon,
+lispflowmapping-csit-1node-performance-only-neon,
+lispflowmapping-csit-3node-msmr-all-neon,
+mdsal-csit-1node-bindingv1-only-neon,
+netconf-csit-1node-callhome-only-neon,
+netconf-csit-1node-scale-all-neon,
+netconf-csit-1node-userfeatures-all-neon,
+netconf-csit-3node-cluster-stress-all-neon,
+netconf-csit-3node-clustering-all-neon,
+netconf-csit-3node-clustering-scale-all-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrack-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrack-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-neon,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon,
+openflowplugin-csit-1node-bundle-based-reconciliation-all-neon,
+openflowplugin-csit-1node-cbench-only-neon,
+openflowplugin-csit-1node-flow-services-all-neon,
+openflowplugin-csit-1node-perf-bulkomatic-only-neon,
+openflowplugin-csit-1node-perf-stats-collection-only-neon,
+openflowplugin-csit-1node-scale-link-only-neon,
+openflowplugin-csit-1node-scale-only-neon,
+openflowplugin-csit-1node-scale-switch-only-neon,
+openflowplugin-csit-3node-clustering-bulkomatic-only-neon,
+openflowplugin-csit-3node-clustering-only-neon,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-neon,
+ovsdb-csit-1node-upstream-southbound-all-neon,
+ovsdb-csit-3node-upstream-clustering-only-neon,
+sfc-csit-3node-docker-full-deploy-all-neon,
+sfc-csit-3node-rest-basic-all-neon,
+yangtools-csit-1node-system-only-neon,
index 29604b9350ee5be51794c3030ac8c2da506bf55b..d9d85a170cd624a4c06e0715cd89e0a37fbc01dc 100644 (file)
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-oxygen,
-aaa-csit-1node-keystone-all-oxygen,
 aaa-csit-1node-tls-only-oxygen,
 alto-csit-1node-setup-all-oxygen,
 bgpcep-csit-1node-bgp-ingest-all-oxygen,
@@ -43,10 +42,10 @@ netconf-csit-1node-userfeatures-all-oxygen,
 netconf-csit-3node-cluster-stress-all-oxygen,
 netconf-csit-3node-clustering-all-oxygen,
 netconf-csit-3node-clustering-scale-all-oxygen,
+netvirt-csit-1node-0cmb-1ctl-1cmp-openstack-queens-sfc-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrack-oxygen,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
@@ -60,7 +59,6 @@ netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-oxygen
 netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-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,
@@ -74,7 +72,6 @@ openflowplugin-csit-3node-clustering-only-oxygen,
 openflowplugin-csit-3node-clustering-perf-bulkomatic-only-oxygen,
 ovsdb-csit-1node-upstream-southbound-all-oxygen,
 ovsdb-csit-3node-upstream-clustering-only-oxygen,
-p4plugin-csit-1node-basic-all-oxygen,
 packetcable-csit-1node-pcmm-all-oxygen,
 sfc-csit-3node-docker-full-deploy-all-oxygen,
 sfc-csit-3node-rest-basic-all-oxygen,
@@ -88,6 +85,5 @@ tsdr-csit-1node-cassandra-datastore-only-oxygen,
 tsdr-csit-1node-elasticsearch-datastore-only-oxygen,
 tsdr-csit-1node-hbase-datastore-all-oxygen,
 tsdr-csit-1node-hsqldb-datastore-all-oxygen,
-usc-csit-1node-channel-all-oxygen,
 usc-csit-1node-tcp-all-oxygen,
 yangtools-csit-1node-system-only-oxygen,
index 4c69b386c989004a5b4e73d64fb7bc868c077141..1381e246b30d37cf4159e23d63d8fe4d29254567 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 1792c171ff3217e512f7ef4a402a53ae1473257c..700e0dc6a435933ae0f767c48a0493fdc062d12a 100644 (file)
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     email-upstream: '[int/dist]'
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
               mvn:org.opendaylight.sxp/features-sxp//xml/features,
               mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
-              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features
+              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features,
           sm-features: >
               odl-sxp-routing,
               odl-tsdr-core,
               odl-tsdr-hbase,
               odl-tsdr-hsqldb,
               odl-tsdr-elasticsearch,
-              odl-unimgr-rest
+              odl-unimgr,
+              odl-unimgr-template-driver,
+              odl-unimgr-cisco-xr-driver,
+              odl-unimgr-ovs-driver,
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.snmp4sdn/features-snmp4sdn//xml/features,
+              mvn:org.opendaylight.sxp/features-sxp//xml/features,
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features,
+              mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
+              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features,
+          sm-features: >
+              odl-snmp4sdn-snmp4sdn
+              odl-sxp-routing,
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels,
+              odl-transportpce-stubmodels,
+              odl-tsdr-core,
+              odl-tsdr-openflow-statistics-collector,
+              odl-tsdr-netflow-statistics-collector,
+              odl-tsdr-restconf-collector,
+              odl-tsdr-syslog-collector,
+              odl-tsdr-controller-metrics-collector,
+              odl-tsdr-cassandra,
+              odl-tsdr-hbase,
+              odl-tsdr-hsqldb,
+              odl-tsdr-elasticsearch,
+              odl-unimgr,
+              odl-unimgr-template-driver,
+              odl-unimgr-cisco-xr-driver,
+              odl-unimgr-ovs-driver,
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
     profile: '-Pmanaged'
     forbidden-files: 'opendaylight/**'
     karaf-version: karaf4
+    dist-pom: 'distribution/pom.xml'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           dependencies: >
               aaa-merge-{stream},
               ovsdb-merge-{stream},
               serviceutils-merge-{stream},
               sfc-merge-{stream}
+      - fluorine:
+          branch: 'stable/fluorine'
+          dependencies: >
+              aaa-merge-{stream},
+              bgpcep-merge-{stream},
+              coe-merge-{stream},
+              controller-merge-{stream},
+              daexim-merge-{stream},
+              genius-merge-{stream},
+              infrautils-merge-{stream},
+              lispflowmapping-merge-{stream},
+              mdsal-merge-{stream},
+              netconf-merge-{stream},
+              netvirt-merge-{stream}
+              neutron-merge-{stream},
+              openflowplugin-merge-{stream},
+              ovsdb-merge-{stream},
+              serviceutils-merge-{stream},
+              sfc-merge-{stream}
 
       - oxygen:
           branch: 'stable/oxygen'
     profile: '-Punmanaged'
     files: 'opendaylight/**'
     karaf-version: odl
+    dist-pom: 'distribution/opendaylight/pom.xml'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
               sxp-merge-{stream},
               tsdr-merge-{stream},
-              unimgr-merge-{stream}
+              unimgr-merge-{stream},
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              snmp4sdn-merge-{stream},
+              sxp-merge-{stream},
+              transportpce-merge-{stream},
+              tsdr-merge-{stream},
+              unimgr-merge-{stream},
+
+- project:
+    name: distribution-release
+    jobs:
+      - gerrit-maven-release
+
+    project: 'integration/distribution'
+    project-name: 'distribution'
+    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
+    mvn-settings: 'integration-distribution-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    email-upstream: '[int/dist]'
+
+    # Used by the release job
+    staging-profile-id: 2af042ed81d5e2
+
+    stream:
+      - neon:
+          branch: 'master'
+
+      - fluorine:
+          branch: 'stable/fluorine'
 
 - project:
     name: distribution-sonar
index b86d2dd8f01f06f4b1c99bc9368f4449616cd47b..ece5c1073cc6aecac37b2c15d9ad47a7c4567580 100644 (file)
       - distribution-check-warn-9191
       - distribution-check-warn-9192
       - integration-upload-distribution:
-          dist-pom: distribution/pom.xml
+          dist-pom: '{dist-pom}'
       - distribution-check-bootup
 
     publishers:
index b02b568027b806c7e372df4c23c3621ca2b3a981..eb2df1c06e9e466483eb180ea91ea6655b15f91f 100644 (file)
@@ -11,7 +11,12 @@ GERRIT_PATH=${GERRIT_PATH:-git.opendaylight.org/gerrit}
 DISTROBRANCH=${DISTROBRANCH:-$GERRIT_BRANCH}
 
 # Obtain current pom.xml of integration/distribution, correct branch.
-wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
+    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=opendaylight/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+else
+    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+fi
+
 # Extract the BUNDLE_VERSION from the pom.xml
 BUNDLE_VERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
 echo "Bundle version is ${BUNDLE_VERSION}"
index 619f3c311853fefca6fd877d764e1eacb9f1ec39..43df86444261fc64a570de67c8be94231534ebb7 100644 (file)
@@ -10,128 +10,21 @@ echo "#################################################"
 echo "##         Configure Cluster and Start         ##"
 echo "#################################################"
 
-if [ ${CONTROLLERSCOPE} == 'all' ]; then
-    ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    export CONTROLLERMEM="3072m"
-else
-    ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
-fi
-# Some versions of jenkins job builder result in feature list containing spaces
-# and ending in newline. Remove all that.
-ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
+get_features
 
-# Utility function for joining strings.
-function join {
-    delim=' '
-    final=$1; shift
-
-    for str in "$@" ; do
-        final=${final}${delim}${str}
-    done
-
-    echo ${final}
-}
-
-# Create the string for nodes
-for i in `seq 1 ${NUM_ODL_SYSTEM}` ; do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    nodes[$i]=${!CONTROLLERIP}
-done
-
-nodes_list=$(join "${nodes[@]}")
-
-echo ${nodes_list}
+# shellcheck disable=SC2034
+nodes_list=$(get_nodes_list)
 
 run_plan "script"
 
-# Create the configuration script to be run on controllers.
-cat > ${WORKSPACE}/configuration-script.sh <<EOF
-set -x
-source /tmp/common-functions.sh ${BUNDLEFOLDER}
-
-echo "Changing to /tmp"
-cd /tmp
-
-echo "Downloading the distribution from ${ACTUAL_BUNDLE_URL}"
-wget --progress=dot:mega  '${ACTUAL_BUNDLE_URL}'
-
-echo "Extracting the new controller..."
-unzip -q ${BUNDLE}
-
-echo "Adding external repositories..."
-sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
-cat ${MAVENCONF}
-
-echo "Configuring the startup features..."
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
-
-FEATURE_TEST_STRING="features-integration-test"
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_TEST_STRING="features-test"
-fi
-
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
-if [[ ! -z "${REPO_URL}" ]]; then
-   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
-fi
-cat ${FEATURESCONF}
-
-configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
-
-set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"
-
-# Copy shard file if exists
-if [ -f /tmp/custom_shard_config.txt ]; then
-    echo "Custom shard config exists!!!"
-    echo "Copying the shard config..."
-    cp /tmp/custom_shard_config.txt /tmp/${BUNDLEFOLDER}/bin/
-fi
-
-echo "Configuring cluster"
-/tmp/${BUNDLEFOLDER}/bin/configure_cluster.sh \$1 ${nodes_list}
-
-echo "Dump akka.conf"
-cat ${AKKACONF}
-
-echo "Dump modules.conf"
-cat ${MODULESCONF}
-
-echo "Dump module-shards.conf"
-cat ${MODULESHARDSCONF}
-
-EOF
-
-# Create the startup script to be run on controllers.
-cat > ${WORKSPACE}/startup-script.sh <<EOF
-
-echo "Redirecting karaf console output to karaf_console.log"
-export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p /tmp/${BUNDLEFOLDER}/data/log
-
-echo "Starting controller..."
-/tmp/${BUNDLEFOLDER}/bin/start
+create_configuration_script
 
-EOF
+create_startup_script
 
-# Copy over the configuration script and configuration files to each controller
-# Execute the configuration script on each controller.
-for i in `seq 1 ${NUM_ODL_SYSTEM}`
-do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    echo "Configuring member-${i} with IP address ${!CONTROLLERIP}"
-    scp ${WORKSPACE}/configuration-script.sh ${!CONTROLLERIP}:/tmp/
-    ssh ${!CONTROLLERIP} "bash /tmp/configuration-script.sh ${i}"
-done
+copy_and_run_configuration_script
 
 run_plan "config"
 
-# Copy over the startup script to each controller and execute it.
-for i in `seq 1 ${NUM_ODL_SYSTEM}`
-do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    echo "Starting member-${i} with IP address ${!CONTROLLERIP}"
-    scp ${WORKSPACE}/startup-script.sh ${!CONTROLLERIP}:/tmp/
-    ssh ${!CONTROLLERIP} "bash /tmp/startup-script.sh"
-done
+copy_and_run_startup_script
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index 9fc28a881875a65597efdcb7d9c778bd5521bdac..20a536a4553ec25d2813478b3963123fe5e31bf6 100755 (executable)
 source ${ROBOT_VENV}/bin/activate
 source /tmp/common-functions.sh ${BUNDLEFOLDER}
 
-if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
-    echo "Configure cluster"
-    AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
-    MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
-    MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
-fi
-
-if [ ${CONTROLLERSCOPE} == 'all' ]; then
-    ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    export CONTROLLERMEM="3072m"
-else
-    ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
-fi
+echo "#################################################"
+echo "##         Configure Cluster and Start         ##"
+echo "#################################################"
 
-# Some versions of jenkins job builder result in feature list containing spaces
-# and ending in newline. Remove all that.
-ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
-echo "ACTUALFEATURES: ${ACTUALFEATURES}"
+get_features
 
-# In the case that we want to install features via karaf shell, a space separated list of
-# ACTUALFEATURES IS NEEDED
-SPACE_SEPARATED_FEATURES=$(echo "${ACTUALFEATURES}" | tr ',' ' ')
-echo "SPACE_SEPARATED_FEATURES: ${SPACE_SEPARATED_FEATURES}"
+# shellcheck disable=SC2034
+nodes_list=$(get_nodes_list)
 
 run_plan "script"
 
-cat > ${WORKSPACE}/configuration-script.sh <<EOF
-set -x
-source /tmp/common-functions.sh ${BUNDLEFOLDER}
-
-echo "Changing to /tmp"
-cd /tmp
-
-echo "Downloading the distribution..."
-wget --progress=dot:mega '${ACTUAL_BUNDLE_URL}'
-
-echo "Extracting the new controller..."
-unzip -q ${BUNDLE}
-
-echo "Adding external repositories..."
-sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
-cat ${MAVENCONF}
-
-if [[ "$USEFEATURESBOOT" == "True" ]]; then
-    echo "Configuring the startup features..."
-    sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
-fi
-
-FEATURE_TEST_STRING="features-integration-test"
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_TEST_STRING="features-test"
-fi
-
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
-if [[ ! -z "${REPO_URL}" ]]; then
-   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
-fi
-cat ${FEATURESCONF}
-
-configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
+create_configuration_script
 
-set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}" "${MEMCONF}"
+create_startup_script
 
-echo "Listing all open ports on controller system..."
-netstat -pnatu
+create_post_startup_script
 
-if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
-
-    # Copy shard file if exists
-    if [ -f /tmp/custom_shard_config.txt ]; then
-        echo "Custom shard config exists!!!"
-        echo "Copying the shard config..."
-        cp /tmp/custom_shard_config.txt /tmp/${BUNDLEFOLDER}/bin/
-    fi
-
-    echo "Configuring cluster"
-    /tmp/${BUNDLEFOLDER}/bin/configure_cluster.sh \$1 \$2
-
-    echo "Dump akka.conf"
-    cat ${AKKACONF}
-
-    echo "Dump modules.conf"
-    cat ${MODULESCONF}
-
-     echo "Dump module-shards.conf"
-     cat ${MODULESHARDSCONF}
-fi
-
-EOF
-# cat > ${WORKSPACE}/configuration-script.sh <<EOF
-
-# Create the startup script to be run on controller.
-cat > ${WORKSPACE}/startup-script.sh <<EOF
-
-echo "Redirecting karaf console output to karaf_console.log"
-export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p /tmp/${BUNDLEFOLDER}/data/log
-
-echo "Starting controller..."
-/tmp/${BUNDLEFOLDER}/bin/start
-
-EOF
-# cat > ${WORKSPACE}/startup-script.sh <<EOF
-
-cat > ${WORKSPACE}/post-startup-script.sh <<EOF
-
-if [[ "$USEFEATURESBOOT" != "True" ]]; then
-
-    # wait up to 60s for karaf port 8101 to be opened, polling every 5s
-    loop_count=0;
-    until [[ \$loop_count -ge 12 ]]; do
-        netstat -na | grep 8101 && break;
-        loop_count=\$[\$loop_count+1];
-        sleep 5;
-    done
-
-    echo "going to feature:install --no-auto-refresh ${SPACE_SEPARATED_FEATURES} one at a time"
-    for feature in ${SPACE_SEPARATED_FEATURES}; do
-        sshpass -p karaf ssh -o StrictHostKeyChecking=no \
-                             -o UserKnownHostsFile=/dev/null \
-                             -o LogLevel=error \
-                             -p 8101 karaf@localhost \
-                             feature:install --no-auto-refresh \$feature;
-    done
-
-    echo "ssh to karaf console to list -i installed features"
-    sshpass -p karaf ssh -o StrictHostKeyChecking=no \
-                         -o UserKnownHostsFile=/dev/null \
-                         -o LogLevel=error \
-                         -p 8101 karaf@localhost \
-                         feature:list -i
-fi
-
-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
-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..."
-netstat -pnatu
-
-function exit_on_log_file_message {
-    echo "looking for \"\$1\" in log file"
-    if grep --quiet "\$1" "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"; then
-        echo ABORTING: found "\$1"
-        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"
-        exit 1
-    fi
-}
-
-exit_on_log_file_message 'BindException: Address already in use'
-exit_on_log_file_message 'server is unhealthy'
-
-EOF
-# cat > ${WORKSPACE}/post-startup-script.sh <<EOF
-
-[ "$NUM_OPENSTACK_SITES" ] || NUM_OPENSTACK_SITES=1
-NUM_ODLS_PER_SITE=$((NUM_ODL_SYSTEM / NUM_OPENSTACK_SITES))
-for i in `seq 1 ${NUM_OPENSTACK_SITES}`
-do
-    # Get full list of ODL nodes for this site
-    odl_node_list=
-    for j in `seq 1 ${NUM_ODLS_PER_SITE}`
-    do
-        odl_ip=ODL_SYSTEM_$(((i - 1) * NUM_ODLS_PER_SITE + j))_IP
-        odl_node_list="${odl_node_list} ${!odl_ip}"
-    done
-
-    for j in `seq 1 ${NUM_ODLS_PER_SITE}`
-    do
-        odl_ip=ODL_SYSTEM_$(((i - 1) * NUM_ODLS_PER_SITE + j))_IP
-        # Copy over the config script to controller and execute it (parameters are used only for cluster)
-        echo "Execute the configuration script on controller ${!odl_ip} for index $j with node list ${odl_node_list}"
-        scp ${WORKSPACE}/configuration-script.sh ${!odl_ip}:/tmp
-        ssh ${!odl_ip} "bash /tmp/configuration-script.sh ${j} '${odl_node_list}'"
-    done
-done
+copy_and_run_configuration_script
 
 run_plan "config"
 
-# Copy over the startup script to controller and execute it.
-for i in `seq 1 ${NUM_ODL_SYSTEM}`
-do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    echo "Execute the startup script on controller ${!CONTROLLERIP}"
-    scp ${WORKSPACE}/startup-script.sh ${!CONTROLLERIP}:/tmp
-    ssh ${!CONTROLLERIP} "bash /tmp/startup-script.sh"
-done
+copy_and_run_startup_script
 
-seed_index=1
-for i in `seq 1 ${NUM_ODL_SYSTEM}`
-do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    echo "Execute the post startup script on controller ${!CONTROLLERIP}"
-    scp ${WORKSPACE}/post-startup-script.sh ${!CONTROLLERIP}:/tmp
-    ssh ${!CONTROLLERIP} "bash /tmp/post-startup-script.sh $(( seed_index++ ))"
-    if [ $(( $i % (${NUM_ODL_SYSTEM} / ${NUM_OPENSTACK_SITES}) )) == 0 ]; then
-        seed_index=1
-    fi
-done
+copy_and_run_post_startup_script
 
-echo "Generating controller variables..."
-for i in `seq 1 ${NUM_ODL_SYSTEM}`
-do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
-    echo "Lets's take the karaf thread dump"
-    ssh ${!CONTROLLERIP} "sudo ps aux" > ${WORKSPACE}/ps_before.log
-    pid=$(grep org.apache.karaf.main.Main ${WORKSPACE}/ps_before.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')
-    echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
-    ssh ${!CONTROLLERIP} "${JAVA_HOME}/bin/jstack -l ${pid}" > ${WORKSPACE}/karaf_${i}_${pid}_threads_before.log || true
-done
+create_controller_variables
 
 if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then
    echo "Exiting without running tests to deploy openstack for testing"
index fd6cccd34efe309b1d1d816eae26c52977e22f93..7b7c12360c9e1e15c036ce824d650b6df42a02bb 100644 (file)
@@ -14,9 +14,8 @@ PYTHON="${ROBOT_VENV}/bin/python"
 SSH="ssh -t -t"
 ADMIN_PASSWORD="admin"
 OPENSTACK_MASTER_CLIENTS_VERSION="queens"
-
-pip install odltools
-odltools -V
+#Size of the partition to /opt/stack in control and compute nodes
+TMPFS_SIZE=2G
 
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
 printf "\nshowing recent changes that made it into the distribution used by this job:\n"
@@ -45,7 +44,7 @@ function trap_handler() {
     local prog="$0"
     local lastline="$1"
     local lasterr="$2"
-    echo "trap_hanlder: ${prog}: line ${lastline}: exit status of last command: ${lasterr}"
+    echo "trap_handler: ${prog}: line ${lastline}: exit status of last command: ${lasterr}"
     echo "trap_handler: command: ${BASH_COMMAND}"
     exit 1
 } # trap_handler()
@@ -265,7 +264,7 @@ 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} master"
+            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
             IS_SFC_PLUGIN_ENABLED="yes"
         else
             echo "Error: Invalid plugin $plugin_name, unsupported"
@@ -631,6 +630,26 @@ function retry() {
     return ${rc}
 }
 
+function install_ovs() {
+    local -r node=${1}
+    local -r rpm_path=${2}
+
+    if [ "${OVS_INSTALL:0:1}" = "v" ]; then
+       # An OVS version was given, so we build it ourselves from OVS git repo.
+       # Only on the first node though, consecutive nodes will use RPMs
+       # built for the first one.
+       [ ! -d "${rpm_path}" ] && mkdir -p "${rpm_path}" && build_ovs ${node} ${OVS_INSTALL} "${rpm_path}"
+       # Install OVS from path
+       install_ovs_from_path ${node} "${rpm_path}"
+    elif [ "${OVS_INSTALL:0:4}" = "http" ]; then
+       # Otherwise, install from rpm repo directly.
+       install_ovs_from_repo ${node} ${OVS_INSTALL}
+    else
+       echo "Expected either an OVS version git tag or a repo http url"
+       exit 1
+    fi
+}
+
 ODL_PROVIDER_MAPPINGS="\${PUBLIC_PHYSICAL_NETWORK}:${PUBLIC_BRIDGE}"
 RECLONE=False
 ODL_PORT=8181
@@ -672,6 +691,10 @@ sudo iptables --line-numbers -nvL
 true
 EOF
 
+#For SFC Tests a larger partition is required for creating instances with Ubuntu
+if [[ "${ENABLE_OS_PLUGINS}" =~ networking-sfc ]]; then
+   TMPFS_SIZE=12G
+fi
 cat > ${WORKSPACE}/get_devstack.sh << EOF
 sudo systemctl stop firewalld
 sudo yum install bridge-utils python-pip -y
@@ -686,7 +709,7 @@ echo "::1         localhost \${HOSTNAME}" >> /tmp/hosts
 sudo mv /tmp/hosts /etc/hosts
 sudo mkdir /opt/stack
 echo "Create RAM disk for /opt/stack"
-sudo mount -t tmpfs -o size=2G tmpfs /opt/stack
+sudo mount -t tmpfs -o size=${TMPFS_SIZE} tmpfs /opt/stack
 sudo chmod 777 /opt/stack
 cd /opt/stack
 echo "git clone https://git.openstack.org/openstack-dev/devstack --branch ${OPENSTACK_BRANCH}"
@@ -715,31 +738,32 @@ sudo nova-manage db sync
 sudo nova-manage cell_v2 discover_hosts
 EOF
 
+cat > "${WORKSPACE}/workaround_networking_sfc.sh" << EOF
+cd /opt/stack
+git clone https://git.openstack.org/openstack/networking-sfc
+cd networking-sfc
+git checkout ${OPENSTACK_BRANCH}
+git checkout master -- devstack/plugin.sh
+EOF
+
 NUM_OPENSTACK_SITES=${NUM_OPENSTACK_SITES:-1}
 compute_index=1
-odl_index=1
 os_node_list=()
-os_interval=$(( ${NUM_OPENSTACK_SYSTEM} / ${NUM_OPENSTACK_SITES} ))
-ha_proxy_index=${os_interval}
-
-for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
-    if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
-        echo "Configure HAProxy"
-        ODL_HAPROXYIP_PARAM=OPENSTACK_HAPROXY_${i}_IP
-        ha_proxy_index=$(( $ha_proxy_index + $os_interval ))
-        odl_index=$(((i - 1) * 3 + 1))
-        ODL_IP_PARAM1=ODL_SYSTEM_$((odl_index++))_IP
-        ODL_IP_PARAM2=ODL_SYSTEM_$((odl_index++))_IP
-        ODL_IP_PARAM3=ODL_SYSTEM_$((odl_index++))_IP
-        ODLMGRIP[$i]=${!ODL_HAPROXYIP_PARAM} # ODL Northbound uses HAProxy VIP
-        ODL_OVS_MGRS[$i]="${!ODL_IP_PARAM1},${!ODL_IP_PARAM2},${!ODL_IP_PARAM3}" # OVSDB connects to all ODL IPs
-        configure_haproxy_for_neutron_requests ${!ODL_HAPROXYIP_PARAM} "${ODL_OVS_MGRS[$i]}"
-    else
-        ODL_IP_PARAM=ODL_SYSTEM_${i}_IP
-        ODL_OVS_MGRS[$i]="${!ODL_IP_PARAM}" # ODL Northbound uses ODL IP
-        ODLMGRIP[$i]=${!ODL_IP_PARAM} # OVSDB connects to ODL IP
-    fi
-done
+
+if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
+    echo "Configure HAProxy"
+    ODL_HAPROXYIP_PARAM=OPENSTACK_HAPROXY_1_IP
+    ODL_IP_PARAM1=ODL_SYSTEM_1_IP
+    ODL_IP_PARAM2=ODL_SYSTEM_2_IP
+    ODL_IP_PARAM3=ODL_SYSTEM_3_IP
+    ODLMGRIP=${!ODL_HAPROXYIP_PARAM} # ODL Northbound uses HAProxy VIP
+    ODL_OVS_MGRS="${!ODL_IP_PARAM1},${!ODL_IP_PARAM2},${!ODL_IP_PARAM3}" # OVSDB connects to all ODL IPs
+    configure_haproxy_for_neutron_requests ${!ODL_HAPROXYIP_PARAM} "${ODL_OVS_MGRS}"
+else
+    ODL_IP_PARAM=ODL_SYSTEM_1_IP
+    ODLMGRIP=${!ODL_IP_PARAM} # OVSDB connects to ODL IP
+    ODL_OVS_MGRS="${!ODL_IP_PARAM}" # ODL Northbound uses ODL IP
+fi
 
 os_ip_list=()
 for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
@@ -759,6 +783,7 @@ for i in "${!os_ip_list[@]}"; do
     tcpdump_start "${i}" "${ip}" "port 6653"
 done
 
+
 # Begin stacking the nodes, starting with the controller(s) and then the compute(s)
 
 for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
@@ -779,8 +804,15 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     if [ "${ODL_ML2_BRANCH}" == "stable/queens" ]; then
        ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
        ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
+       #Workaround for networking-sfc to configure the paramaters in neutron.conf if the
+       # services used are neutron-api, neutron-dhcp etc instead of q-agt.
+       # Can be removed if the patch https://review.openstack.org/#/c/596287/ gets merged
+       if [[ "${ENABLE_OS_PLUGINS}" =~ networking-sfc ]]; then
+           scp ${WORKSPACE}/workaround_networking_sfc.sh ${!CONTROLIP}:/tmp/
+           ssh ${!CONTROLIP} "bash -x /tmp/workaround_networking_sfc.sh"
+       fi
     fi
-    create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
+    create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP} "${ODL_OVS_MGRS}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
     echo "Install rdo release to avoid incompatible Package versions"
     install_rdo_release ${!CONTROLIP}
@@ -788,6 +820,7 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     if [ "$(is_openstack_feature_enabled n-cpu)" == "1" ]; then
         setup_live_migration_compute ${!CONTROLIP} ${!CONTROLIP}
     fi
+    [ -n "${OVS_INSTALL}" ] && install_ovs ${!CONTROLIP} /tmp/ovs_rpms
     echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
@@ -823,10 +856,8 @@ if [ ${NUM_OPENSTACK_COMPUTE_NODES} -gt 0 ]; then
 fi
 
 for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
-    NUM_COMPUTES_PER_SITE=$((NUM_OPENSTACK_COMPUTE_NODES / NUM_OPENSTACK_SITES))
-    SITE_INDEX=$((((i - 1) / NUM_COMPUTES_PER_SITE) + 1)) # We need the site index to infer the control node IP for this compute
     COMPUTEIP=OPENSTACK_COMPUTE_NODE_${i}_IP
-    CONTROLIP=OPENSTACK_CONTROL_NODE_${SITE_INDEX}_IP
+    CONTROLIP=OPENSTACK_CONTROL_NODE_1_IP
     echo "Configure the stack of the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
     scp ${WORKSPACE}/disable_firewall.sh "${!COMPUTEIP}:/tmp"
     ${SSH} "${!COMPUTEIP}" "sudo bash /tmp/disable_firewall.sh"
@@ -834,11 +865,12 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts
     scp ${WORKSPACE}/get_devstack.sh  ${!COMPUTEIP}:/tmp
     ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
-    create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
+    create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP} "${ODL_OVS_MGRS}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
     echo "Install rdo release to avoid incompatible Package versions"
     install_rdo_release ${!COMPUTEIP}
     setup_live_migration_compute ${!COMPUTEIP} ${!CONTROLIP}
+    [ -n "${OVS_INSTALL}" ] && install_ovs ${!COMPUTEIP} /tmp/ovs_rpms
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
     ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"
@@ -905,122 +937,111 @@ while [ ${in_progress} -eq 1 ]; do
 done
 
 # Further configuration now that stacking is complete.
-NUM_COMPUTES_PER_SITE=$((NUM_OPENSTACK_COMPUTE_NODES / NUM_OPENSTACK_SITES))
-for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
-    echo "Configure the Control Node"
-    CONTROLIP=OPENSTACK_CONTROL_NODE_${i}_IP
-    # 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))
-        IP_VAR=OPENSTACK_COMPUTE_NODE_${COMPUTE_INDEX}_IP
-        COMPUTE_IPS[$((j-1))]=${!IP_VAR}
-    done
+echo "Configure the Control Node"
+CONTROLIP=OPENSTACK_CONTROL_NODE_1_IP
+# Gather Compute IPs for the site
+for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
+    IP_VAR=OPENSTACK_COMPUTE_NODE_${i}_IP
+    COMPUTE_IPS[$((i-1))]=${!IP_VAR}
+done
 
-    echo "sleep for 60s and print hypervisor-list"
-    sleep 60
-    ${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list"
-    # in the case that we are doing openstack (control + compute) all in one node, then the number of hypervisors
-    # will be the same as the number of openstack systems. However, if we are doing multinode openstack then the
-    # assumption is we have a single control node and the rest are compute nodes, so the number of expected hypervisors
-    # is one less than the total number of openstack systems
-    if [ $((NUM_OPENSTACK_SYSTEM / NUM_OPENSTACK_SITES)) -eq 1 ]; then
-        expected_num_hypervisors=1
-    else
-        expected_num_hypervisors=${NUM_COMPUTES_PER_SITE}
-        if [ "$(is_openstack_feature_enabled n-cpu)" == "1" ]; then
-            expected_num_hypervisors=$((expected_num_hypervisors + 1))
-        fi
-    fi
-    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"
-        exit 1
+echo "sleep for 60s and print hypervisor-list"
+sleep 60
+${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list"
+# in the case that we are doing openstack (control + compute) all in one node, then the number of hypervisors
+# will be the same as the number of openstack systems. However, if we are doing multinode openstack then the
+# assumption is we have a single control node and the rest are compute nodes, so the number of expected hypervisors
+# is one less than the total number of openstack systems
+if [ ${NUM_OPENSTACK_SYSTEM} -eq 1 ]; then
+    expected_num_hypervisors=1
+else
+    expected_num_hypervisors=${NUM_OPENSTACK_COMPUTE_NODES}
+    if [ "$(is_openstack_feature_enabled n-cpu)" == "1" ]; then
+        expected_num_hypervisors=$((expected_num_hypervisors + 1))
     fi
+fi
+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"
+    exit 1
+fi
+
+# External Network
+echo "prepare external networks by adding vxlan tunnels between all nodes on a separate bridge..."
+# FIXME Should there be a unique gateway IP and devstack index for each site?
+devstack_index=1
+for ip in ${!CONTROLIP} ${COMPUTE_IPS[*]}; do
+    # FIXME - Workaround, ODL (new netvirt) currently adds PUBLIC_BRIDGE as a port in br-int since it doesn't see such a bridge existing when we stack
+    ${SSH} $ip "sudo ovs-vsctl --if-exists del-port br-int $PUBLIC_BRIDGE"
+    ${SSH} $ip "sudo ovs-vsctl --may-exist add-br $PUBLIC_BRIDGE -- set bridge $PUBLIC_BRIDGE other-config:disable-in-band=true other_config:hwaddr=f6:00:00:ff:01:0$((devstack_index++))"
+done
 
-    # 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))
-        IP_VAR=OPENSTACK_COMPUTE_NODE_${COMPUTE_INDEX}_IP
-        COMPUTE_IPS[$((j-1))]=${!IP_VAR}
+# ipsec support
+if [ "${IPSEC_VXLAN_TUNNELS_ENABLED}" == "yes" ]; then
+    # shellcheck disable=SC2206
+    ALL_NODES=(${!CONTROLIP} ${COMPUTE_IPS[*]})
+    for ((inx_ip1=0; inx_ip1<$((${#ALL_NODES[@]} - 1)); inx_ip1++)); do
+        for ((inx_ip2=$((inx_ip1 + 1)); inx_ip2<${#ALL_NODES[@]}; inx_ip2++)); do
+            KEY1=0x$(dd if=/dev/urandom count=32 bs=1 2> /dev/null| xxd -p -c 64)
+            KEY2=0x$(dd if=/dev/urandom count=32 bs=1 2> /dev/null| xxd -p -c 64)
+            ID=0x$(dd if=/dev/urandom count=4 bs=1 2> /dev/null| xxd -p -c 8)
+            ip1=${ALL_NODES[$inx_ip1]}
+            ip2=${ALL_NODES[$inx_ip2]}
+            ${SSH} $ip1 "sudo ip xfrm state add src $ip1 dst $ip2 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
+            ${SSH} $ip1 "sudo ip xfrm state add src $ip2 dst $ip1 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
+            ${SSH} $ip1 "sudo ip xfrm policy add src $ip1 dst $ip2 proto udp dir out tmpl src $ip1 dst $ip2 proto esp reqid $ID mode transport"
+            ${SSH} $ip1 "sudo ip xfrm policy add src $ip2 dst $ip1 proto udp dir in tmpl src $ip2 dst $ip1 proto esp reqid $ID mode transport"
+
+            ${SSH} $ip2 "sudo ip xfrm state add src $ip2 dst $ip1 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
+            ${SSH} $ip2 "sudo ip xfrm state add src $ip1 dst $ip2 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
+            ${SSH} $ip2 "sudo ip xfrm policy add src $ip2 dst $ip1 proto udp dir out tmpl src $ip2 dst $ip1 proto esp reqid $ID mode transport"
+            ${SSH} $ip2 "sudo ip xfrm policy add src $ip1 dst $ip2 proto udp dir in tmpl src $ip1 dst $ip2 proto esp reqid $ID mode transport"
+        done
     done
 
-    # External Network
-    echo "prepare external networks by adding vxlan tunnels between all nodes on a separate bridge..."
-    # FIXME Should there be a unique gateway IP and devstack index for each site?
-    devstack_index=1
     for ip in ${!CONTROLIP} ${COMPUTE_IPS[*]}; do
-        # FIXME - Workaround, ODL (new netvirt) currently adds PUBLIC_BRIDGE as a port in br-int since it doesn't see such a bridge existing when we stack
-        ${SSH} $ip "sudo ovs-vsctl --if-exists del-port br-int $PUBLIC_BRIDGE"
-        ${SSH} $ip "sudo ovs-vsctl --may-exist add-br $PUBLIC_BRIDGE -- set bridge $PUBLIC_BRIDGE other-config:disable-in-band=true other_config:hwaddr=f6:00:00:ff:01:0$((devstack_index++))"
+        echo "ip xfrm configuration for node $ip:"
+        ${SSH} $ip "sudo ip xfrm policy list"
+        ${SSH} $ip "sudo ip xfrm state list"
     done
+fi
 
-    # ipsec support
-    if [ "${IPSEC_VXLAN_TUNNELS_ENABLED}" == "yes" ]; then
-        # shellcheck disable=SC2206
-        ALL_NODES=(${!CONTROLIP} ${COMPUTE_IPS[*]})
-        for ((inx_ip1=0; inx_ip1<$((${#ALL_NODES[@]} - 1)); inx_ip1++)); do
-            for ((inx_ip2=$((inx_ip1 + 1)); inx_ip2<${#ALL_NODES[@]}; inx_ip2++)); do
-                KEY1=0x$(dd if=/dev/urandom count=32 bs=1 2> /dev/null| xxd -p -c 64)
-                KEY2=0x$(dd if=/dev/urandom count=32 bs=1 2> /dev/null| xxd -p -c 64)
-                ID=0x$(dd if=/dev/urandom count=4 bs=1 2> /dev/null| xxd -p -c 8)
-                ip1=${ALL_NODES[$inx_ip1]}
-                ip2=${ALL_NODES[$inx_ip2]}
-                ${SSH} $ip1 "sudo ip xfrm state add src $ip1 dst $ip2 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
-                ${SSH} $ip1 "sudo ip xfrm state add src $ip2 dst $ip1 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
-                ${SSH} $ip1 "sudo ip xfrm policy add src $ip1 dst $ip2 proto udp dir out tmpl src $ip1 dst $ip2 proto esp reqid $ID mode transport"
-                ${SSH} $ip1 "sudo ip xfrm policy add src $ip2 dst $ip1 proto udp dir in tmpl src $ip2 dst $ip1 proto esp reqid $ID mode transport"
-
-                ${SSH} $ip2 "sudo ip xfrm state add src $ip2 dst $ip1 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
-                ${SSH} $ip2 "sudo ip xfrm state add src $ip1 dst $ip2 proto esp spi $ID reqid $ID mode transport auth sha256 $KEY1 enc aes $KEY2"
-                ${SSH} $ip2 "sudo ip xfrm policy add src $ip2 dst $ip1 proto udp dir out tmpl src $ip2 dst $ip1 proto esp reqid $ID mode transport"
-                ${SSH} $ip2 "sudo ip xfrm policy add src $ip1 dst $ip2 proto udp dir in tmpl src $ip1 dst $ip2 proto esp reqid $ID mode transport"
-            done
-        done
-
-        for ip in ${!CONTROLIP} ${COMPUTE_IPS[*]}; do
-            echo "ip xfrm configuration for node $ip:"
-            ${SSH} $ip "sudo ip xfrm policy list"
-            ${SSH} $ip "sudo ip xfrm state list"
-        done
-    fi
-
-    # Control Node - PUBLIC_BRIDGE will act as the external router
-    # Parameter values below are used in integration/test - changing them requires updates in intergration/test as well
-    EXTNET_GATEWAY_IP="10.10.10.250"
-    EXTNET_INTERNET_IP="10.9.9.9"
-    EXTNET_PNF_IP="10.10.10.253"
-    ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up ${EXTNET_GATEWAY_IP}/24"
-
-    # Control Node - external net PNF simulation
+# Control Node - PUBLIC_BRIDGE will act as the external router
+# Parameter values below are used in integration/test - changing them requires updates in intergration/test as well
+EXTNET_GATEWAY_IP="10.10.10.250"
+EXTNET_INTERNET_IP="10.9.9.9"
+EXTNET_PNF_IP="10.10.10.253"
+${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up ${EXTNET_GATEWAY_IP}/24"
+
+# Control Node - external net PNF simulation
+${SSH} ${!CONTROLIP} "
+    sudo ip netns add pnf_ns;
+    sudo ip link add pnf_veth0 type veth peer name pnf_veth1;
+    sudo ip link set pnf_veth1 netns pnf_ns;
+    sudo ip link set pnf_veth0 up;
+    sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
+    sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
+"
+
+# Control Node - external net internet address simulation
+${SSH} ${!CONTROLIP} "
+    sudo ip tuntap add dev internet_tap mode tap;
+    sudo ifconfig internet_tap up ${EXTNET_INTERNET_IP}/24;
+"
+
+# Computes
+compute_index=1
+for compute_ip in ${COMPUTE_IPS[*]}; do
+    # Tunnel from controller to compute
+    COMPUTEPORT=compute$(( compute_index++ ))_vxlan
     ${SSH} ${!CONTROLIP} "
-        sudo ip netns add pnf_ns;
-        sudo ip link add pnf_veth0 type veth peer name pnf_veth1;
-        sudo ip link set pnf_veth1 netns pnf_ns;
-        sudo ip link set pnf_veth0 up;
-        sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
-        sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
+        sudo ovs-vsctl add-port $PUBLIC_BRIDGE $COMPUTEPORT -- set interface $COMPUTEPORT type=vxlan options:local_ip=${!CONTROLIP} options:remote_ip=$compute_ip options:dst_port=9876 options:key=flow
     "
-
-    # Control Node - external net internet address simulation
-    ${SSH} ${!CONTROLIP} "
-        sudo ip tuntap add dev internet_tap mode tap;
-        sudo ifconfig internet_tap up ${EXTNET_INTERNET_IP}/24;
+    # Tunnel from compute to controller
+    CONTROLPORT="control_vxlan"
+    ${SSH} $compute_ip "
+        sudo ovs-vsctl add-port $PUBLIC_BRIDGE $CONTROLPORT -- set interface $CONTROLPORT type=vxlan options:local_ip=$compute_ip options:remote_ip=${!CONTROLIP} options:dst_port=9876 options:key=flow
     "
-
-    # Computes
-    compute_index=1
-    for compute_ip in ${COMPUTE_IPS[*]}; do
-        # Tunnel from controller to compute
-        COMPUTEPORT=compute$(( compute_index++ ))_vxlan
-        ${SSH} ${!CONTROLIP} "
-            sudo ovs-vsctl add-port $PUBLIC_BRIDGE $COMPUTEPORT -- set interface $COMPUTEPORT type=vxlan options:local_ip=${!CONTROLIP} options:remote_ip=$compute_ip options:dst_port=9876 options:key=flow
-        "
-        # Tunnel from compute to controller
-        CONTROLPORT="control_vxlan"
-        ${SSH} $compute_ip "
-            sudo ovs-vsctl add-port $PUBLIC_BRIDGE $CONTROLPORT -- set interface $CONTROLPORT type=vxlan options:local_ip=$compute_ip options:remote_ip=${!CONTROLIP} options:dst_port=9876 options:key=flow
-        "
-    done
 done
 
 if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
@@ -1131,7 +1152,6 @@ for suite in ${SUITES}; do
     -v JENKINS_WORKSPACE:${WORKSPACE} \
     -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
     -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
-    -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \
     -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} \
     -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
     -v ODL_SNAT_MODE:${ODL_SNAT_MODE} \
index 542b0dcc1eac95dfd097cf2c68a0ef78328f5cbe..961df7bcbbe0aef28812847bec6d446a3224af07 100644 (file)
@@ -7,7 +7,11 @@ DISTROBRANCH="${DISTROBRANCH:-$GERRIT_BRANCH}"
 
 if [ ${BUNDLE_URL} == 'last' ]; then
     # Obtain current pom.xml of integration/distribution, correct branch.
-    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+    if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
+        wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=opendaylight/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+    else
+        wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+    fi
     # Extract the BUNDLE_VERSION from the pom.xml
     BUNDLE_VERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)"
     echo "Bundle version is ${BUNDLE_VERSION}"
index 816dcf80a72515593df804d1510abcee0bdac5a8..9f57dfc7ae72388bb329bfc6da15c2545330008c 100644 (file)
@@ -7,7 +7,6 @@ ODL_SYSTEM=()
 TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 OPENSTACK_CONTROLLERS=()
-[ "$NUM_OPENSTACK_SITES" ] || NUM_OPENSTACK_SITES=1
 
 OPENSTACK_VENV="/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
@@ -54,7 +53,7 @@ echo "NUM_TOOLS_SYSTEM=${#TOOLS_SYSTEM[@]}" >> slave_addresses.txt
 #if HA Proxy is requested the last devstack node will be configured as haproxy
 if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
    # HA Proxy is installed on one OPENSTACK_SYSTEM VM on each site
-   NUM_OPENSTACK_SYSTEM=$(( ${#OPENSTACK_SYSTEM[@]} - NUM_OPENSTACK_SITES ))
+   NUM_OPENSTACK_SYSTEM=$(( ${#OPENSTACK_SYSTEM[@]} - 1 ))
 else
    NUM_OPENSTACK_SYSTEM=${#OPENSTACK_SYSTEM[@]}
 fi
@@ -91,7 +90,7 @@ done
 
 openstack_index=0
 # Assuming number of openstack control nodes equals number of openstack sites
-NUM_OPENSTACK_CONTROL_NODES=$(( NUM_OPENSTACK_SITES ))
+NUM_OPENSTACK_CONTROL_NODES=1
 echo "NUM_OPENSTACK_CONTROL_NODES=${NUM_OPENSTACK_CONTROL_NODES}" >> slave_addresses.txt
 for i in $(seq 0 $((NUM_OPENSTACK_CONTROL_NODES - 1)))
 do
index b825b1533ff9df7d8108ab2d6bcf2f85e1bf9e56..dbfb1bfd23e4c91fa0ca6c5321bde1ef5d6bc912 100644 (file)
@@ -63,6 +63,10 @@ pip3 install --user https://files.pythonhosted.org/packages/b8/f7/3bb4d18c234a8c
 pip3 install --user https://files.pythonhosted.org/packages/c3/e3/146b675e6d0138a49c4b817b4e68170eb9b75cee7e71fa3ec69624c4f467/elasticsearch-6.2.0-py2.py3-none-any.whl
 pip3 install --user https://files.pythonhosted.org/packages/75/5e/b84feba55e20f8da46ead76f14a3943c8cb722d40360702b2365b91dec00/PyYAML-3.11.tar.gz
 
+# odltools for extra debugging
+pip install odltools
+odltools -V
+
 # Print installed versions.
 pip install --upgrade pipdeptree
 pipdeptree
index 2ab9bb4fc9aa28687f0ebfa9ebfff99cd2c3e6e5..abbd7f6632612ca93c131b0b394d31f1d4735435 100644 (file)
       - shell: !include-raw:
           - integration-deploy-openstack-run-test.sh
 
+- builder:
+    name: integration-apex-image-manager
+    builders:
+      - shell: !include-raw:
+          - ../opendaylight-infra-apex-image-management.sh
+
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last
               build-steps:
                 - shell: |
                     #!/bin/bash
+                    echo "Archiving csit artifacts"
                     cd $WORKSPACE
                     mkdir -p ./archives
                     for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
                         NODE_FOLDER="./archives/odl_${i}"
                         mkdir -p ${NODE_FOLDER}
-                        mv odl${i}_karaf* ${NODE_FOLDER} || true
+                        mv odl${i}_* ${NODE_FOLDER} || true
                         mv karaf_${i}_*_threads* ${NODE_FOLDER} || true
                         mv *_${i}.png ${NODE_FOLDER} || true
+                        mv /tmp/odl${i}_* ${NODE_FOLDER} || true
                     done
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d ./archives robot-plugin.zip
index 2d5752e383b80f9ec1920e64dc03b60838c072cc..e68d44d1e325df48d8ecb29b6418f8cd49988be1 100644 (file)
 - job-template:
     name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
     id: inttest-csit-1node
-    disabled: false
+    disable-job: false
+    disabled: '{disable-job}'
 
     project-type: freestyle
     node: centos7-robot-2c-8g
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
           default: '{lbaas-service-provider}'
           description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
           neutron-lbaas'
-      - string:
-          name: NUM_OPENSTACK_SITES
-          default: '{num-openstack-sites}'
-          description: 'Number of openstack sites'
       - string:
           name: ODL_SFC_DRIVER
           default: '{odl-sfc-driver}'
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
-
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
index da4fb8f3dffaa01135a6681d84e3b2b5b382dd50..034e6a7691aa7023dc42af0d66b103aec02cea93 100644 (file)
 
     # CSIT Lists in defaults.yaml
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-neon.lst
+          build-order: >
+              odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep
+              ovsdb neutron lispflowmapping openflowplugin coe genius sfc netvirt
+
+      - fluorine:
+          branch: 'stable/fluorine'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-fluorine.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller aaa netconf daexim bgpcep
 
     # CSIT Lists in defaults.yaml
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           csit-blacklist: >
               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 tempest wip
+              aaa-csit-1node-keystone-all
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+          csit-list: !include: csit-jobs-neon.lst
+          csit-weekly-list: '{csit-weekly-list-neon}'
+          csit-high-frequency-list: '{csit-high-frequency-list-neon}'
+      - fluorine:
+          branch: 'stable/fluorine'
+          csit-blacklist: >
+              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 tempest wip
+              aaa-csit-1node-keystone-all
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
           csit-list: !include: csit-jobs-fluorine.lst
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
@@ -59,6 +84,8 @@
           csit-blacklist: >
               capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
               ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip
+              aaa-csit-1node-keystone-all
+              groupbasedpolicy-csit-1node-1cmb-0ctl-0cmp-openstack-pike-openstack
           csit-list: !include: csit-jobs-oxygen.lst
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-neon}'
+      - fluorine:
+          branch: 'stable/fluorine'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-fluorine}'
       - oxygen:
           branch: 'stable/oxygen'
     #####################
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-2g
 
     properties:
       - lf-infra-properties:
index eb61446ec9a3e4829ceff6dd1a7a36c7ecf6e250..9a5fd9c0f7b9451c6999bcbcd07856b1242a5819 100755 (executable)
@@ -71,7 +71,12 @@ if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
             read -rd '' -a SORT_REF_LIST <<< "${SORT_REF[*]}" || true
             # add refspec to patches to build list
             for PATCH in "${SORT_REF_LIST[@]}"; do
-                PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
+                # if project is odlparent or yangtools, do not cherry-pick
+                if [[ "${PROJECT}" == "odlparent" || "${PROJECT}" == "yangtools" ]]; then
+                    PATCHES_TO_BUILD="${PATCHES_TO_BUILD}=${PATCH/*-/}"
+                else
+                    PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
+                fi
             done
         fi
     done
index a56fd02a5ea8fcbd1958554154b211c91b914526..b6da8dcf421b8abae559d5e5b4047542902e28bc 100644 (file)
@@ -22,7 +22,9 @@ jobs=($(xmlstarlet sel -t -m '//hudson/job' \
 job_list="${WORKSPACE}/jjb/integration/csit-jobs-${STREAM}.lst"
 rm "$job_list"
 for job in "${jobs[@]}"; do
+    echo "Checking if $job is blacklisted."
     if [[ ! $job =~ update-csit-tests|${CSIT_BLACKLIST// /\|} ]]; then
         echo "${job}," >> "$job_list"
+        echo "    Added $job to job list."
     fi
 done
index faac19f1eee7238132133e9159cfc8fe7a667425..df7ec1e491997661772e5225a456d3690fe8424b 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 0d903164ee99320a28b198fb2ddebc2533ef8489..6a2589070424896f3d512e0855056781ade7f12b 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: iotdm-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +25,7 @@
     stream: fluorine
     project: 'iotdm'
     project-name: 'iotdm'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 49f1336b668df0a31972acc4914ca9680a59092e..c6a0cb8fec4a44b78d87b6f8fe282e6cd1cca4a1 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 109d7e9194142e11acaa2485a7bb95cb7ee6c9bf..400b6d7f341fd05a8f6f74940697d5da92059f9a 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: jsonrpc-neon
+    jobs:
+      - odl-maven-jobs
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: neon
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: fluorine
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
index 5b7bd6afc08e9d5bfca702d7d451cffc90357534..332eddb349ec5fdd31ad6da6653e8e86807f9927 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 615aee50e6c43633bac02b7d170200a02889efc6..2366e31e099b7e3406ddc1548a8144066168b2d5 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 52756aa828f01e59293d5220a9c4036c774cee09..3c7fd0e8171f2c16abd99207cdd63336c1717012 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index d579e9f51ba3f92db5009dcf4ff62353a1fa6f8a..8634fd4497c213d298f45643ef763eda7d0050b5 100644 (file)
@@ -9,8 +9,10 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 57205f112c8b70961abf8ab939e39f2e9a3320a8..4f14ebcbdb303423dd44d38dcf31fbde46ceae24 100644 (file)
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: l2switch-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +29,7 @@
     stream: fluorine
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
index a1ba81b9430c316a0c59c1827544f310912e9549..b83a89480b8548bedb265875ab22bd0d4d8c23ce 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index aa257c0ffa0e5d1b4814f6c8fca685d98ef47104..4a81fba6db65e924fae1d907f1bdde5e41716ea1 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: lacp-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'lacp'
+    project-name: 'lacp'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'lacp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
index 65482ff29b024d3fc7656ed58ddef7b9ca55fdf6..a01c97fc75e216601ff6b266f8ca84aa90eccde0 100644 (file)
@@ -12,7 +12,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-ci-workshop
@@ -26,7 +26,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-common-packer
@@ -44,7 +44,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-docs
@@ -62,7 +62,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-docs-conf
@@ -80,7 +80,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-global-jjb
@@ -98,7 +98,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-lftools
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-license-checker
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - view:
     name: lf-infra
index 74b9a140f99d1f4e23b733978fb673b4c0ba555c..505a86a53a0cf70bb60ec0fba134bbf892e25721 100644 (file)
@@ -15,7 +15,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - view:
     name: lfn
index 3ed9a65064bf09d82557ea38f2124dbeb5e0dbae..a08c79e5a82be0e4f12c6288d253eab2eb158f61 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 85662fa097cda07cbe0d466bfc259a5c15eb7a82..9017bc0674e0d966731c45eb926e3f4a7d425b89 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index a927ee0b89ad242ed52d8ff73887df4623d086ea..1a194688e18bfd68a733853f8a0e8de928b911cf 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: lispflowmapping-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -9,7 +34,7 @@
     stream: fluorine
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'lispflowmapping-settings'
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
index 70cebc427a5d6a4b66231ee00a6fd57f356c762d..0f36f54fe2a90722147fc89ee399f8563d655062 100644 (file)
@@ -6,13 +6,16 @@
 
     # The project name
     project: 'mdsal'
+    disable-job: true
 
     # The functionality under test
     functionality: 'bindingv1'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 63c64c816e9caaf726bcba59af6810b29a248a98..978010b2d5c7661d9ef212d598c1ddb94804c0a6 100644 (file)
@@ -7,9 +7,12 @@
     project: 'mdsal'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index 8eec4af4427b170079100614c82b58586e324221..3a7fa59e597388a54a40aec41494d5f7dc7684c2 100644 (file)
@@ -1,4 +1,67 @@
 ---
+- project:
+    name: mdsal-master
+    jobs:
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: mdsal
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
+          rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
+      - odl-maven-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: master
+    stream: master
+
+    mvn-settings: 'mdsal-settings'
+    mvn-opts: '-Xmx2048m'
+
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[mdsal] [odlparent] [yangtools]'
+    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: a674173c7b29d
+
+- project:
+    name: mdsal-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
+          distribution_branch: master
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: mdsal
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
+          rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'mdsal'
+    project-name: 'mdsal'
+    branch: 'v2.6.x'
+    mvn-settings: 'mdsal-settings'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
+    mvn-opts: '-Xmx2048m'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[mdsal] [odlparent] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
 - project:
     name: mdsal-fluorine
     jobs:
     stream: fluorine
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx2048m'
     build-node: centos7-builder-8c-8g
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     branch: 'stable/oxygen'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx2048m'
     build-node: centos7-builder-8c-8g
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     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'
+    mvn-opts: '-Xmx2048m'
 
 - view:
     name: mdsal
diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
deleted file mode 100644 (file)
index 3c62062..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: messaging4transport-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'messaging4transport'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-messaging4transport-api,odl-messaging4transport,odl-restconf'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
deleted file mode 100644 (file)
index 484a036..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
----
-- project:
-    name: messaging4transport-fluorine
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'master'
-    mvn-settings: 'messaging4transport-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: messaging4transport
-    description: 'List of messaging4transport jobs'
-    regex: '^messaging4transport-.*'
-    <<: *releng_view_common
index c37bcce61334647bf9839f91c10485421e278643..84ceac995803467618d3021d95302b558734f20e 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: natapp-neon
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -8,7 +26,7 @@
     stream: fluorine
     project: 'natapp'
     project-name: 'natapp'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
index e856c23bc968b8ae789c4f342d7b7d0c56d00355..d56aeb22e9fa3622d1f08dd6886d27255f15f962 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 890cdea8fc734f640773e4a7a3f6046810e86189..531c603dca933b61a1a37c06a3e067dc37550565 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: nemo-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'nemo'
+    project-name: 'nemo'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index e107549d24855354edeaa2a24102c981726580b3..c2dbc53208e0cb47c0b21a756652e64e4f4c9429 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 35393c283ec5a1c8d53adaef248536e7d3f16bd8..18da27dc561db0f1efee8be8d9c8f9b1d98cce90 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 0deef710b81d9bff5fb259e1f93e5ad17044c318..1aa626f0a79d32079fedc4e71af20ba27cd57bd3 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index f7691ee3a49673b112e52d4aabf85a2583960e37..7e85868e0045b347133ca037cad87c54cac2eacd 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 21073fdd8a850b60ac67b9c06ebf3786709d94b8..97cd96f917f94eaf9c8acd1de5bf05a15e45aeb5 100644 (file)
@@ -7,9 +7,12 @@
     project: 'netconf'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index 7c63b90f2710bedda099e907c7d9b2564a76d62e..2c01fffe236f40e0259c179e651d5d0cd60533bf 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index bd81d2c49c2cbbe699006675b6a32535be018777..fdbd77aaa90ea0f827117a44f47d383cb80e8d44 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 54d9cbd21c063843dbd8e60bd8694ba4c0e36b67..5a7af6fd1073551991cb42c91a2080c5df210377 100644 (file)
@@ -1,4 +1,25 @@
 ---
+- project:
+    name: netconf-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'master'
+    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'
+    build-timeout: 90
+    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-fluorine
     jobs:
@@ -8,7 +29,7 @@
     stream: fluorine
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
deleted file mode 100644 (file)
index 7677a65..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: netide-csit-basic
-    jobs:
-      - inttest-csit-verify-1node
-      - inttest-csit-1node
-
-    # The project name
-    project: 'netide'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-netide-rest'
-
-    # Robot custom options
-    robot-options: ''
index 24439555db4e0795c5cdfbac907cf5cddb1b1a0d..44281fe5f01ec75d1444e96400b5845dff09133c 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: netide-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'netide'
+    project-name: 'netide'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'netide'
     project-name: 'netide'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'netide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
diff --git a/jjb/netvirt/netvirt-apex-images.yaml b/jjb/netvirt/netvirt-apex-images.yaml
new file mode 100644 (file)
index 0000000..bb3dfe7
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- project:
+    name: netvirt-apex-image-management
+    jobs:
+      - 'netvirt-apex-image-management'
+
+    project: 'netvirt'
+    os-cloud: vex
+
+- job-template:
+    name: 'netvirt-apex-image-management'
+    node: 'centos7-apex-2c-2g'
+
+    parameters:
+      - string:
+          name: OS_CLOUD
+          default: '{os-cloud}'
+          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/
+
+    wrappers:
+      # Listed after to override openstack-infra-wrappers clouds.yaml definition
+      - config-file-provider:
+          files:
+            - file-id: clouds-yaml
+              target: '$HOME/.config/openstack/clouds.yaml'
+
+    builders:
+      - integration-apex-image-manager
+
+    triggers:
+      - timed: '@weekly'
index de4afa6d0dcf46a3de520c96b1ad68288fbfa375..076d1fcee15a639372220ff01c76e1723634b65b 100644 (file)
@@ -1,4 +1,60 @@
 ---
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-neon
+    jobs:
+      - inttest-csit-hwvtep-openstack
+
+    project: 'netvirt'
+    stream: 'neon'
+    branch: 'master'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-8
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+      - 3node:
+          openstack_system2_count: 2
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    functionality:
+      - upstream-stateful
+      - gate-stateful
+
+    openstack:
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_queens}'
+          openstack_system2_image: '{openstack_system_image_queens}'
+
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-fluorine
     jobs:
index 6d41808236660568610c6fc7b18baad5c2662c9d..9d6eee6b1c393289781e59cb3b27a6ec0c386ddd 100644 (file)
@@ -1,12 +1,17 @@
 ---
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-oxygen
+    name: netvirt-csit-upgrade-openstack-integration
     jobs:
       - inttest-csit-openstack
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
+
+    stream:
+      - neon:
+          branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
+
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
index f7cc8ff7fa8bbb7bd62cc357342903a3a0c6d399..77b504d3d51ad385537dd5ef9a17b205dfa902a4 100644 (file)
@@ -1,4 +1,86 @@
 ---
+- project:
+    name: netvirt-csit-openstack-integration-neon
+    jobs:
+      - inttest-csit-openstack
+
+    project: 'netvirt'
+    stream: 'neon'
+    branch: 'master'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-highcpu-8
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+
+    functionality:
+      - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-tdd-wip:
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
+          schedule: ''
+      - tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          schedule: '{schedule-daily}'
+      - tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+          schedule: '{schedule-daily}'
+      - gate-tempest-stateful:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: 'openstack/tempest/tempest.robot'
+          testplan: '{project}-{topology}-openstack-tempest.txt'
+          odl-snat-mode: 'conntrack'
+
+    openstack:
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_queens}'
+          openstack_system2_image: '{openstack_system_image_queens}'
+
 - project:
     name: netvirt-csit-openstack-integration-fluorine
     jobs:
     project: 'netvirt'
     security-group-mode: 'stateful'
     odl_system_flavor: odl-highcpu-4
-    openstack_system2_flavor: odl-highcpu-2
+    openstack_system2_flavor: odl-highcpu-8
     os-cmb-cnt: 0
     os-ctl-cnt: 1
-    os-cmp-cnt: 2
+    os-cmp-cnt: 1
 
     topology:
       - 1node:
-          openstack_system2_count: 2
+          openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-sfc'
     stream:
       - fluorine:
           branch: 'master'
+          ovs-install: 'v2.9.2'
       - oxygen:
           branch: 'stable/oxygen'
+          ovs-install: 'v2.6.1-nsh'
 
     openstack:
       - queens:
           install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
           robot-options: '-v FAIL_ON_EXCEPTIONS:True'
       - 3node:
-          openstack_system2_count: 3
+          openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
index 9b8698c7a3cdcb7701809ca8a798d6542864b37f..c43df198c341f1a3ff6d2d869df68deab313aa9b 100644 (file)
@@ -5,8 +5,10 @@
       - 'netvirt-daily-full-integration-{stream}'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 3c7d113110beba6d23cb561b077803560c2eccb7..a4cc536712423a390c9f06f01caf8f611e338a8d 100644 (file)
@@ -7,9 +7,12 @@
     project: 'netvirt'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index 2a3d122ea47cf71d302d1b4645d0f8be6291c3f3..9d86adb622737ffe10c30fe222322798f19b3e12 100644 (file)
       - odl-maven-jobs
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index bc4362798fdf648a3d7ae044e79a48bef61da03e..1e33070960e46d1572dbdb3133d73241b456fb99 100644 (file)
@@ -7,9 +7,12 @@
     project: 'neutron'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index de720cc6ee29172aa02707023da126e7eec34b16..f4f348edc26745d876e2a0421dfe222a5d44c86b 100644 (file)
@@ -1,4 +1,24 @@
 ---
+- project:
+    name: neutron-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -10,7 +30,7 @@
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
index 42771d028ffdaf5307752f5500ff20724e7caa6e..2a29e6dcdaf2bda1358ac17dbc4a0d994873ae8a 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: next-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'next'
     project-name: 'next'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index c11083876675c300a4b5bb5fa8ab980d59452682..77176cfab30c76024c7a938ba9457a4c5c0c31e0 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: nic-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +25,7 @@
     stream: fluorine
     project: 'nic'
     project-name: 'nic'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 5f3c2313cfb04c8feef84dfc45987c639f162b1e..36dc2f892a8ee32ac99096d564678dc155805528 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: ocpplugin-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'ocpplugin'
     project-name: 'ocpplugin'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'ocpplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 792b369141a4dbec90811a34394178aaa9b2ee19..91a38b492ea8181fa0e4de4a9f9625c102b247ae 100644 (file)
@@ -7,9 +7,12 @@
     project: 'odlparent'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index 58b3797b9dce9cffe98dce81a1be39b6d889bb3f..0b02c164ef6c26716efff77a5fe8552468928b1d 100644 (file)
           rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
 
     project: odltools
     project-name: odltools
diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml
deleted file mode 100644 (file)
index 5af3883..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: of-config-csit-basic
-    jobs:
-      - inttest-csit-verify-1node
-      - inttest-csit-1node
-
-    # The project name
-    project: 'of-config'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-of-config-all,odl-of-config-rest'
-
-    # Robot custom options
-    robot-options: ''
index 322f2a585adab6ec06a3ee57ea99772d2723881c..37f2475a8f1217ebb6a548d0a115de2f24213ab0 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: of-config-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
deleted file mode 100644 (file)
index bd0d288..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- project:
-    name: circuitsw-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'master'
-    mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: circuitsw
-    description: 'List of circuitsw jobs'
-    regex: '^circuitsw-.*'
-    <<: *releng_view_common
diff --git a/jjb/opendaylight-infra-apex-image-management.sh b/jjb/opendaylight-infra-apex-image-management.sh
new file mode 100644 (file)
index 0000000..2419619
--- /dev/null
@@ -0,0 +1,117 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 Red Hat, Inc. and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+# Ensure we fail the job if any steps fail.
+set -x -o pipefail -o errexit
+
+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
+pip freeze
+
+df -h
+
+mkdir -p /tmp/apex_snapshots
+pushd /tmp/apex_snapshots
+
+wget artifacts.opnfv.org/apex/queens/noha/snapshot.properties
+cat snapshot.properties
+source snapshot.properties
+SNAPSHOT_FILENAME=$(basename $OPNFV_SNAP_URL)
+
+wget --progress=dot:giga $OPNFV_SNAP_URL
+gunzip -c $SNAPSHOT_FILENAME > snapshots.tar
+
+# builder VMs don't have enough disk to handle a full un-tarring, so doing one
+# big file at a time and deleting it from the tarball as a workaround for now
+tar -tf snapshots.tar
+
+images=$(tar --list -f snapshots.tar | grep qcow2)
+for image in $images; do
+  tar -xf snapshots.tar $image
+  tar --delete --file=snapshots.tar $image
+done
+
+# get the ssh keys and node.yaml for uploading to swift at the end
+tar -xf snapshots.tar ./id_rsa
+tar -xf snapshots.tar ./node.yaml
+tar -xf snapshots.tar ./overcloudrc
+
+ls -altr
+
+# grab the right baremetal# for the controller(s) and compute(s)
+CONTROLLER_NODE=$(egrep 'type|vNode-name' node.yaml | egrep -A1 controller | tail -n1 | awk '{print $2}')
+COMPUTE_0_NODE=$(egrep 'type|vNode-name' node.yaml | egrep -A1 compute | tail -n1 | awk '{print $2}')
+COMPUTE_1_NODE=$(egrep 'type|vNode-name' node.yaml | egrep -A1 compute | head -n2 | tail -n1 | awk '{print $2}')
+
+popd
+
+openstack image list
+
+# clean out any zombie OPNFV - apex images that *may* be left over from troubled jobs
+openstack image list | egrep 'OPNFV - apex.*new ' | awk '{print "openstack image delete",$2}' | sh || true
+
+sudo yum install -y qemu-img
+
+qemu-img convert -f qcow2 -O raw /tmp/apex_snapshots/$CONTROLLER_NODE.qcow2 /tmp/apex_snapshots/$CONTROLLER_NODE.raw
+rm /tmp/apex_snapshots/$CONTROLLER_NODE.qcow2
+qemu-img convert -f qcow2 -O raw /tmp/apex_snapshots/$COMPUTE_0_NODE.qcow2 /tmp/apex_snapshots/$COMPUTE_0_NODE.raw
+rm /tmp/apex_snapshots/$COMPUTE_0_NODE.qcow2
+qemu-img convert -f qcow2 -O raw /tmp/apex_snapshots/$COMPUTE_1_NODE.qcow2 /tmp/apex_snapshots/$COMPUTE_1_NODE.raw
+rm /tmp/apex_snapshots/$COMPUTE_1_NODE.qcow2
+
+# create .new images first, then we can delete the existing and rename .new
+# to existing to reduce the delta of when these images might be unavailable
+CONTROLLER_IMAGE_NAME="ZZCI - OPNFV - apex - controller - 0"
+COMPUTE_0_IMAGE_NAME="ZZCI - OPNFV - apex - compute - 0"
+COMPUTE_1_IMAGE_NAME="ZZCI - OPNFV - apex - compute - 1"
+
+openstack image create \
+  --disk-format raw --container-format bare \
+  --file /tmp/apex_snapshots/$CONTROLLER_NODE.raw "$CONTROLLER_IMAGE_NAME.new"
+openstack image create \
+  --disk-format raw --container-format bare \
+  --file /tmp/apex_snapshots/$COMPUTE_0_NODE.raw "$COMPUTE_0_IMAGE_NAME.new"
+openstack image create \
+  --disk-format raw --container-format bare \
+  --file /tmp/apex_snapshots/$COMPUTE_1_NODE.raw "$COMPUTE_1_IMAGE_NAME.new"
+
+# clean out any non ".new" OPNFV - apex images. In the case of a previously failed
+# or aborted apex management job, we can end up with multiple images with the same
+# name so being thorough here.
+openstack image list | egrep 'OPNFV - apex' | egrep -v 'new' | awk '{print "openstack image delete",$2}' | sh || true
+
+openstack image set --name "$CONTROLLER_IMAGE_NAME" "$CONTROLLER_IMAGE_NAME.new"
+openstack image set --tag "Date Uploaded: $(date)" "$CONTROLLER_IMAGE_NAME"
+openstack image set --tag "Apex Archive: $(basename $OPNFV_SNAP_URL)" "$CONTROLLER_IMAGE_NAME"
+
+openstack image set --name "$COMPUTE_0_IMAGE_NAME" "$COMPUTE_0_IMAGE_NAME.new"
+openstack image set --tag "Date Uploaded: $(date)" "$COMPUTE_0_IMAGE_NAME"
+openstack image set --tag "Apex Archive: $(basename $OPNFV_SNAP_URL)" "$COMPUTE_0_IMAGE_NAME"
+
+openstack image set --name "$COMPUTE_1_IMAGE_NAME" "$COMPUTE_1_IMAGE_NAME.new"
+openstack image set --tag "Date Uploaded: $(date)" "$COMPUTE_1_IMAGE_NAME"
+openstack image set --tag "Apex Archive: $(basename $OPNFV_SNAP_URL)" "$COMPUTE_1_IMAGE_NAME"
+
+# Now that the images should be up, active and ready, we can update
+# the ssh key and node.yaml in swift
+openstack container create OPNFV-APEX-SNAPSHOTS
+openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/node.yaml --name node.yaml
+openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/id_rsa --name id_rsa
+openstack object create OPNFV-APEX-SNAPSHOTS /tmp/apex_snapshots/overcloudrc --name overcloudrc
+openstack object list OPNFV-APEX-SNAPSHOTS
+
+openstack image list
+
+df -h
+
index 972ec210a087332af21927858ae2c7656396460a..a63d0ea4ba083efe34176eb072ce25d81aca008d 100644 (file)
@@ -19,8 +19,8 @@ pip install --upgrade cmd2==0.8.5 python-openstackclient python-heatclient
 pip freeze
 
 # TODO: Remove the if-statement once we have fully migrated to /opt/ciman
-if [ -d "/opt/ciman" ]; then
-    cd /opt/ciman || exit 1
+if [ -d "/opt/ciman/openstack-hot" ]; then
+    cd /opt/ciman/openstack-hot || exit 1
 else
     cd /builder/openstack-hot || exit 1
 fi
index 1d204fb82bbac13d6f628989d0397dbfe5ebae84..1c7036ce461347191aa2c77c3de72b2e0dcee28f 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 5e518c1270bc68b149e855b92162644daca0136d..9b400522616648edc1594423c51e607d4c912dad 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 8dcbbc35d4bab1f085c3ad528c2cede6bba07ede..70e26fbe739532e1dcc62945adaa5a579502ef72 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index a1c65c659062a3161f1f74cad6359061c1826e7c..5d294a6d956ad752bfcf759d43fce56d78a61e48 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index de884107d4776c225082e569f4a4d4f0c436f519..0f3bba85ee06287d33d049bc14e147f6333345cd 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 7b6f51859ad65e4d3ecefbad2eca229d89b7e5f2..fe51f8766638caf4c4632a0be4fa7f618dc055e2 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 5a43439c1187eb9a47b90486b62ef6461f5bb102..0f0ac4c1f8869b9d535d063adc51a72c14399f30 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index a5e190ec9ff775e41a9b559137044b2c95f15c90..98f5e083ef81e8224903a6a617531a6b26ee56d1 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index cb43fc97ba4a7af30a77918bd49cc78683825c69..6c60ea5c1e14b6a178cf81095e725797e16fdcdf 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 66165551b5f55a96fb727d638bc8eced678f1f30..85045f4d501d18c00a23273a72ab548c6d917efc 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index c85c13dcf8d5df5d5aa228d39f4ae99e0d38a179..104c06f663b57b5b1939567801225ad6f7d933d1 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 2fd214190228b466bbb06feaf3893d1e68b74f7c..1b3b189a5d6dba96f309a2072b9b242c1cf1082c 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index e0c77626e2119eb016f1d700c98f162f6b87238f..f00e38cec6c0d2fca8956972e08cb74591895ece 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index dfe30a048c455c783c624249070086a5e39d8b49..1a3be635fc08adda93830054be440e1edccf9274 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index f4630fd143b918261905c1aaaac1c164115938ef..4e63550a9c1da0e1adf4db6fd9ce91dc55734939 100644 (file)
@@ -1,4 +1,36 @@
 ---
+- project:
+    name: openflowplugin-neon
+    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: neon
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -15,7 +47,7 @@
     stream: fluorine
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
index d1ca270379adabc14c0176c33d56e8cad99afcfa..9702ce9c814dec8a62c89e48daa75defcdca0a3a 100644 (file)
@@ -6,11 +6,16 @@
       - 'opflex-merge-{stream}'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+      - fluorine:
+          branch: 'stable/fluorine'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
       - oxygen:
           branch: 'stable/oxygen'
           libuv-version: '1.8.0'
index aef8a08695bb29a75a504fd51933e4253898d54b..537325c8c29bc64f21fd4cf3f6347171673390c8 100644 (file)
@@ -5,11 +5,16 @@
       - 'opflex-release-{stream}'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
+      - fluorine:
+          branch: 'stable/fluorine'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
       - oxygen:
           branch: 'stable/oxygen'
           libuv-version: '1.8.0'
index d25238db6e5740b028c6bbcd9fedb70de6fbaa52..ea6cbc85b086b4097df528c99f2bdfb7cfae97a8 100644 (file)
@@ -1,4 +1,23 @@
 ---
+- project:
+    name: ovil-neon
+    jobs:
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    stream: neon
+    project: ovil
+    project-name: ovil
+    branch: 'master'
+    mvn-settings: ovil-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: ''
+    email-upstream: '[ovil]'
+
+    # Used by the release job
+    staging-profile-id: 7b48866c207d8
+
 - project:
     name: ovil-fluorine
     jobs:
@@ -8,7 +27,7 @@
     stream: fluorine
     project: ovil
     project-name: ovil
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: ovil-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
index d819198819a94e4a42e66d1610eb88d24caa50e1..4eb6ee08b65c163b925699ccb88f6a0d090c5a4e 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index bb00aba5f0791842259ffc0ba11aaafec337cb5a..7453bddb94aad3719e4a7809094d66671dc23d99 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 034696f571437adbe2a17c7285bebdb9e0a287e7..e110e35a979ee06687a1e8181c998c660d895676 100644 (file)
@@ -5,8 +5,10 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index dfd1d59acf6d468476c7e7a0454cc2745962bb62..247e9e9e65859239edabd35490f4055ab774d1c6 100644 (file)
@@ -8,9 +8,12 @@
     project: 'ovsdb'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index 47413b7095846a3f9e4259633334d64c0b266b6b..257c99ab03b71a69afd984303e69675992437342 100644 (file)
 
     triggers:
       - timed: '{schedule-saturday}'
-      - gerrit-trigger-patch-sonar:
-          gerrit-server-name: '{gerrit-server-name}'
-          name: 'ovsdb'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'run-sonar$'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/master'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
     builders:
       - shell: !include-raw-escape: setup-docker.sh
index 149e76adef62ed50f74633918f27605eb6cf87f9..3553845105175b2d7a4e80c2bf386fdf2708407f 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: ovsdb-neon
+    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: neon
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'master'
+    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
+
 - project:
     name: ovsdb-fluorine
     jobs:
@@ -14,7 +39,7 @@
     stream: fluorine
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/p4plugin/p4plugin-csit-basic.yaml b/jjb/p4plugin/p4plugin-csit-basic.yaml
deleted file mode 100644 (file)
index 0b892c0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: p4plugin-csit-basic
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'p4plugin'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-p4plugin-all'
-
-    # Robot custom options
-    robot-options: ''
index 39e0d8a2dd6fa1181591dc7199eee350fac34358..d96dd73e99716168106aa407c6e76f6034685f48 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: p4plugin-neon
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'p4plugin'
+    project-name: 'p4plugin'
+    branch: 'master'
+    mvn-settings: 'p4plugin-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[p4plugin]'
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-fluorine
     jobs:
@@ -8,7 +26,7 @@
     stream: fluorine
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 6502165b6893a3927e001e16e79d479ec2587a71..3b71487e088af4b77cd6c1230b3498f8be00399d 100644 (file)
@@ -17,7 +17,7 @@
 - job-template:
     name: '{project-name}-test-rpm-{stream}'
 
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-2g
 
     project-type: freestyle
 
@@ -46,6 +46,7 @@
     builders:
       - shell: !include-raw: test-ansible-rpm.sh
       - shell: !include-raw: test-ansible-odl-user.sh
+      - shell: !include-raw: test-odl-logs.sh
 
     triggers:
       - timed: '@daily'
index b3e52ed0d10b427184e32c06148c2a73c06417da..39efbd8dec3f44c275274e2fb85f8b25c57b2705 100644 (file)
@@ -25,6 +25,7 @@
     project: 'integration/packaging'
 
     stream:
+      - neon
       - fluorine
       - oxygen
     distro:
@@ -40,7 +41,7 @@
 - job-template:
     name: 'packaging-build-rpm-{stream}'
 
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-2g
 
     project-type: freestyle
 
 - job-template:
     name: 'packaging-build-rpm-{distro}-snap-{stream}'
 
-    node: centos7-docker-2c-8g
+    node: centos7-docker-2c-2g
 
     project-type: freestyle
 
 - job-template:
     name: 'packaging-verify-rpm-master'
 
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-2g
 
     project-type: freestyle
 
 - job-template:
     name: 'packaging-verify-full-rpm-master'
 
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-2g
 
     project-type: freestyle
 
 - job-template:
     name: 'packaging-test-rpm-master'
 
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-2g
 
     parameters:
       - opendaylight-infra-parameters:
 - job-template:
     name: 'packaging-test-rpm-upgrade-master'
 
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-2g
 
     parameters:
       - opendaylight-infra-parameters:
index d408377c62d35c0b5714ed34bffa893da2581c68..17437eba4e27f27585a935759cae8ee462bdf9a0 100644 (file)
@@ -23,6 +23,6 @@ sudo yum install -y ansible
 sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
 
 # Install OpenDaylight via repo using example Ansible playbook
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/rpm_8_devel.yml
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/rpm_8_devel_odl_api.yml
 
 # Add more tests
diff --git a/jjb/packaging/test-odl-logs.sh b/jjb/packaging/test-odl-logs.sh
new file mode 100644 (file)
index 0000000..8d28bfc
--- /dev/null
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+# Install required packages
+virtualenv rpm_build
+source rpm_build/bin/activate
+rpm_build/bin/python -m pip install --upgrade pip
+
+# Install Ansible
+sudo yum install -y ansible
+
+# Install local version of ansible-opendaylight to path expected by Ansible.
+# Could almost do this by setting ANSIBLE_ROLES_PATH=$WORKSPACE, but Ansible
+# expects the dir containing the role to have the name of role. The JJB project
+# is called "ansible", which causes the cloned repo name to not match the role
+# name "opendaylight". So we need a cp/mv either way and this is simplest.
+sudo cp -R $WORKSPACE/ansible /etc/ansible/roles/opendaylight
+
+# Install OpenDaylight via repo using example Ansible playbook
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/examples/rpm_8_devel.yml
+
+# Execute the test ODL logs playbook
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-logs.yaml -vvv
index 44a7263f0885b323e864ac11a7f14b76a1775f8e..1c2b4563232d0c20282ba690140db508d468b94a 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 67d37c5a5993ad456f05cf699264043f16422247..af6a871cf4944ff99330c833bc48edf52d827fda 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: packetcable-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'packetcable'
     project-name: 'packetcable'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
deleted file mode 100644 (file)
index ec7f7e5..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- project:
-    name: persistence-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'master'
-    mvn-settings: 'persistence-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: persistence
-    description: 'List of persistence jobs'
-    regex: '^persistence-.*'
-    <<: *releng_view_common
index 74f42ae9f9cbf8d95ce8bbfb408868a5c46ff669..7474697d7e06d3f6da44f1c9584ab50e34c97c5a 100644 (file)
           gerrit-build-unstable-codereview-value: 0
           gerrit-build-notbuilt-codereview-value: 0
 
-# TODO: Unify argument names across gerrit-trigger-* macros.
-- trigger:
-    name: gerrit-trigger-patch-sonar
-    triggers:
-      - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-sonar'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{name}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
 - publisher:
     name: email-notification
     publishers:
index 1a65cab6e39062e4d0baf33bd2e3665198921dbc..ee5c1b76cfc8d9c060e947b60e81f02f1041ce7a 100644 (file)
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
-    cron: 'H H * * 0'
+    cron: '@daily'
     mvn-opts: ''
     mvn-version: mvn35
     java-version: openjdk8
diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
deleted file mode 100644 (file)
index 3239c60..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- project:
-    name: reservation-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'master'
-    mvn-settings: 'reservation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: reservation
-    description: 'List of reservation jobs'
-    regex: '^reservation-.*'
-    <<: *releng_view_common
diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
deleted file mode 100644 (file)
index 91b9e89..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: sdninterfaceapp-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'sdninterfaceapp'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-sdninterfaceapp-all'
-
-    # Robot custom options
-    robot-options: ''
index bc5124e5f9e7c0cb024d4562ce9fb1a5c6a18a16..8f16f15412caf7d1a829bec2d0047c7aa29831a0 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: sdninterfaceapp-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +25,7 @@
     stream: fluorine
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
-    branch: 'master'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 1c29f81a2c2de55e78b5742bc33399999e5ac6b1..8de079d4f415bc8fae8dc11b0f61511be56a3451 100644 (file)
@@ -7,9 +7,12 @@
     project: 'serviceutils'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index b76c175959e335bbfe1350a1708f4efe70686e39..dcd019835bd268a650fa757e2fbbe5f76a63a35e 100644 (file)
       - odl-maven-jobs
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 56d49f56369cbe042b0bc0fa8e053d8acc498bb3..05b7fd2f825a8100355b234eb181d9bb7a2aa507 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index e085c8e68d93aa262e18cf4d064c6f842936f9be..d12157507d4179ce7a55737ab03d5b47bdda43dd 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 422d4e4d387cd409f0ed96515426d1b953d29078..1e4833e31b9cafd84d241149a68b59756a6eb7e4 100644 (file)
@@ -9,9 +9,12 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
index ec17b9949bdd5855d21a78587ea16048ae7a6515..3dfecd935726b5ce9ecbb8e2ee488770295352ab 100644 (file)
@@ -5,8 +5,10 @@
       - 'gerrit-tox-verify'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 2b1c073b7d2c4994514551795b47fbaa253bf08a..2633981ab8972fc9b2d5c0118cfe7dc08f724b63 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: sfc-neon
+    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: neon
+    project: 'sfc'
+    project-name: 'sfc'
+    branch: 'master'
+    mvn-settings: 'sfc-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    build-timeout: 120
+    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-fluorine
     jobs:
@@ -13,7 +38,7 @@
     stream: fluorine
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     build-timeout: 120
index 1faecb9f5a5ff2b2630d9469e159fb8e6f9fe688..f220373229c8cb5c342507018ad5301e87e4ba22 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: snbi-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'snbi'
     project-name: 'snbi'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'snbi-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 0ec71847e7557f3927130526d4253dcb36f10f00..881caab1819e757ddb61ca45e22eb4a0b361c423 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: snmp-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
index 3da5fb41f4d48e5753a02ff67245512bd12a0bde..570a42948dad82ba69df9b8ecc6d6c1781e001c8 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: snmp4sdn-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
index 4c3271bc68c813ea192070d2f144be3757b41241..624c7582cb7933efb86badd295232e7fc2e1a055 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
new file mode 100644 (file)
index 0000000..b67b06f
--- /dev/null
@@ -0,0 +1,34 @@
+---
+- project:
+    name: sxp-csit-binding-origin
+    jobs:
+      - inttest-csit-1node
+
+    # The project name
+    project: 'sxp'
+
+    # The functionality under test
+    functionality: 'binding-origin'
+
+    # Project branches
+    stream:
+      - neon:
+          branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
+
+    install:
+      - all:
+          scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-sxp-controller'
+
+    # Robot custom options
+    robot-options: ''
index 71d140be32282a95c9a656d1838f0f85fa7feefe..a41748bd0caafc70cc3bb911447aa7657614cef4 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
index f4488e2474b0313127c8caa85a896a2646373cee..7676571002dac2001d34c0344d8553c87ea54cc8 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
index 922b788958cf024f96fa2a2ab145a1302d3f5999..f4d59ab4a32c1987ca9fc690b42239039e47604b 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
index 9a4f593310f11c741be0c4957834959a9bee3892..82562df206800a3a22e98e04d06e073d1a1a64c6 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
index 3db08c4126a0692f33dd874ecb23c43d1ffcd9c4..f2262c64bb82da9cc10d69c2fa35fe2d9d2bbfcd 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
index 0d64f56ae47e897b1d14841242a8b5a01e8e0e2a..f7f985e6162d7d121799f0ec0c73959671ca3eec 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: sxp-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
index 0adb0ca98e152f6693c1c95ec0a5bc78cfc9314e..09d519ea140218d3db1dfad2dca005e5432d6dbf 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: systemmetrics-neon
+    jobs:
+      - odl-maven-jobs
+
+    project: 'systemmetrics'
+    project-name: 'systemmetrics'
+    stream: neon
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     project: 'systemmetrics'
     project-name: 'systemmetrics'
     stream: fluorine
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'systemmetrics-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 81e8d30c233b712f6794c29fd104ed612a6eb6ec..b7f34dcc5db9f4d367f93e6c5539e999e5243331 100644 (file)
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: telemetry-neon
+    jobs:
+      - 'odl-maven-jobs'
+      - '{project-name}-integration-{stream}'
+
+    stream: neon
+    project: 'telemetry'
+    project-name: 'telemetry'
+    branch: 'master'
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'telemetry-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[telemetry]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 8ed9c52266504
+
 - project:
     name: telemetry-fluorine
     jobs:
@@ -8,7 +33,7 @@
     stream: fluorine
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'master'
+    branch: 'stable/fluorine'
     jdks:
       - openjdk8
     maven:
diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
deleted file mode 100644 (file)
index 28faf07..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- project:
-    name: topoprocessing-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'master'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: topoprocessing
-    description: 'List of topoprocessing jobs'
-    regex: '^topoprocessing-.*'
-    <<: *releng_view_common
index c73709f0475f22ae217fa5f369caf3ca9bdc3dc7..9b8855f92bff6b6502d82a2e3a83997304e95d2a 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: transportpce-neon
+    jobs:
+      - odl-maven-jobs
+
+    project: 'transportpce'
+    project-name: 'transportpce'
+    stream: neon
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     project: 'transportpce'
     project-name: 'transportpce'
     stream: fluorine
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
index 66c28d422f0b051636def09f81f4584a6f1600ea..98e14e7b8c7e8cd2f53a97f9dd38bc27a3ffae58 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
index 906577b5b7469cf0d610151085656c3517d4f22a..86d93adc1e809bb7f978e32089be25514351dc51 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
index 689105582025ad0dd99b6a2aefc562231857b4bc..e1eb4f8501710f9c7dcf1c09b110f3b472fef586 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
index fcffa2ac0701e8d251de6c180bc6a0f85f886015..1f6ac65de38853a91beb01c546fe68518630e065 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr/1.6.0-SNAPSHOT/xml/features'
index 6b5dede2e14fdd71935a19a34e50ac5ac476e72e..1958b42e7ffbb84974eda4c7d6adc59bb610b298 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: tsdr-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
index 1b3deeb8da8d3f7383e8c75d4ae0b628c95fdaf7..b271cb3197defcbbfa1c2a61bfe7e8a2df897d1b 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: ttp-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'ttp'
+    project-name: 'ttp'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'ttp'
     project-name: 'ttp'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'ttp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
index 28d6dd77686906adede2f0c66943a4441f579072..bfe502976ddfc7f905cc7ee37d44b206dce07cff 100644 (file)
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: unimgr-fluorine
+    name: unimgr-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-oxygen
+    name: unimgr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
deleted file mode 100644 (file)
index 72846d3..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
----
-- project:
-    name: usc-csit-channel
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'usc'
-
-    # The functionality under test
-    functionality: 'channel'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-          trigger-jobs: '{project}-merge-{stream}'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-usc-channel-ui'
-
-    # Robot custom options
-    robot-options: ''
index c0a3cf701d6b60cf1de9671cb3acad824b6ca5c0..0b71f0a2bc939c7bcc9ab853d961035917a58ce5 100644 (file)
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
           # yamllint disable-line rule:line-length
           repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
index 32a2ee35e1ab6d8ae4f5ea8d4ae7b2616676cce9..1e31b30a432ce77caed8340d8fe35ca5cb0d1c76 100644 (file)
@@ -1,4 +1,22 @@
 ---
+- project:
+    name: usc-neon
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -8,7 +26,7 @@
     stream: fluorine
     project: 'usc'
     project-name: 'usc'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
deleted file mode 100644 (file)
index edbf360..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
-    name: usecplugin-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'usecplugin'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-usecplugin-aaa,odl-usecplugin-openflow'
-
-    # Robot custom options
-    robot-options: ''
index ce250f832d5c80eebc081bd6278a73827a5f3fca..edaee783db60d18a4073ddb72a6f2f2185a75be3 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- project:
+    name: usecplugin-neon
+    jobs:
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'usecplugin'
+    project-name: 'usecplugin'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -7,7 +24,7 @@
     stream: fluorine
     project: 'usecplugin'
     project-name: 'usecplugin'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'usecplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
deleted file mode 100644 (file)
index ca5d56e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- project:
-    name: yang-push-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'master'
-    mvn-settings: 'yang-push-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: yang-push
-    description: 'List of yang-push jobs'
-    regex: '^yang-push-.*'
-    <<: *releng_view_common
diff --git a/jjb/yangide/yangide-releng.yaml b/jjb/yangide/yangide-releng.yaml
deleted file mode 100644 (file)
index cad1f2f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- project:
-    name: yangide-releng
-    jobs:
-      - '{project-name}-publish-p2repo'
-      - '{project-name}-release-java'
-
-    project: yangide
-    project-name: 'yangide'
-    stage-id: 'fba306956f98'
-    mvn-settings: 'yangide-settings'
diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
deleted file mode 100644 (file)
index 18be811..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- project:
-    name: yangide-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'yangide'
-    project-name: 'yangide'
-    branch: 'master'
-    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-oxygen
-    jobs:
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'yangide'
-    project-name: 'yangide'
-    branch: 'stable/oxygen'
-    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:
-      - gerrit-maven-sonar
-
-    project: 'yangide'
-    project-name: 'yangide'
-    branch: 'master'
-    mvn-settings: 'yangide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: yangide
-    description: 'List of yangide jobs'
-    regex: '^yangide-.*'
-    <<: *releng_view_common
index 5a68f2b1ecdf6d30c556fdb32561eff381245082..a40bcf5ab9e84dbf09258c21e8770e8625757e51 100644 (file)
 
     # Project branches.
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
 
index 73f910c11de44545f0f0812129a3c5797cb23651..9e1167c0d18d211dd35a9ae912fde394413bf951 100644 (file)
@@ -7,9 +7,12 @@
     project: 'yangtools'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
           os-branch: 'queens'
+      - fluorine:
+          branch: 'stable/fluorine'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
diff --git a/openstack-hot/apex-server.yaml b/openstack-hot/apex-server.yaml
new file mode 100644 (file)
index 0000000..6a483c6
--- /dev/null
@@ -0,0 +1,55 @@
+---
+heat_template_version: 2016-04-08
+
+parameters:
+    job_name:
+        type: string
+        description: Name of job running this template
+    silo:
+        type: string
+        default: vm
+        description: |
+            String to identify a Jenkins Master
+
+            Useful in scenarios where multiple Jenkins Masters might be
+            creating VMs in the same cloud to uniquely distinguish them.
+
+            TODO we should move to using tags once OpenStack Ocata which is
+            available to us with support for server tags properties.
+    index:
+        type: number
+    group:
+        type: number
+        default: "0"
+    vm_flavor:
+        type: string
+        default: v1-standard-4
+        description: OpenStack Flavor to use
+    vm_image:
+        type: string
+        description: VM Image to spin up
+    vm_network:
+        type: string
+        description: VM network
+
+resources:
+    instance:
+        type: "OS::Nova::Server"
+        properties:
+            image: {get_param: vm_image}
+            flavor: {get_param: vm_flavor}
+            name:
+                str_replace:
+                    template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
+                    params:
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
+                        "VM_TYPE":
+                            str_split:
+                                - ' - '
+                                - {get_param: vm_image}
+                                - 2
+                        "GROUP": {get_param: group}
+                        "INDEX": {get_param: index}
+            networks:
+                - network: {get_param: vm_network}
diff --git a/openstack-hot/csit-apex-3-instance-type.yaml b/openstack-hot/csit-apex-3-instance-type.yaml
new file mode 100644 (file)
index 0000000..6901032
--- /dev/null
@@ -0,0 +1,115 @@
+---
+heat_template_version: 2016-04-08
+
+parameters:
+    job_name:
+        type: string
+        description: Name of job running this template
+    silo:
+        type: string
+        description: Jenkins Silo job is running in (typically releng|sandbox)
+    vm_0_count:
+        type: number
+        description: Number of VMs for 1st VM type
+    vm_0_flavor:
+        type: string
+        default: v1-standard-1
+        description: Flavor to run instance on for 1st VM type
+    vm_0_image:
+        type: string
+        description: Image to run instance on for 1st VM type
+    vm_1_count:
+        type: number
+        description: Number of VMs for 2nd VM type
+    vm_1_flavor:
+        type: string
+        default: v1-standard-1
+        description: Flavor to run instance on for 2nd VM type
+    vm_1_image:
+        type: string
+        description: Image to run instance on for 2nd VM type
+    vm_2_count:
+        type: number
+        description: Number of VMs for 3rd VM type
+    vm_2_flavor:
+        type: string
+        default: v1-standard-1
+        description: Flavor to run instance on for 3rd VM type
+    vm_2_image:
+        type: string
+        description: Image to run instance on for 3rd VM type
+
+resources:
+    192_network:
+        type: OS::Neutron::Net
+        properties:
+            name:
+                str_replace:
+                    template: SILO-JOB_NAME-NET
+                    params:
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
+                        "NET": 'APEX_192_network'
+            port_security_enabled: false
+
+    192_subnet:
+        type: OS::Neutron::Subnet
+        properties:
+            name:
+                str_replace:
+                    template: SILO-JOB_NAME-SUBNET
+                    params:
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
+                        "SUBNET": 'APEX_192_subnet'
+            network_id: {get_resource: 192_network}
+            cidr: 192.0.2.0/24
+            gateway_ip: 192.0.2.1
+            allocation_pools:
+                - start: 192.0.2.51
+                  end: 192.0.2.99
+
+    vm_0_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: {get_param: vm_0_count}
+            resource_def:
+                type: apex-server.yaml
+                properties:
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    index: "%index%"
+                    group: "0"
+                    vm_flavor: {get_param: vm_0_flavor}
+                    vm_image: {get_param: vm_0_image}
+                    vm_network: {get_resource: 192_network}
+
+    vm_1_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: {get_param: vm_1_count}
+            resource_def:
+                type: apex-server.yaml
+                properties:
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    index: "%index%"
+                    group: "1"
+                    vm_flavor: {get_param: vm_1_flavor}
+                    vm_image: {get_param: vm_1_image}
+                    vm_network: {get_resource: 192_network}
+
+    vm_2_group:
+        type: "OS::Heat::ResourceGroup"
+        properties:
+            count: {get_param: vm_2_count}
+            resource_def:
+                type: apex-server.yaml
+                properties:
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    index: "%index%"
+                    group: "2"
+                    vm_flavor: {get_param: vm_2_flavor}
+                    vm_image: {get_param: vm_2_image}
+                    vm_network: {get_resource: 192_network}
index 6fbab522c4999d80152f0b4c18029eabb5e00496..68fe7493778f50627c539f2f7bac7730d5df7ee5 100644 (file)
@@ -66,8 +66,8 @@ resources:
                 do
                     echo "Waiting until devvexx.opendaylight.org is resolvable..."
                 done
-                git clone git://devvexx.opendaylight.org/mirror/releng/builder /builder
-                /builder/jenkins-scripts/jenkins-init-script.sh
+                git clone --recurse-submodules git://devvexx.opendaylight.org/mirror/releng/builder /opt/ciman
+                /opt/ciman/jjb/global-jjb/jenkins-init-scripts/init.sh
 
 outputs:
     ip:
index e0319f3a5796486e27933827cb2b0c075c04dd70..05f3244cd7150cf0c7ebf9d12ac1ee2463bde5aa 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e0319f3a5796486e27933827cb2b0c075c04dd70
+Subproject commit 05f3244cd7150cf0c7ebf9d12ac1ee2463bde5aa
index 3e129f80c07bede1990ba736578c95cdf76518e3..66c398b3e7483c213710b055b2d44843d8888c39 100644 (file)
@@ -3,8 +3,6 @@
 # force any errors to cause the script and job to end in failure
 set -xeu -o pipefail
 
-# add in a test copr repo
-wget http://copr.fedoraproject.org/coprs/tykeal/odl-updates/repo/epel-7/tykeal-odl-updates-epel-7.repo -O /etc/yum.repos.d/tykeal-odl-updates-epel-7.repo
 # Install xpath
 yum install -y perl-XML-XPath python-pip python-six
 
index 149e5efd270df7a0a9031a787ea886d291e8ebb0..63fdea7d67b0e978c7e4a7104ee5df87556a7195 100644 (file)
@@ -3,8 +3,6 @@
 # force any errors to cause the script and job to end in failure
 set -xeu -o pipefail
 
-# add in a test copr repo
-wget http://copr.fedoraproject.org/coprs/tykeal/odl-updates/repo/epel-7/tykeal-odl-updates-epel-7.repo -O /etc/yum.repos.d/tykeal-odl-updates-epel-7.repo
 # Install xpath
 yum install -y perl-XML-XPath python-pip python-six