Merge "Switch global-jjb jobs to use mvn35"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Wed, 6 Jun 2018 19:32:16 +0000 (19:32 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 6 Jun 2018 19:32:16 +0000 (19:32 +0000)
269 files changed:
docs/jenkins.rst
jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
jenkins-scripts/jenkins-init-script.sh
jenkins-scripts/system_type.sh
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/compare-autorelease-projects.sh
jjb/autorelease/prepare-release.sh
jjb/autorelease/update-autorelease-projects-views.sh [new file with mode: 0755]
jjb/autorelease/validate-autorelease-carbon.yaml [deleted file]
jjb/autorelease/validate-autorelease-nitrogen.yaml [deleted file]
jjb/autorelease/version-bump.sh
jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
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.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml [new file with mode: 0644]
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/common-functions.sh
jjb/integration/csit-jobs-carbon.lst [deleted file]
jjb/integration/csit-jobs-fluorine.lst
jjb/integration/csit-jobs-nitrogen.lst [deleted file]
jjb/integration/csit-jobs-oxygen.lst
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-deploy-offline.sh [deleted file]
jjb/integration/distribution/distribution-deploy-verify.sh [deleted file]
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-macros.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/distribution/distribution.yaml [deleted file]
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-macros.yaml
jjb/integration/integration-set-variables.sh
jjb/integration/integration-start-cluster-run-test.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration-upload-distribution.sh
jjb/integration/multipatch-distribution.sh [changed mode: 0644->0755]
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lfn/lfn.yaml [new file with mode: 0644]
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-patch-test.yaml [new file with mode: 0644]
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp-csit-basic.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
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml [new file with mode: 0644]
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml [deleted file]
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin-csit-basic.yaml [deleted file]
jjb/ocpplugin/ocpplugin-csit-scalability.yaml [deleted file]
jjb/ocpplugin/ocpplugin.yaml
jjb/odl-openstack-cleanup-old-images.sh
jjb/odl-openstack-cleanup-orphaned-nodes.sh
jjb/odl-openstack-cleanup-stale-nodes.sh
jjb/odl-openstack-cleanup-stale-volumes.sh
jjb/odl-openstack-install.sh
jjb/odlparent/odlparent-patch-test.yaml [new file with mode: 0644]
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config-csit-basic.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openci/create-ape.sh [new file with mode: 0755]
jjb/openci/openci-odl-daily-jobs.yaml [new file with mode: 0644]
jjb/opendaylight-infra-stack.sh
jjb/opendaylight-infra-update-image-list.sh
jjb/openflowjava/openflowjava.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml [new file with mode: 0644]
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-thirdparty-dependencies.yaml
jjb/opflex/opflex.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/build-rpm-snap.sh
jjb/packaging/packaging.yaml
jjb/packaging/puppet.yaml
jjb/packaging/test-ports-nofeature.sh
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-packer-jobs.yaml
jjb/releng-views.yaml [new file with mode: 0644]
jjb/requirements.txt
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/telemetry/telemetry.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml [deleted file]
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr-csit-basic.yaml [deleted file]
jjb/unimgr/unimgr-csit-legato.yaml [deleted file]
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml [deleted file]
jjb/vtn/vtn-patch-test.yaml [deleted file]
jjb/vtn/vtn.yaml [deleted file]
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml [new file with mode: 0644]
jjb/yangtools/yangtools.yaml
packer/common-packer
packer/provision/examples/apache-e-w.yaml [new file with mode: 0644]
packer/provision/examples/apache-n-s.yaml [new file with mode: 0644]
packer/provision/examples/apache-pod.yaml [new file with mode: 0644]
packer/provision/examples/busybox.yaml [new file with mode: 0644]
packer/provision/examples/nginx-pod.yaml [new file with mode: 0644]
packer/provision/kubernetes.yaml [new file with mode: 0644]
packer/provision/local-builder.yaml
packer/provision/robot.yaml
packer/provision/roles/coe/requirements.yaml [new file with mode: 0644]
packer/provision/templates/odlovs-cni.conf.j2 [new file with mode: 0644]
packer/templates/kubernetes.json [new file with mode: 0644]
packer/templates/mininet-ovs-2.8.json
packer/templates/robot.json
packer/vars/ubuntu-14.04.json
tox.ini

index 8ada1c7e66b924e09cfde88c297c87c99155458a..25e5370f922310a886152e8906f3009194590286 100644 (file)
@@ -805,6 +805,12 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
           cherry-pick 59/60259/17 and build netvirt, finally it will checkout latest distribution
           code and build a distribution. The resulting distribution is stored in Nexus and the URL
           is stored in a variable called BUNDLE_URL visible in the job console.
+          This job also accepts a gerrit topic, for example: multipatch-build:topic=binding-tlc-rpc,
+          in this case the job will find all patches in the topic binding-tlc-rpc for the projects
+          specified in the BUILD_ORDER parameter and will build all projects from the first a patch
+          has been found, for successive projects the branch HEAD is used if no patch is found.
+          The job uses patch numbers to sort patches in the same project.
+          Use multipatch-build-fast (vs multipatch-build) for building projects fast (-Pq).
           This job should not alter Gerrit votes for a given patch, nor will do anything with the
           given patch unless the patch is added to the build list.
         </td>
diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
new file mode 100644 (file)
index 0000000..d58f8cc
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+HARDWARE_ID=v1-standard-1
+INSTANCE_CAP=1
diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
new file mode 100644 (file)
index 0000000..2e79f1f
--- /dev/null
@@ -0,0 +1,4 @@
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+HARDWARE_ID=v1-standard-1
+INSTANCE_CAP=1
+NUM_EXECUTORS=4
index 3ca18447cce60ce5b133cfbfed0b6ae564f540fe..0b0475fd2ab5a31d0e53aec269c9c636c541ef6f 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180220-2018
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180501-1002
 HARDWARE_ID=odl-highcpu-2
index e79228f336442c5164aded132bf7455a0bf7e21b..3309b00ab11322912a3e9d0c924f74ef84091f44 100755 (executable)
@@ -24,3 +24,9 @@ source /tmp/system_type.sh
 
 ## add local environment changes post scripts
 ./jenkins-init-script-local-env.sh
+
+# Create a swap file
+dd if=/dev/zero of=/swap count=1024 bs=1MiB
+chmod 600 /swap
+mkswap /swap
+swapon /swap
index d021c0b4ad15c6d03016260fe31c6a0dd356b155..c5b141afd47d859d9384915f0247f905c0bd2748 100755 (executable)
@@ -18,6 +18,7 @@ for i in "java-builder,builder" \
          "devstack,devstack" \
          "docker,docker" \
          "gbp,ubuntu-docker-ovs" \
+         "kubernetes,mininet-ubuntu" \
          "robot,robot" \
          "mininet,mininet-ubuntu"
 do set -- $i
index 1360004a598f190b47cac7cc292863c48b65e886..36bdb6040e1291e60e926f79b2881a5dbfad8fee 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1be27c06ebfe72f9a740d469ad7afc5bdbb11831..a3ca1d321958cfa50d37b05a6d2b0ac7615e677f 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index c557db0bb4ab501d5aeeae1352e0985184365399..189501c35ade5e077d133a9b490ab1a6f96c15c2 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index d630199be426fe47cd91fe978780a0a57c521398..e0b3e50bcec11cf1381d7f119c726850456b59b7 100644 (file)
@@ -4,20 +4,15 @@
     jobs:
       - inttest-patch-test
 
-    # The project name
     project: 'aaa'
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          os-branch: 'queens'
 
     feature:
       - authn:
       - keystone:
           csit-list: >
               aaa-csit-1node-keystone-all-{stream}
+
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index f4e71ff3d92a1964e146a5acf0316d279282e303..1a60b2883dd0ccef8647c31a4ebb540d7e25235c 100644 (file)
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
-- project:
-    name: aaa-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
-- project:
-    name: aaa-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
 - project:
     name: aaa-sonar
     jobs:
index 14fbfd8d868134182a3d2a8b94337ff2526601cf..c0c1c0434eb3f498b07c7bd86945878f583da388 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 7145b02a77e0af38d9467663adfc09530d55f4a8..e1ad649ae12aafe1d69ad9f17ab18723be7e5663 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: alto-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 931eabae9693c
 
-- project:
-    name: alto-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-
-    # Used by the release job
-    staging-profile-id: 931eabae9693c
-
-- project:
-    name: alto-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'alto'
-    project-name: 'alto'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'alto-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'l2switch-merge-{stream}'
-    email-upstream: '[alto] [l2switch]'
-
-    # Used by the release job
-    staging-profile-id: 931eabae9693c
-
 - project:
     name: alto-sonar
     jobs:
index 34f659786950be9a352c7f7c00796d6067c90cb6..ca443e740106afd1c9b7267dc4e69f763684f0aa 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: atrium-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 9324f12310e6a
 
-- project:
-    name: atrium-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'atrium-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[atrium]'
-
-    # Used by the release job
-    staging-profile-id: 9324f12310e6a
-
-- project:
-    name: atrium-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'atrium-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[atrium]'
-
-    # Used by the release job
-    staging-profile-id: 9324f12310e6a
-
 - project:
     name: atrium-sonar
     jobs:
index f49b3b3e91ee9a2166914371156bdf4a4ef56736..e6bf110b6c3e1a3a3fc09929e84bfb4f878135af 100644 (file)
       - shell: !include-raw:
           - generate-release-notes.sh
 
+- builder:
+    name: autorelease-update-project-views
+    builders:
+      - shell: !include-raw: update-autorelease-projects-views.sh
+
 - builder:
     name: autorelease-update-validate-projects
     builders:
index 80a133bfdaf4b26de94467f1410f01351940175f..877dc08d18a0ec59f47f0bdc88dbd6e42aa51755 100644 (file)
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
-    # todo: After Carbon EOL remove next-release-tag and directy pass
-    # '{stream}' to autorelease-release-tag parameter
     stream:
       - fluorine:
-          next-release-tag: '{stream}'
           branch: 'master'
           integration-test: fluorine
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - oxygen:
-          next-release-tag: '{stream}'
           branch: 'stable/oxygen'
           integration-test: oxygen
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
-      - nitrogen:
-          next-release-tag: '{stream}'
-          branch: 'stable/nitrogen'
-          integration-test: nitrogen
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
-      - carbon:
-          next-release-tag: '{stream}'
-          branch: 'stable/carbon'
-          integration-test: carbon
-          karaf-version: karaf3
-          extra-mvn-opts: -P!karaf -Dskip.karaf4.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease
index 4c65c5b8078124993d33feb693119add6dd5f9e2..37e7fdead62e33b4e0ba77204d0c68edb1dc38a7 100644 (file)
@@ -87,7 +87,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
-          release-tag: '{next-release-tag}'
+          release-tag: '{stream}'
       - string:
           name: EXTRA_MVN_OPTS
           default: '{extra-mvn-opts}'
           goals: |
               clean deploy
               $EXTRA_MVN_OPTS
-              -Pintegrationtests,docs,repoBuild
+              -Pintegrationtests,repoBuild
               -Dcheckstyle.skip=true
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
           - project: 'integration-distribution-test-{integration-test}'
             condition: FAILED
             trigger-with-no-params: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: FAILED
-            trigger-with-no-params: true
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
+      - autorelease-update-project-views
       - autorelease-update-validate-projects
-      - opendaylight-infra-push-gerrit-patch:
-          project: 'releng/builder'
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
           gerrit-commit-message: |
-              Update validate autorelease projects for {stream}
+              'Update validate autorelease projects for {stream}'
+          reviewers-email: 'release@lists.opendaylight.org'
 
     publishers:
       - lf-infra-publish
           lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
-          default: '{next-release-tag}'
+          default: '{stream}'
           description: |
               Release that is being version bumped.
               Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...
index 88670afd9f198d3a577c5f4063bb004f55ea7cfa..5c5df61e99e2de20b08eafde6c6d7eaab4dc36bd 100644 (file)
@@ -15,7 +15,3 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
index dfcd933ffccc391683a234c96bd7f67629275135..0984d01f7d5a1ca4e9af9af8e3242d253338a67b 100644 (file)
@@ -15,12 +15,6 @@ echo "---> compare-autorelease-projects.sh"
 # The purpose of this script is to compare list of projects in autorelease
 # are equal to the list of projects in integration/distribution.
 
-# Note: int/dist pom files uses templates only since Oxygen release.
-# Todo: Remove this check after Carbon and Nitrogen EOL
-if [[ $STREAM =~ carbon ]] || [[ $STREAM =~ nitrogen ]]; then
-    exit 0
-fi
-
 mapfile -t PROJECTS_INT_DIST < <(xmlstarlet sel\
      -N "x=http://maven.apache.org/POM/4.0.0"\
      -t -m "/x:project/x:profiles/x:profile[x:activation/x:activeByDefault='true']/x:dependencies/x:dependency/x:groupId"\
index ca3174cb56044c0237d47977ca1670cfc703e96e..b20b845fefea3cc401e5eca5f911dd26ccc85d99 100644 (file)
@@ -37,29 +37,15 @@ git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG
     | tee -a $PATCH_DIR/taglist.log"
 
 echo "$RELEASE_TAG"
-# Remove this case statement when Carbon is no longer supported.
-# Nitrogen onwards we do not want to use the release tag so simply need to
-# strip xml files of -SNAPSHOT tags.
-case "$RELEASE_TAG" in
-    Carbon*)
-        lftools version release "$RELEASE_TAG"
-        ;;
-    *)
-        find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
-        ;;
-esac
+find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
+
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
 for module in $modules; do
     pushd "$module" || exit
-    # TODO: Remove once stable/nitrogen is no longer supported.
-    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-        git format-patch --stdout "origin/v1.2.x" > "$PATCH_DIR/${module//\//-}.patch"
-    else
-        git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
-    fi
+    git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
     popd || exit
 done
diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh
new file mode 100755 (executable)
index 0000000..8799215
--- /dev/null
@@ -0,0 +1,60 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
+
+VIEWS_AR_YAML_FILE="${WORKSPACE}/jjb/autorelease/view-autorelease-${STREAM}.yaml"
+BRANCH="stable/${STREAM}"
+
+# The current development release will not have a stable branch defined so if
+# branch does not exist assume master
+url="https://git.opendaylight.org/gerrit/projects/releng%2Fautorelease/branches/"
+resp=$(curl -s -w "\\n\\n%{http_code}" --globoff -H "Content-Type:application/json" "$url")
+if [[ ! "$resp" =~ $BRANCH ]]; then
+    BRANCH="master"
+fi
+
+wget -nv -O /tmp/pom.xml "https://git.opendaylight.org/gerrit/gitweb?p=releng/autorelease.git;a=blob_plain;f=pom.xml;hb=$GERRIT_BRANCH"
+
+# handle list of projects read from the pom.xml output as multiple lines.
+mapfile -t modules < <(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' /tmp/pom.xml)
+
+cat > "$VIEWS_AR_YAML_FILE" << EOF
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_${STREAM}
+    name: releng-view-autorelease-${STREAM}
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+        - status
+        - weather
+        - job
+        - last-success
+        - last-failure
+        - last-duration
+        - build-button
+    recurse: false
+
+- view:
+    name: Merge-${STREAM^}
+    description: 'List of ${STREAM^} Merge jobs for Autorelease'
+    job-name:
+EOF
+
+for module in "${modules[@]}"; do
+    echo "Include project:$module to autorelease view"
+    echo "      - '$module-maven-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
+done
+echo "    <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE"
+
+git add "${VIEWS_AR_YAML_FILE}"
+
+cp "${VIEWS_AR_YAML_FILE}" $WORKSPACE/archives
diff --git a/jjb/autorelease/validate-autorelease-carbon.yaml b/jjb/autorelease/validate-autorelease-carbon.yaml
deleted file mode 100644 (file)
index c4647d8..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-carbon
-    jobs:
-      - '{project-name}-validate-autorelease-{stream}'
-    stream: carbon
-    branch: stable/carbon
-    project-name:
-      - aaa:
-          project: aaa
-      - alto:
-          project: alto
-      - bgpcep:
-          project: bgpcep
-      - bier:
-          project: bier
-      - cardinal:
-          project: cardinal
-      - controller:
-          project: controller
-      - didm:
-          project: didm
-      - dlux:
-          project: dlux
-      - dluxapps:
-          project: dluxapps
-      - eman:
-          project: eman
-      - faas:
-          project: faas
-      - federation:
-          project: federation
-      - genius:
-          project: genius
-      - groupbasedpolicy:
-          project: groupbasedpolicy
-      - honeycomb-vbd:
-          project: honeycomb/vbd
-      - infrautils:
-          project: infrautils
-      - integration-distribution:
-          project: integration/distribution
-      - iotdm:
-          project: iotdm
-      - l2switch:
-          project: l2switch
-      - lacp:
-          project: lacp
-      - lispflowmapping:
-          project: lispflowmapping
-      - mdsal:
-          project: mdsal
-      - nemo:
-          project: nemo
-      - netconf:
-          project: netconf
-      - netide:
-          project: netide
-      - netvirt:
-          project: netvirt
-      - neutron:
-          project: neutron
-      - nic:
-          project: nic
-      - ocpplugin:
-          project: ocpplugin
-      - odlparent:
-          project: odlparent
-      - of-config:
-          project: of-config
-      - openflowjava:
-          project: openflowjava
-      - openflowplugin:
-          project: openflowplugin
-      - ovsdb:
-          project: ovsdb
-      - packetcable:
-          project: packetcable
-      - sdninterfaceapp:
-          project: sdninterfaceapp
-      - sfc:
-          project: sfc
-      - snmp:
-          project: snmp
-      - snmp4sdn:
-          project: snmp4sdn
-      - sxp:
-          project: sxp
-      - topoprocessing:
-          project: topoprocessing
-      - tsdr:
-          project: tsdr
-      - ttp:
-          project: ttp
-      - unimgr:
-          project: unimgr
-      - usc:
-          project: usc
-      - yangtools:
-          project: yangtools
diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml
deleted file mode 100644 (file)
index b388684..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-nitrogen
-    jobs:
-      - '{project-name}-validate-autorelease-{stream}'
-    stream: nitrogen
-    branch: stable/nitrogen
-    project-name:
-      - aaa:
-          project: aaa
-      - alto:
-          project: alto
-      - bgpcep:
-          project: bgpcep
-      - bier:
-          project: bier
-      - cardinal:
-          project: cardinal
-      - controller:
-          project: controller
-      - coe:
-          project: coe
-      - daexim:
-          project: daexim
-      - dlux:
-          project: dlux
-      - dluxapps:
-          project: dluxapps
-      - eman:
-          project: eman
-      - faas:
-          project: faas
-      - genius:
-          project: genius
-      - groupbasedpolicy:
-          project: groupbasedpolicy
-      - honeycomb-vbd:
-          project: honeycomb/vbd
-      - infrautils:
-          project: infrautils
-      - integration-distribution:
-          project: integration/distribution
-      - l2switch:
-          project: l2switch
-      - lispflowmapping:
-          project: lispflowmapping
-      - mdsal:
-          project: mdsal
-      - nemo:
-          project: nemo
-      - netconf:
-          project: netconf
-      - netvirt:
-          project: netvirt
-      - neutron:
-          project: neutron
-      - nic:
-          project: nic
-      - ocpplugin:
-          project: ocpplugin
-      - of-config:
-          project: of-config
-      - openflowplugin:
-          project: openflowplugin
-      - ovsdb:
-          project: ovsdb
-      - packetcable:
-          project: packetcable
-      - sfc:
-          project: sfc
-      - snmp:
-          project: snmp
-      - snmp4sdn:
-          project: snmp4sdn
-      - sxp:
-          project: sxp
-      - topoprocessing:
-          project: topoprocessing
-      - ttp:
-          project: ttp
-      - unimgr:
-          project: unimgr
-      - usc:
-          project: usc
-      - yangtools:
-          project: yangtools
index 54bd1203f62b0bb01728a9d132ae6498980b5ca3..d48b49070ed71a29109f688d0d8818a442577320 100644 (file)
@@ -35,15 +35,10 @@ fi
 if [ "$BRANCH_CUT" = "false" ]; then
     git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
 
-    # TODO: Simplify once stable/nitrogen is no longer supported.
     for module in $(git submodule | awk '{ print $2 }')
     do
         pushd "$module"
-        if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-            git checkout -b "v1.2.x" "origin/v1.2.x"
-        else
-            git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
-        fi
+        git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
         popd
     done
 fi
@@ -73,14 +68,8 @@ mkdir -p "$patch_dir"
 for module in $(git submodule | awk '{ print $2 }')
 do
     pushd "$module"
-    # TODO: Remove once stable/nitrogen is no longer supported.
-    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-        git format-patch --stdout "origin/v1.2.x" > "$patch_dir/${module//\//-}.patch"
-        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/v1.2.x..HEAD"
-    else
-        git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
-        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
-    fi
+    git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
+    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     popd
 done
 
index 14ec6d49e14ad5b599d30cd84fe91e0ab17922dd..e71dd3e0f68b29ab2cdbeaad4dbdbbecd148e62a 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 99d71ebfcf0e9aec5666f050d973959c37a97b6a..da0f2ffb0f079c51aaae0c31b94e4e638db89b38 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -39,7 +34,7 @@
     # environment or more complex scenario is chosen
     robot-options: >
         -v USE_NETCONF_CONNECTOR:False
-        -v COUNT:1000000
+        -v COUNT:500000
         -v INSERT:10
         -v WITHDRAW:9
         -v PREFILL:10
index 76f18bf9e809ab74fa25784a6741539742885b52..ca9fa8ce9af901641f68f34ee6aebe933fad7f81 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
     # Robot custom options:
     robot-options: >
         -v USE_NETCONF_CONNECTOR:False
-        -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10
-        -v REPETITIONS_CHANGE_COUNT_SINGLE:3
-        -v CHECK_PERIOD_PREFIX_COUNT_MANY:10
+        -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:60
+        -v REPETITIONS_CHANGE_COUNT_SINGLE:1
+        -v CHECK_PERIOD_PREFIX_COUNT_MANY:60
         -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0
-        -v REPETITIONS_CHANGE_COUNT_MANY:10
-        -v MULTIPLICITY_CHANGE_COUNT_MANY:600
+        -v REPETITIONS_CHANGE_COUNT_MANY:1
+        -v MULTIPLICITY_CHANGE_COUNT_MANY:10
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
     odl_system_flavor: odl-standard-4
-
index 137abb967c639bcbf853476298f40e0f43a60b9b..feca52dadd102292be75aa5e886fc7984e64a8b9 100644 (file)
               odl-bgpcep-bmp,
               odl-bgpcep-bmp-config-example,
               odl-bgpcep-pcep
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example
 
     install:
       - only:
index ee8e9d37a0d7a6404ad57cc415145b5121bab98b..4c19390a4afe49f2a7d3e01bff06f198be6ae771 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 1c2d76d71d900432331eeaa4bc53620586c3ce0b..dd72b0f53c63692705838e7f07793a9bda7c73f1 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 904d097ed2efca47920ed018f087fdbb8bbe7a41..b902204cc69b64a48b3cbb0953f4567a0c307ac9 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index f2e183547dec69e66d29d0ce86c70305148c7134..0874aa7d6a2c5c2a211c70bf75eb6402280b6d16 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a0316bfedc92278bf7d85bdf6bdadb9f32199c42..98542632cce26e47bd6e08809bbdeb0dda319e6e 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index f1e6f274ae7b108e1d5c10b7b35384578e0f039b..f1e2b7a4a2cd6286bc3f7e56242521862eb8247a 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - bgp:
index a05817ddb899d389d791e37a554ee097b249dad1..bc4f4e1eac4d99ebfb131108e58e178217d70084 100644 (file)
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: 'stable/nitrogen'
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream},
-        tcpmd5-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
-- project:
-    name: bgpcep-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream},
-        tcpmd5-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
 - project:
     name: bgpcep-sonar
     jobs:
index afeed6b873acf596a3fe88cefcce485cb479bbd8..67dcb5c018458403ead684230a222ba0f3d60d43 100644 (file)
 
     # Project branches
     stream:
-      # Removed jobs testing Carbon branches due to the CSIT update
-      # incompatible changes in test suites for Nitrogen
-      # TODO: Create test suites for specific release before
-      # Nitrogen if needed.
       - fluorine:
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
-    verify-stream: 'nitrogen'
-    verify-branch: 'stable/nitrogen'
+    verify-stream: 'oxygen'
+    verify-branch: 'stable/oxygen'
     verify-karaf-version: 'karaf4'
 
     install:
index be616372906f491d0757c9a633a76375bd335769..c3e51500a83b48b37e2f6b83e822a133a5e55bbe 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: bier-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
-- project:
-    name: bier-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[bier]'
-
-    # Used by the release job
-    staging-profile-id: 942a8075b1f2a
-
-- project:
-    name: bier-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[bier]'
-
-    # Used by the release job
-    staging-profile-id: 942a8075b1f2a
-
 - project:
     name: bier-sonar
     jobs:
index 023718a5c970bd8188606bf682a5f65d048519a7..1ed2c5d6ccac3bebf7821aeaaed35dcbcc58652f 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 6836282e64f10e698886b6d41afc4c0e6d026093..ed7c55974acef74738f032722437f1bf343b9b03 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: capwap-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
 
-- project:
-    name: capwap-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
-- project:
-    name: capwap-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
 - project:
     name: capwap
     jobs:
index 58b826da050149798b5c0e730eb79d0b677af324..00397abdd293d204287d751c2974609b5094d64d 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: cardinal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96be20348f0f2
 
-- project:
-    name: cardinal-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
-- project:
-    name: cardinal-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
 - project:
     name: cardinal-sonar
     jobs:
index 7a4a45f52deafc7fe9dc049b54f74884c08522b9..47ba93e7713b46b4eb703eaa65bccb6d64cf5398 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index e65f791a3eb1d9e12868a61d44b1b33d9d4cb3c3..53da8f640598a7f992351be65969dd3d7f59273f 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: centinel-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
 
-- project:
-    name: centinel-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
-- project:
-    name: centinel-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
 - project:
     name: centinel-sonar
     jobs:
index 117d2be80bdc75b121121ca1136521dbb07f3b2b..e4ddeea1c631a7469812490974ad169457eab0cf 100644 (file)
@@ -3,6 +3,11 @@
     name: coe-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: coe
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
+          rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
       - odl-maven-jobs
 
     project: 'coe'
     name: coe-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: coe
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/
+          rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155
       - odl-maven-jobs
 
     project: 'coe'
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 
-- project:
-    name: coe-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'coe'
-    project-name: 'coe'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96c0be46aac33
-
-- project:
-    name: coe-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'coe'
-    project-name: 'coe'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96c0be46aac33
-
 - project:
     name: coe-sonar
     jobs:
index eb580fda54e04d67b1ae7b065ea2ad6dbda4354d..e3488469e024870ebd399510226791b1b297d638 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 23ffa331c93e34f33487d29ccfe5da99049b58b9..56ab3272c4899897af5c4c6482a0cf64e987a123 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a6bd7ac4d1543d8c6e70da791cdcd0b0d0bcf5b3..b8cc17ed8b0e66c6382248aa5f102eae9161ab3c 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index a5130abf9e8c8450fe87e3f6edb13b1bbad54419..14b1725da8cd7152e54bafab962a4bb8e760601a 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 88a8e0c12bc2028f896dbd30f380438ebe5d9640..33c84f63280265cda7f4074b73ed97331baeca2f 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index a95fdb06ca81346577aa4e926f701d59c4d0a3c5..f0b6362b97eca9bcd66b398d7a8ac19f5c223bd2 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 1743f1b1a9b1066fc6caeb168c8e535a232e6136..8cad5fe09dfab2cf6ac2226fd4760ce7e787a3bf 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index e79ebef997eca6e4fda445c19989e90310a82767..742d2b90fb19e41f7c03ff80ce8b412a6a7979b2 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 41169c5ac3635068703a31d0e923a82dff67ea3a..472c2fa7517aee370f2228f1301d0b8d2f39695c 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 344ebb88f777fe7e39866ccf1c8271b463f55db5..3c8973cb107bb4fbefe1c66ceb89b6fec3d05749 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 0c2b0fdfd27b826f851b7e5fc7dcf5cf5c07c43c..82196035cb2932b2b7c4a4733a4e201980938aef 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 6cf7ecfeaf6ec650756cdfe04deb6cc4bab8c813..80b54ae4cb9eaa297ed447783bee2d539fa71122 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml
new file mode 100644 (file)
index 0000000..8bf3659
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: controller-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'controller'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 025a9e9a75d4b54d612dca89ba3fec384d73e7c2..d6fc7143a79a70a258aa63d039db632f62af3043 100644 (file)
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
-- project:
-    name: controller-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
-
-- project:
-    name: controller-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
-
 - project:
     name: controller-sonar
     jobs:
index 67d5754d2698c520eb808ef75ee1173b0afd98d4..7c6b907174b3739480c57ee4ea890859b39d160b 100644 (file)
     # Used by the release job
     staging-profile-id: 96cd299563ec6
 
-- project:
-    name: coretutorials-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
-- project:
-    name: coretutorials-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
 - project:
     name: coretutorials-sonar
     jobs:
index 083be0a88ff28024bf6562a52c281f9ef60893bd..1324d4df2d9a97487e36edbcc48b28831719cf48 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 08da6af2cb5b49f9456f8ebb24b5820f3ed7d446..b34bcd5c4f8697e894c5ad4e4b78db32257fd942 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - only:
index 5fb3dd0d21ae174b94f95a309990255ab2831598..cb3eec201424acf9b0a46d121903f26eed3d597e 100644 (file)
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
 - project:
     name: daexim-sonar
     jobs:
index 4732b9b1c3c5a6ab432e61f47ec8faccd0d66033..b1e4b2014ae5d953a8fe442d3f7f775192e7ae19 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index a9a6be7d4cd18ec1e3d51a77985950bf72262836..ff620ae1fe478ee3d760f0eb301c1787a2d5030f 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: didm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96e6338c870f5
 
-- project:
-    name: didm-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-
-    # Used by the release job
-    staging-profile-id: 96e6338c870f5
-
-- project:
-    name: didm-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-
-    # Used by the release job
-    staging-profile-id: 96e6338c870f5
-
 - project:
     name: didm-sonar
     jobs:
index 7f52f5c62ded93e2a260ba0bbceac5b16fac01a9..7c799b44a7a0b22daa45a348e54307dc0a7fc4b0 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: dlux-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
-- project:
-    name: dlux-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
 - project:
     name: dlux-sonar
     jobs:
index b0c568b21a08d5f8c7432b9791fa80d1a862a50f..46f7ae5037a5e757a1484c26b911150e69b632ff 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 6cd7760b2a784e073628a3ec7068277f68481fd8..ca850310b6221f86969c6fbf4cf8205a670cef8f 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: dluxapps-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
-- project:
-    name: dluxapps-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
-- project:
-    name: dluxapps-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    project: 'dluxapps'
-    project-name: 'dluxapps'
-    stream: carbon
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'dluxapps-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
 - project:
     name: dluxapps-sonar
     jobs:
index 5e4639a097dcaa1a2f6a0104bed5684a5ed8b0be..ac14197063a0523b4a5466bc3e2f2418f1c63a15 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
 
     project: docs
     project-name: docs
index 36e06e98ad88be0388b7bfd66e3b5043e494c97f..3a3271a10c085e0335daacae148807b4b8626996 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: eman-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     # Used by the release job
     staging-profile-id: 96e9352979521
 
-- project:
-    name: eman-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[eman]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: 96e9352979521
-
-- project:
-    name: eman-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[eman]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: 96e9352979521
-
 - project:
     name: eman-sonar
     jobs:
index 08ec7ea29fa2deb04957c8b2272d80a3d2edc53c..ea767f6e9ffeac6f7ba38acb4c1e6bbd1ee405c7 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: faas-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96f5ac591d858
 
-- project:
-    name: faas-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
-- project:
-    name: faas-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
 - project:
     name: faas-sonar
     jobs:
index 428f14b0d8db0f3960b17528d05536d68d039aa3..d08bc6a4610996b65ef7e48f20c09453d9fea00e 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: federation-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
 
-- project:
-    name: federation-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
-- project:
-    name: federation-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
 - project:
     name: federation-sonar
     jobs:
index 77d08b0d780fd61331505cb8d219410daf6242b9..056e8a3c103177184603d51e344d2d3247e7769d 100644 (file)
@@ -1,64 +1,45 @@
 ---
 - project:
-    name: genius-csit-genius-oxygen
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
     functionality:
       - 'upstream'
       - 'gate'
       - 'tdd-wip':
           testplan: '{project}-tdd-wip.txt'
-          schedule: ''
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
+
     install:
       - all:
           scope: 'all'
 
-    # Mininet configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
-    # Features to install
     install-features: 'odl-genius-rest'
 
-    # Robot custom options
-    robot-options: ' '
-
 - project:
-    name: genius-csit-genius-{stream}
+    name: genius-csit-genius-verify
     jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
       - inttest-csit-verify-1node
       - inttest-csit-verify-3node
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
-    functionality:
-      - 'upstream'
-      - 'gate'
+    functionality: 'verify'
 
-    # Project branches
     stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - fluorine:
+          branch: 'master'
 
     verify-stream: 'oxygen'
     verify-branch: 'stable/oxygen'
       - all:
           scope: 'all'
 
-    # Mininet configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
-    # Features to install
     install-features: 'odl-genius-rest'
-
-    # Robot custom options
-    robot-options: ' '
index 5b0ee7f92a9c0526c50dbd2db5aaad3471d39e3d..b9f22ec4c11938b8bd41152152f8b5b3a28bbc95 100644 (file)
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
index 73bbbf8d5273a901cea913c88912450777c0bcef..db5cc0958e999fa89410fc918eb0c4b61b51675a 100644 (file)
@@ -4,6 +4,11 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: genius
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
+          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
 
     stream: fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: genius
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
+          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
 
     stream: oxygen
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
-- project:
-    name: genius-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
-- project:
-    name: genius-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
 - project:
     name: genius-sonar
     jobs:
index 536325e5186cf8883d630feaea2d91591b39fd50..5a2ef9c64caf06ff737dfa040b61c4909c97e996 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 536325e5186cf8883d630feaea2d91591b39fd50
+Subproject commit 5a2ef9c64caf06ff737dfa040b61c4909c97e996
index a8442ad784172b632586b52d80c283d7c85fd273..8b4b546395cc569bebb29ec70a0b8894a9cb5cd8 100644 (file)
       - oxygen:
           branch: 'stable/oxygen'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
       - ocata:
index 53b6f757856918bd395d7fc548f3fff9eb922957..a0f6b62e87416948e328fe66710f4b3aff809b58 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1444524aa5ce9c6129b6c29df215c69782590107..191c88f1e8d3b6eef94c40035e9556d6bcbf5a0d 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 675fdf0c257563573cfe5fa8c93b58b2cba54812..6395c405255ff6d30cc160157e043296282d2539 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index be355c2fc5965d6de18f24d26196f8073e6a7a61..3fa1a99c521aefcd31a1d7e624d4b90088513243 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 6792b6307baf3aa037756f20004045745c8d0657..93534339a40e1275a161677344699b46b726a3bc 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: groupbasedpolicy-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
-- project:
-    name: groupbasedpolicy-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-
-    # Used by the release job
-    staging-profile-id: 96fbb93f95a76
-
-- project:
-    name: groupbasedpolicy-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-
-    # Used by the release job
-    staging-profile-id: 96fbb93f95a76
-
 - project:
     name: groupbasedpolicy-sonar
     jobs:
index f4829d180f15b851a03706820039e495922752e6..936c72b1e6f7aee0bfdca8028ef6ee99b616fece 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: vbd-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96fc362c36862
 
-- project:
-    name: vbd-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
-- project:
-    name: vbd-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
 - project:
     name: vbd-sonar
     jobs:
index 3dabe2ae77081e9ffffce97ae991579000f2b31c..3881314498d439d4ff376d8ba80f395db6233784 100644 (file)
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
@@ -31,3 +24,7 @@
       - cluster-netvirt:
           csit-list: >
               netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index bfec7c881d6e37611f9eae0f3fa4c18cb2ef0eb7..2a865fc9c4b4b1aeaafe675e708da40f21779f10 100644 (file)
@@ -4,6 +4,12 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: infrautils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
+          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs
 
     stream: fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: infrautils
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
+          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs
 
     stream: oxygen
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
-- project:
-    name: infrautils-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
-- project:
-    name: infrautils-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
 - project:
     name: infrautils-sonar
     jobs:
index 605cd8f0ac9ac8a49a8d2f16d6053681efd28c02..836100b774e7c1fa3f266b4b4daa86caabe3f866 100644 (file)
@@ -115,3 +115,13 @@ function configure_karaf_log() {
     echo "cat ${LOGCONF}"
     cat ${LOGCONF}
 } # function configure_karaf_log()
+
+# convert commas in csv strings to spaces (ssv)
+function csv2ssv() {
+    local csv=$1
+    if [ -n "${csv}" ]; then
+        ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g')
+    fi
+
+    echo "${ssv}"
+} # csv2ssv
diff --git a/jjb/integration/csit-jobs-carbon.lst b/jjb/integration/csit-jobs-carbon.lst
deleted file mode 100644 (file)
index 2cc6ff8..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-aaa-csit-1node-authn-all-carbon,
-aaa-csit-1node-keystone-all-carbon,
-aaa-csit-1node-tls-only-carbon,
-alto-csit-1node-setup-all-carbon,
-bgpcep-csit-1node-bgp-ingest-all-carbon,
-bgpcep-csit-1node-bgp-ingest-mixed-all-carbon,
-bgpcep-csit-1node-throughpcep-all-carbon,
-bgpcep-csit-1node-userfeatures-all-carbon,
-bgpcep-csit-3node-bgpclustering-all-carbon,
-bgpcep-csit-3node-bgpclustering-ha-only-carbon,
-bier-csit-1node-basic-all-carbon,
-controller-csit-1node-akka1-all-carbon,
-controller-csit-1node-benchmark-all-carbon,
-controller-csit-1node-rest-cars-perf-all-carbon,
-controller-csit-3node-benchmark-all-carbon,
-controller-csit-3node-clustering-all-carbon,
-controller-csit-3node-rest-clust-cars-perf-only-carbon,
-didm-csit-1node-discovery-only-carbon,
-distribution-csit-1node-userfeatures-all-carbon,
-dluxapps-csit-1node-yangman-all-carbon,
-genius-csit-1node-upstream-all-carbon,
-genius-csit-3node-upstream-all-carbon,
-groupbasedpolicy-csit-1node-3-node-all-carbon,
-groupbasedpolicy-csit-1node-6node-all-carbon,
-groupbasedpolicy-csit-1node-openstack-ocata-openstack-carbon,
-groupbasedpolicy-csit-1node-sxp-only-carbon,
-groupbasedpolicy-csit-3node-clustering-all-carbon,
-iotdm-csit-1node-basic-all-carbon,
-l2switch-csit-1node-host-scalability-daily-only-carbon,
-l2switch-csit-1node-scalability-all-carbon,
-l2switch-csit-1node-switch-all-carbon,
-lacp-csit-1node-lacp-all-carbon,
-lispflowmapping-csit-1node-msmr-all-carbon,
-lispflowmapping-csit-1node-performance-only-carbon,
-lispflowmapping-csit-3node-msmr-all-carbon,
-mdsal-csit-1node-bindingv1-only-carbon,
-messaging4transport-csit-1node-basic-all-carbon,
-natapp-csit-1node-basic-all-carbon,
-nemo-csit-1node-engine-all-carbon,
-netconf-csit-1node-callhome-only-carbon,
-netconf-csit-1node-scale-all-carbon,
-netconf-csit-1node-userfeatures-all-carbon,
-netconf-csit-3node-cluster-stress-all-carbon,
-netconf-csit-3node-clustering-all-carbon,
-netconf-csit-3node-clustering-scale-all-carbon,
-netide-csit-1node-basic-all-carbon,
-netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon,
-netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
-netvirt-csit-1node-openstack-pike-sfc-carbon,
-netvirt-csit-1node-openstack-pike-upstream-stateful-carbon,
-netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-carbon,
-netvirt-csit-3node-openstack-ocata-upstream-stateful-carbon,
-netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
-netvirt-csit-3node-openstack-pike-upstream-stateful-carbon,
-netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-carbon,
-netvirt-csit-hwvtep-1node-openstack-ocata-upstream-stateful-carbon,
-netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-carbon,
-netvirt-csit-hwvtep-3node-openstack-ocata-upstream-stateful-carbon,
-netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-carbon,
-nic-csit-1node-basic-all-carbon,
-ocpplugin-csit-1node-get-all-carbon,
-ocpplugin-csit-1node-scalability-all-carbon,
-of-config-csit-1node-basic-all-carbon,
-openflowplugin-csit-1node-cbench-only-carbon,
-openflowplugin-csit-1node-flow-services-all-carbon,
-openflowplugin-csit-1node-perf-bulkomatic-only-carbon,
-openflowplugin-csit-1node-perf-stats-collection-only-carbon,
-openflowplugin-csit-1node-scale-link-only-carbon,
-openflowplugin-csit-1node-scale-only-carbon,
-openflowplugin-csit-1node-scale-switch-only-carbon,
-openflowplugin-csit-3node-clustering-bulkomatic-only-carbon,
-openflowplugin-csit-3node-clustering-only-carbon,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-carbon,
-ovsdb-csit-1node-upstream-southbound-all-carbon,
-ovsdb-csit-3node-upstream-clustering-only-carbon,
-packetcable-csit-1node-pcmm-all-carbon,
-sdninterfaceapp-csit-1node-basic-only-carbon,
-sfc-csit-3node-docker-full-deploy-all-carbon,
-sfc-csit-3node-rest-basic-all-carbon,
-sxp-csit-1node-basic-all-carbon,
-sxp-csit-1node-filtering-all-carbon,
-sxp-csit-1node-performance-all-carbon,
-sxp-csit-1node-topology-all-carbon,
-sxp-csit-3node-clustering-all-carbon,
-sxp-csit-3node-routing-all-carbon,
-topoprocessing-csit-1node-topology-operations-all-carbon,
-tsdr-csit-1node-cassandra-datastore-only-carbon,
-tsdr-csit-1node-elasticsearch-datastore-only-carbon,
-tsdr-csit-1node-hbase-datastore-all-carbon,
-tsdr-csit-1node-hsqldb-datastore-all-carbon,
-unimgr-csit-1node-basic-all-carbon,
-unimgr-csit-1node-legato-all-carbon,
-usc-csit-1node-channel-all-carbon,
-usc-csit-1node-tcp-all-carbon,
-usecplugin-csit-1node-basic-all-carbon,
-vtn-csit-1node-openstack-pike-neutron-carbon,
-yangtools-csit-1node-system-only-carbon,
index 01e20cd215b1078ad3eaa355222ab1d32e5b61fb..a782e56c60d7131d5d3cdaef6cdf8349a8d77448 100644 (file)
@@ -30,6 +30,7 @@ netconf-csit-3node-clustering-all-fluorine,
 netconf-csit-3node-clustering-scale-all-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
+netvirt-csit-1node-openstack-queens-sfc-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-3node-openstack-pike-upstream-stateful-fluorine,
diff --git a/jjb/integration/csit-jobs-nitrogen.lst b/jjb/integration/csit-jobs-nitrogen.lst
deleted file mode 100644 (file)
index f6dfac0..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-aaa-csit-1node-authn-all-nitrogen,
-aaa-csit-1node-keystone-all-nitrogen,
-aaa-csit-1node-tls-only-nitrogen,
-alto-csit-1node-setup-all-nitrogen,
-bgpcep-csit-1node-bgp-ingest-all-nitrogen,
-bgpcep-csit-1node-bgp-ingest-mixed-all-nitrogen,
-bgpcep-csit-1node-throughpcep-all-nitrogen,
-bgpcep-csit-1node-userfeatures-all-nitrogen,
-bgpcep-csit-3node-bgpclustering-all-nitrogen,
-bgpcep-csit-3node-bgpclustering-ha-only-nitrogen,
-bier-csit-1node-basic-all-nitrogen,
-controller-csit-1node-akka1-all-nitrogen,
-controller-csit-1node-benchmark-all-nitrogen,
-controller-csit-1node-rest-cars-perf-all-nitrogen,
-controller-csit-3node-benchmark-all-nitrogen,
-controller-csit-3node-clustering-all-nitrogen,
-controller-csit-3node-rest-clust-cars-perf-only-nitrogen,
-daexim-csit-1node-basic-only-nitrogen,
-daexim-csit-3node-clustering-basic-only-nitrogen,
-distribution-csit-1node-userfeatures-all-nitrogen,
-dluxapps-csit-1node-yangman-all-nitrogen,
-genius-csit-1node-upstream-all-nitrogen,
-genius-csit-3node-upstream-all-nitrogen,
-groupbasedpolicy-csit-1node-3-node-all-nitrogen,
-groupbasedpolicy-csit-1node-6node-all-nitrogen,
-groupbasedpolicy-csit-1node-openstack-ocata-openstack-nitrogen,
-groupbasedpolicy-csit-1node-sxp-only-nitrogen,
-groupbasedpolicy-csit-3node-clustering-all-nitrogen,
-l2switch-csit-1node-host-scalability-daily-only-nitrogen,
-l2switch-csit-1node-scalability-all-nitrogen,
-l2switch-csit-1node-switch-all-nitrogen,
-lispflowmapping-csit-1node-msmr-all-nitrogen,
-lispflowmapping-csit-1node-performance-only-nitrogen,
-lispflowmapping-csit-3node-msmr-all-nitrogen,
-mdsal-csit-1node-bindingv1-only-nitrogen,
-messaging4transport-csit-1node-basic-all-nitrogen,
-nemo-csit-1node-engine-all-nitrogen,
-netconf-csit-1node-callhome-only-nitrogen,
-netconf-csit-1node-scale-all-nitrogen,
-netconf-csit-1node-userfeatures-all-nitrogen,
-netconf-csit-3node-cluster-stress-all-nitrogen,
-netconf-csit-3node-clustering-all-nitrogen,
-netconf-csit-3node-clustering-scale-all-nitrogen,
-netvirt-csit-1node-openstack-pike-sfc-nitrogen,
-netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-1node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-3node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-3node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-nitrogen,
-nic-csit-1node-basic-all-nitrogen,
-ocpplugin-csit-1node-get-all-nitrogen,
-ocpplugin-csit-1node-scalability-all-nitrogen,
-of-config-csit-1node-basic-all-nitrogen,
-openflowplugin-csit-1node-cbench-only-nitrogen,
-openflowplugin-csit-1node-flow-services-all-nitrogen,
-openflowplugin-csit-1node-perf-bulkomatic-only-nitrogen,
-openflowplugin-csit-1node-perf-stats-collection-only-nitrogen,
-openflowplugin-csit-1node-scale-link-only-nitrogen,
-openflowplugin-csit-1node-scale-only-nitrogen,
-openflowplugin-csit-1node-scale-switch-only-nitrogen,
-openflowplugin-csit-3node-clustering-bulkomatic-only-nitrogen,
-openflowplugin-csit-3node-clustering-only-nitrogen,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-nitrogen,
-ovsdb-csit-1node-upstream-southbound-all-nitrogen,
-ovsdb-csit-3node-upstream-clustering-only-nitrogen,
-packetcable-csit-1node-pcmm-all-nitrogen,
-sdninterfaceapp-csit-1node-basic-only-nitrogen,
-sfc-csit-3node-docker-full-deploy-all-nitrogen,
-sfc-csit-3node-rest-basic-all-nitrogen,
-sxp-csit-1node-basic-all-nitrogen,
-sxp-csit-1node-filtering-all-nitrogen,
-sxp-csit-1node-performance-all-nitrogen,
-sxp-csit-1node-topology-all-nitrogen,
-sxp-csit-3node-clustering-all-nitrogen,
-sxp-csit-3node-routing-all-nitrogen,
-topoprocessing-csit-1node-topology-operations-all-nitrogen,
-unimgr-csit-1node-basic-all-nitrogen,
-unimgr-csit-1node-legato-all-nitrogen,
-usc-csit-1node-channel-all-nitrogen,
-usc-csit-1node-tcp-all-nitrogen,
-usecplugin-csit-1node-basic-all-nitrogen,
-vtn-csit-1node-openstack-pike-neutron-nitrogen,
-yangtools-csit-1node-system-only-nitrogen,
index 63f8c3eedb2c92f0f7fde69b62c806e2b6ea620a..3f7231166da6c4df013db4543fa2d7a1aaeebcfb 100644 (file)
@@ -40,9 +40,9 @@ 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-openstack-pike-sfc-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-oxygen,
+netvirt-csit-1node-openstack-queens-sfc-oxygen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-3node-openstack-pike-upstream-stateful-oxygen,
@@ -82,5 +82,4 @@ 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,
-vtn-csit-1node-openstack-pike-neutron-oxygen,
 yangtools-csit-1node-system-only-oxygen,
index 35076e1fc09ad550a9f0feae86a256a093cd2522..be617ee034b32c326d9572170b0104cff52c12c2 100644 (file)
@@ -1,10 +1,9 @@
-
 CONTROLLERMEM="3072m"
 ACTUALFEATURES="odl-integration-all"
-BUNDLEVERSION="$(xpath distribution/pom.xml '/project/version/text()' 2> /dev/null)"
-BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
-BUNDLE="${BUNDLEFOLDER}.zip"
-BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSION}/${BUNDLE}"
+
+if [[ ! -z "${CONTROLLERFEATURES}" ]]; then
+    ACTUALFEATURES="odl-integration-all,${CONTROLLERFEATURES}"
+fi
 
 echo "Kill any controller running"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
@@ -12,23 +11,31 @@ ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 echo "Clean Existing distribution"
 rm -rf ${BUNDLEFOLDER}
 
-echo "Copying the distribution..."
-cp "${BUNDLE_PATH}" .
+echo "Fetch the distribution..."
+if  [[ -z "${BUNDLE_PATH}" ]]; then
+    wget --progress=dot:mega  "${ACTUAL_BUNDLE_URL}"
+else
+    cp "${BUNDLE_PATH}" .
+fi
 
 echo "Extracting the new controller..."
 unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-FEATURE_TEST_STRING="features-integration-test"
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_TEST_STRING="features-test"
+FEATURE_TEST_STRING="features-test"
+if [[ "$KARAF_VERSION" == "karaf3" ]]; then
+    FEATURE_TEST_STRING="features-integration-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" ${FEATURESCONF}
+
+if [[ ! -z "${REPO_URL}" ]]; then
+   sed -ie "s%featuresRepositories = %featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+fi
 
 # Add actual boot features.
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
+sed -ie "s/\(featuresBoot= \|featuresBoot = \)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
 
 echo "Configuring the log..."
@@ -44,10 +51,6 @@ cat "${MEMCONF}"
 echo "Listing all open ports on controller system"
 netstat -pnatu
 
-echo "redirected karaf console output to karaf_console.log"
-export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
-
 if [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
@@ -70,9 +73,6 @@ mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
-# No need for verbose printing during repeating operations.
-set +x
-
 function dump_log_and_exit {
     echo "Dumping first 500K bytes of karaf log..."
     head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
@@ -84,40 +84,19 @@ function dump_log_and_exit {
 }
 
 echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..."
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; then
-    # Only oxygen and above have the infrautils.ready feature, so using REST API to determine if the controller is ready.
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
-        echo ${RESP}
-        if [[ ${RESP} == *"200"* ]]; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-else
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-fi
-
-set -x
+COUNT="0"
+while true; do
+    COUNT=$(( ${COUNT} + 5 ))
+    sleep 5
+    echo "already waited ${COUNT} seconds..."
+    if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
+        echo "Controller is UP"
+        break
+    elif (( "${COUNT}" > "300" )); then
+        echo "Timeout Controller DOWN"
+        dump_log_and_exit
+    fi
+done
 
 # echo "Checking OSGi bundles..."
 # sshpass seems to fail with new karaf version
@@ -140,6 +119,7 @@ function exit_on_log_file_message {
     fi
 }
 
+exit_on_log_file_message 'Error installing boot feature repository'
 exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
index 0d016eb586774837c91bff98948100656e75cc59..4c69b386c989004a5b4e73d64fb7bc868c077141 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
diff --git a/jjb/integration/distribution/distribution-deploy-offline.sh b/jjb/integration/distribution/distribution-deploy-offline.sh
deleted file mode 100644 (file)
index e7920b5..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-CONTROLLERMEM="3072m"
-ACTUALFEATURES="odl-integration-all"
-
-echo "Kill any controller running"
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-
-echo "Clean workspace"
-rm -rf *
-
-echo "Downloading the distribution..."
-wget --progress=dot:mega "${ACTUAL_BUNDLE_URL}"
-
-echo "Extracting the new controller..."
-unzip -q "${BUNDLE}"
-
-echo "Configuring the startup features..."
-FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-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}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
-
-# Feature is instaled later.
-cat "${FEATURESCONF}"
-
-echo "Configuring the log..."
-LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg"
-sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' "${LOGCONF}"
-# FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' "${LOGCONF}"
-cat "${LOGCONF}"
-
-echo "Configure the repos..."
-REPOCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg"
-sed -ie '/http/d' "${REPOCONF}"
-sed -ie '$s/...$//' "${REPOCONF}"
-cat "${REPOCONF}"
-
-echo "Configure max memory..."
-MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv"
-sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}"
-cat "${MEMCONF}"
-
-if [ "${JDKVERSION}" == 'openjdk8' ]; then
-    echo "Setting the JRE Version to 8"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.8.0'
-elif [ "${JDKVERSION}" == 'openjdk7' ]; then
-    echo "Setting the JRE Version to 7"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.7.0'
-fi
-readlink -e "${JAVA_HOME}/bin/java"
-echo "Default JDK Version, JAVA_HOME should override"
-java -version
-
-echo "Redirecting karaf console output to karaf_console.log"
-export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
-
-echo "Starting controller..."
-${WORKSPACE}/${BUNDLEFOLDER}/bin/start
-
-echo "Waiting for controller to come up..."
-# Silence the chatty output during the loop.
-set +x
-COUNT=0
-# Bug 9044 workaround: use bin/client instead of Linux ssh command.
-CLIENT="${WORKSPACE}/${BUNDLEFOLDER}/bin/client"
-while true; do
-    # Is there a way to both print output and store RC without manipulating the e flag?
-    set +e
-    ${CLIENT} "feature:list -i"
-    RC="$?"
-    set -e
-    if [[ "${RC}" == "0" ]]; then
-        echo Karaf is UP
-        break
-    elif (( "${COUNT}" > 600 )); then
-        echo Timeout Karaf DOWN
-        echo "Dumping Karaf log..."
-        cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
-    else
-        echo "${RC}"
-        COUNT=$(( ${COUNT} + 1 ))
-        sleep 1
-        if [[ $(($COUNT % 5)) == 0 ]]; then
-            echo already waited ${COUNT} seconds...
-        fi
-    fi
-done
-# Un-silence the chatty output.
-set -x
-
-echo "Installing all features..."
-$CLIENT feature:install ${ACTUALFEATURES} || echo $? > "${WORKSPACE}/error.txt"
-
-echo "killing karaf process..."
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-sleep 5
-
-echo "Fetching Karaf logs"
-# TODO: Move instead of copy? Gzip?
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-
-echo "Exit if error"
-if [ -f "${WORKSPACE}/error.txt" ]; then
-    echo "Failed to deploy offline"
-    exit 1
-else
-    echo "Offline test: PASS"
-fi
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
diff --git a/jjb/integration/distribution/distribution-deploy-verify.sh b/jjb/integration/distribution/distribution-deploy-verify.sh
deleted file mode 100644 (file)
index ba28c7f..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-CONTROLLERMEM="3072m"
-ACTUALFEATURES="odl-integration-all"
-
-echo "Kill any controller running"
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-
-echo "Clean workspace"
-rm -rf *
-
-echo "Downloading the distribution..."
-wget --progress=dot:mega  "${ACTUAL_BUNDLE_URL}"
-
-echo "Extracting the new controller..."
-unzip -q "${BUNDLE}"
-
-echo "Configuring the startup features..."
-FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-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}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
-
-# Add actual boot features.
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
-cat "${FEATURESCONF}"
-
-echo "Configuring the log..."
-LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg"
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' "${LOGCONF}"
-cat "${LOGCONF}"
-
-echo "Configure max memory..."
-MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv"
-sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}"
-cat "${MEMCONF}"
-
-echo "Listing all open ports on controller system"
-netstat -pnatu
-
-if [ "${JDKVERSION}" == 'openjdk8' ]; then
-    echo "Setting the JRE Version to 8"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.8.0'
-elif [ "${JDKVERSION}" == 'openjdk7' ]; then
-    echo "Setting the JRE Version to 7"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.7.0'
-fi
-readlink -e "${JAVA_HOME}/bin/java"
-echo "Default JDK Version, JAVA_HOME should override"
-java -version
-
-echo "Redirecting karaf console output to karaf_console.log"
-export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
-
-echo "Starting controller..."
-${WORKSPACE}/${BUNDLEFOLDER}/bin/start
-
-function dump_log_and_exit {
-    echo "Dumping first 500K bytes of karaf log..."
-    head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-    echo "Dumping last 500K bytes of karaf log..."
-    tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-    exit 1
-}
-
-echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..."
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; then
-    # Only oxygen and above have the infrautils.ready feature, so using REST API to determine if the controller is ready.
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
-        echo ${RESP}
-        if [[ ${RESP} == *"200"* ]]; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-else
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-fi
-
-# echo "Checking OSGi bundles..."
-# sshpass seems to fail with new karaf version
-# sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
-
-echo "Listing all open ports on controller system"
-netstat -pnatu
-
-function exit_on_log_file_message {
-    echo "looking for \"$1\" in karaf.log file"
-    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
-        echo ABORTING: found "$1"
-        dump_log_and_exit
-    fi
-
-    echo "looking for \"$1\" in karaf_console.log file"
-    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then
-        echo ABORTING: found "$1"
-        dump_log_and_exit
-    fi
-}
-
-exit_on_log_file_message 'BindException: Address already in use'
-exit_on_log_file_message 'server is unhealthy'
-
-echo "Fetching Karaf logs"
-# TODO: Move instead of copy? Gzip?
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-
-echo "Kill controller"
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-
-echo "Bug 4628: Detecting misplaced config files"
-pushd "${WORKSPACE}/${BUNDLEFOLDER}" || exit
-XMLS_FOUND=`echo *.xml`
-popd || exit
-if [ "$XMLS_FOUND" != "*.xml" ]; then
-    echo "Bug 4628 confirmed."
-    ## TODO: Uncomment the following when ODL is fixed, to guard against regression.
-    # exit 1
-else
-    echo "Bug 4628 not detected."
-fi
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
index 78ba3a4b6d012c4f2dc123b42f0c296fa934b8db..af7327a60a13af9f80fcc7d8efd18e00b1a2f6d1 100644 (file)
@@ -1,4 +1,52 @@
 ---
+- project:
+    name: distribution
+    jobs:
+      # gerrit- is generic template, distribution- is project specific.
+      - 'distribution-merge-{stream}'
+      - 'distribution-verify-{stream}'
+      - 'distribution-check-{stream}'
+      - 'distribution-sanity-{stream}'
+      - 'distribution-managed-{stream}'
+      - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
+      - gerrit-tox-verify
+      - '{project-name}-rtd-jobs':
+          project-pattern: integration/distribution
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
+          rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944
+
+    project: integration/distribution
+    project-name: distribution
+    mvn-settings: integration-distribution-settings
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[int/dist]'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: mvn:org.opendaylight.sxp/features-sxp//xml/features
+          sm-features: odl-sxp-controller
+      - oxygen:
+          branch: 'stable/oxygen'
+          karaf-version: karaf4
+
+- project:
+    name: distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: integration/distribution
+    project-name: distribution
+    branch: master
+    mvn-settings: integration-distribution-settings
+    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - job-template:
     name: 'distribution-verify-{stream}'
 
 
     builders:
       - distribution-check-wipe
+      - inject:
+          properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
           pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
       - lf-infra-publish
 
 - job-template:
-    name: 'distribution-deploy-{stream}'
+    name: 'distribution-sanity-{stream}'
     # Goal: Verify distribution starts with no issues when all features are loaded.
-    # Operation: This job deploys the controller installing odl-integration-all.
-    # FIXME: List required variables.
+    # Operation: This job deploys odl-integration-all + list of UM features.
+    # This job works for both managed & self-managed distro.
 
     project-type: freestyle
     node: centos7-builder-4c-4g
           branch: '{branch}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{sm-repos}'
+      - integration-controller-features:
+          controller-features: '{sm-features}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
 
-    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
-
     builders:
-      - distribution-deploy-verify
+      - integration-detect-variables
+      - distribution-check-bootup
 
     publishers:
       - email-notification:
       - lf-infra-publish
 
 - job-template:
-    name: 'distribution-offline-{stream}'
-    # Goal: Verify distribution can start with no internet connection.
-    # Operation: This job deploys the controller removing any external repository definition.
-    # FIXME: List required variables.
+    name: 'distribution-managed-{stream}'
+    # Goal: Verify distribution starts with no issues when all features are loaded.
+    # Operation: This job deploys odl-integration-all.
+    # This job works for just managed distro.
 
     project-type: freestyle
     node: centos7-builder-4c-4g
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-bundle-url:
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
+          karaf-version: 'karaf4'
 
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
 
-    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
-
     builders:
-      - distribution-deploy-offline
+      - integration-detect-variables
+      - distribution-check-bootup
 
     publishers:
       - email-notification:
           email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
+
index bd835f21f8dc53933f1b6d5131a66f888a898b6c..2e3ba043b449673ddaed4363ea73f5e29eae1515 100644 (file)
@@ -1,26 +1,5 @@
 # JJB macros specific to Integration/Distribution ODL project
 ---
-
-- builder:
-    name: distribution-deploy-verify
-    # Operation: Deploy ODL with all fetures and check it is not broken.
-    # Required bash variables:
-    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
-    #     Use distribution-karaf-version macro to customize.
-    builders:
-      - integration-detect-variables
-      - shell: !include-raw: distribution-deploy-verify.sh
-
-- builder:
-    name: distribution-deploy-offline
-    # Operation: Deploys ODL on the current system, with no external repo configuration, check it works.
-    # Required bash variables:
-    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
-    #     Use distribution-karaf-version macro to customize.
-    builders:
-      - integration-detect-variables
-      - shell: !include-raw: distribution-deploy-offline.sh
-
 - builder:
     name: distribution-check-wipe
     # Step zero: Wipe file repositories up front.
           rm -rfv /tmp/t
           echo "create n: multithreaded execution might fail at creating it."
           mkdir /tmp/n
+          echo "detecting distribution allowed projects"
+          # Some allowed projects cannot be detected in distribution because they do not produce features.
+          ALLOW_PROJECTS=(yangtools mdsal openflowjava)
+          ALLOW_PROJECTS+=(`grep '<groupId>org.opendaylight.' -Rh distribution \
+          | sed -e 's%^[ \t]*<groupId>org.opendaylight.%%' \
+          | sed -e 's%</groupId>%%' | sort -u`)
+          echo "Allowed projects are ${ALLOW_PROJECTS[@]}"
+          echo "ALLOW_PROJECTS=${ALLOW_PROJECTS[@]}" > allowed_projects.txt
 
 - builder:
     name: distribution-check-build-project
@@ -48,7 +35,7 @@
           goals: |
               clean deploy
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
+              -Pq -Pmanaged -Punmanaged
               -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
               {mvn-opts}
           java-opts:
     #   gerrit-project: Project name as nexus URI part. Typically '$GERRIT_PROJECT'.
     builders:
       - shell: |
+          echo "These are allowed projects: $ALLOW_PROJECTS"
+          echo "These are distribution pulled projects:"
+          EXIT_CODE="0"
+          for PROJECT in `ls /tmp/r/org/opendaylight`; do
+          echo "checking $PROJECT"
+          if [[ "$ALLOW_PROJECTS" != *"$PROJECT"* ]]; then
+          echo "ERROR: Not allowed project $PROJECT pulled"
+          EXIT_CODE="1"
+          fi
+          done
+          exit $EXIT_CODE
+          echo "verify project groupId"
           mkdir -p /tmp/t/org/opendaylight/{gerrit-project}
           mv /tmp/n/org/opendaylight/{gerrit-project}/* /tmp/t/org/opendaylight/{gerrit-project}/
           test -z "`find /tmp/n/ -type f`" || ( echo "ERROR: Mismatched groupId detected (see above)." && false )
@@ -88,7 +87,7 @@
           goals: |
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
+              -Pq -Pmanaged -Punmanaged
               {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq
+              -Pq -Pmanaged -Punmanaged
               {mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq
+              -Pq -Pmananaged -Punmanaged
               -Dsft.heap.max=4g
               -DskipTests=false
               {mvn-opts}
index dc2f73aa66006f495b762a99c7ebd89488f677f3..45fda0b3218e3e9445a5490e8cea136b51214b83 100644 (file)
@@ -72,6 +72,8 @@
 
     builders:
       - distribution-check-wipe
+      - inject:
+          properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
deleted file mode 100644 (file)
index c737d8d..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
----
-- project:
-    name: distribution
-    jobs:
-      # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-merge-{stream}'
-      - 'distribution-verify-{stream}'
-      - 'distribution-deploy-{stream}'
-      - 'distribution-offline-{stream}'
-      - 'distribution-check-{stream}'
-      - gerrit-maven-clm
-      - gerrit-maven-verify-dependencies
-      - gerrit-tox-verify
-
-    project: integration/distribution
-    project-name: distribution
-    mvn-settings: integration-distribution-settings
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[int/dist]'
-
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-- project:
-    name: distribution-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: integration/distribution
-    project-name: distribution
-    branch: master
-    mvn-settings: integration-distribution-settings
-    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index a7b3827eca45d9ab885ec38e73b80ac4713d3500..b02b568027b806c7e372df4c23c3621ca2b3a981 100644 (file)
@@ -12,12 +12,12 @@ 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"
-# Extract the BUNDLEVERSION from the pom.xml
-BUNDLEVERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
-echo "Bundle version is ${BUNDLEVERSION}"
+# 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}"
 # Acquire the timestamp information from maven-metadata.xml
 NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}"
-wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
+wget ${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml
 
 if [ $? -ne 0 ]; then
   echo "unable to find maven-metadata.xml. no need to continue..."
@@ -27,9 +27,9 @@ fi
 less maven-metadata.xml
 TIMESTAMP=$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
 echo "Nexus timestamp is ${TIMESTAMP}"
-BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
 BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
-ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
 
 wget --progress=dot:mega $ACTUAL_BUNDLE_URL
 echo "Extracting the last distribution found on nexus..."
index f0ba1efc4129f64e729f092ddb405c296460729f..42a2d8696633655f6e63c6db275f771967fae490 100644 (file)
@@ -80,7 +80,7 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+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
index f4d56ac2def12c4b64bbc8790608a04188dba5a2..021161e61d6a10646aaf01618dba9d0eae810bc1 100644 (file)
@@ -69,7 +69,7 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+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
@@ -155,70 +155,29 @@ if [[ "$USEFEATURESBOOT" != "True" ]]; then
                          feature:list -i
 fi
 
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ];
-then
-    echo "only oxygen and above have the infrautils.ready feature, so using REST API to /modules or /shards to determine if the controller is ready.";
-
-    COUNT="0"
-
-    while true; do
-        RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )"
-        echo \$RESP
-
-        if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
-            SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=\member-\$1-shard-inventory-config,type=DistributedConfigDatastore)"
-            echo \$SHARD
-        fi
-
-        if ([[ \$RESP == *"200"* ]] && ([[ "${ENABLE_HAPROXY_FOR_NEUTRON}" != "yes" ]] || [[ \$SHARD  == *'"status":200'* ]])); then
-            echo "Controller is UP"
-            break
-
-        elif (( "\$COUNT" > "600" )); then
-            echo Timeout Controller DOWN
-            echo "Dumping first 500K bytes of karaf log..."
-            head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-            echo "Dumping last 500K bytes of karaf log..."
-            tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-            echo "Listing all open ports on controller system"
-            netstat -pnatu
-            exit 1
-        else
-
-        COUNT=\$(( \${COUNT} + 1 ))
-        sleep 1
-
-        if [[ \$((\$COUNT % 5)) == 0 ]]; then
-            echo already waited \${COUNT} seconds...
-        fi
-    fi
-    done
-
-else
-    echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
-    for i in {1..36};
-        do sleep 5;
-        grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-        if [ \$? -eq 0 ]
-        then
-          echo "Controller is UP"
-          break
-        fi
-    done;
-
-    # if we ended up not finding ready status in the above loop, we can output some debugs
+echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
+for i in {1..36};
+    do sleep 5;
     grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-    if [ $? -ne 0 ]
+    if [ \$? -eq 0 ]
     then
-        echo "Timeout Controller DOWN"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
+      echo "Controller is UP"
+      break
     fi
+done;
+
+# if we ended up not finding ready status in the above loop, we can output some debugs
+grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+if [ $? -ne 0 ]
+then
+    echo "Timeout Controller DOWN"
+    echo "Dumping first 500K bytes of karaf log..."
+    head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+    echo "Dumping last 500K bytes of karaf log..."
+    tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+    echo "Listing all open ports on controller system"
+    netstat -pnatu
+    exit 1
 fi
 
 echo "Listing all open ports on controller system..."
@@ -363,6 +322,7 @@ pybot -N ${TESTPLAN} \
       -v CONTROLLER_USER:${USER} \
       -v JAVA_HOME:${JAVA_HOME} \
       -v JDKVERSION:${JDKVERSION} \
+      -v JENKINS_WORKSPACE:${WORKSPACE} \
       -v MININET1:${TOOLS_SYSTEM_2_IP} \
       -v MININET2:${TOOLS_SYSTEM_3_IP} \
       -v MININET3:${TOOLS_SYSTEM_4_IP} \
@@ -372,10 +332,12 @@ pybot -N ${TESTPLAN} \
       -v MININET_USER:${USER} \
       -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
       -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
+      -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
       -v ODL_STREAM:${DISTROSTREAM} \
       -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
       -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
       -v ODL_SYSTEM_USER:${USER} \
+      -v TOOLS_SYSTEM_1_IP:${TOOLS_SYSTEM_IP} \
       -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} \
       -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
       -v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} \
index 6a0e9463b27b86896206a96c6ab23ef82f3e7709..06ebf1094f220867e025d8cb4c8878ded6f83e58 100644 (file)
@@ -4,6 +4,8 @@
 # script.
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
 source ${ROBOT_VENV}/bin/activate
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
+
 PYTHON="${ROBOT_VENV}/bin/python"
 SSH="ssh -t -t"
 ADMIN_PASSWORD="admin"
@@ -18,7 +20,9 @@ python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folde
 
 printf "\nshowing recent changes that made it into integration/test used by this job:\n"
 cd ${WORKSPACE}/test
-git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10
+printf "Hash    Author Date                    Commit Date                    Author               Subject"
+printf "------- ------------------------------ ------------------------------ -------------------- -----------------------------"
+git --no-pager log --pretty=format:'%h %<(30)%ad%<(30)%cd %<(20,trunc)%an%d %s' -n20
 cd -
 
 cat << EOF
@@ -111,7 +115,9 @@ function create_etc_hosts() {
 # openstack release
 function install_openstack_clients_in_robot_vm() {
     packages=("python-novaclient" "python-neutronclient" "python-openstackclient")
-    for plugin_name in ${ENABLE_OS_PLUGINS}; do
+    local os_plugins
+    os_plugins=$(csv2ssv "${ENABLE_OS_PLUGINS}")
+    for plugin_name in $os_plugins; do
         if [ "$plugin_name" == "networking-sfc" ]; then
             packages+=("networking-sfc")
         fi
@@ -136,16 +142,6 @@ function install_openstack_clients_in_robot_vm() {
     fi
 }
 
-# convert commas in csv strings to spaces (ssv)
-function csv2ssv() {
-    local csv=$1
-    if [ -n "${csv}" ]; then
-        ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g')
-    fi
-
-    echo "${ssv}"
-} # csv2ssv
-
 function is_openstack_feature_enabled() {
     local feature=$1
     for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES})
@@ -158,14 +154,14 @@ function is_openstack_feature_enabled() {
     echo 0
 }
 
-function fix_libvirt_version_n_cpu_ocata() {
+function fix_libvirt_version_n_cpu_pike() {
     local ip=$1
     ${SSH} ${ip} "
         cd /opt/stack;
         git clone https://git.openstack.org/openstack/requirements;
         cd requirements;
-        git checkout stable/ocata;
-        sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt
+        git checkout stable/pike;
+        sed -i s/libvirt-python===3.5.0/libvirt-python===4.2.0/ upper-constraints.txt
    "
 }
 
@@ -183,10 +179,6 @@ function install_rdo_release() {
           ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
           ;;
 
-       *ocata*)
-          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-ocata/rdo-release-ocata-3.noarch.rpm"
-          ;;
-
        master)
           ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
           ;;
@@ -282,7 +274,6 @@ EOF
     if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
         echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
     fi
-
     IFS=,
     for plugin_name in ${ENABLE_OS_PLUGINS}; do
         if [ "$plugin_name" == "networking-odl" ]; then
@@ -293,7 +284,8 @@ EOF
             ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
             IS_LBAAS_PLUGIN_ENABLED="yes"
         elif [ "$plugin_name" == "networking-sfc" ]; then
-            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
+            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master"
+            IS_SFC_PLUGIN_ENABLED="yes"
         else
             echo "Error: Invalid plugin $plugin_name, unsupported"
             continue
@@ -333,6 +325,9 @@ EOF
         if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
             SERVICE_PLUGINS+=", lbaasv2"
         fi
+        if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then
+            SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin"
+        fi
     fi #check for ODL_ENABLE_L3_FWD
 
     cat >> ${local_conf_file_name} << EOF
@@ -689,6 +684,7 @@ EOF
             ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log
         # Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context
         sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log
+        mv /tmp/odl${i}_exceptions.txt ${NODE_FOLDER}
         rm ${NODE_FOLDER}/odl${i}_karaf.log.tar
         mv *_threads* ${NODE_FOLDER}
         mv ps_* ${NODE_FOLDER}
@@ -798,9 +794,6 @@ EOF
         mkdir -p ${TEMPEST_LOGS_DIR}
         scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
         scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
-        if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "queens" ]; then
-           mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
-        fi
     else
         echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
     fi
@@ -882,12 +875,7 @@ function is_rabbitmq_ready() {
     local -r ip=${1}
     local grepfor="nova_cell1"
     rm -f rabbit.txt
-    if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
-        ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
-        grepfor="pid"
-    else
-        ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
-    fi
+    ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
     grep ${grepfor} rabbit.txt
 }
 
@@ -1074,12 +1062,6 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
        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"
     fi
-    if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then
-        echo "Updating requirements for ${ODL_ML2_BRANCH}"
-        echo "Workaround for https://review.openstack.org/#/c/491032/"
-        echo "Modify upper-constraints to use libvirt-python 3.2.0"
-        fix_libvirt_version_n_cpu_ocata ${!CONTROLIP}
-    fi
     create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
     echo "Install rdo release to avoid incompatible Package versions"
@@ -1131,11 +1113,11 @@ 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"
-    if [ "${ODL_ML2_BRANCH}" == "stable/ocata" ]; then
+    if [ "${ODL_ML2_BRANCH}" == "stable/pike" ]; then
         echo "Updating requirements for ${ODL_ML2_BRANCH}"
-        echo "Workaround for https://review.openstack.org/#/c/491032/"
-        echo "Modify upper-constraints to use libvirt-python 3.2.0"
-        fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP}
+        echo "Workaround for libvirt-python failing installation"
+        echo "Modify upper-constraints to use libvirt-python 4.2.0"
+        fix_libvirt_version_n_cpu_pike ${!COMPUTEIP}
     fi
     create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
@@ -1222,13 +1204,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
 
     echo "sleep for 60s and print hypervisor-list"
     sleep 60
-    # In Ocata if we do not enable the n-cpu in control node then
-    # we need to discover hosts manually and ensure that they are mapped to cells.
-    # reference: https://ask.openstack.org/en/question/102256/how-to-configure-placement-service-for-compute-node-on-ocata/
-    if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
-        scp ${WORKSPACE}/setup_host_cell_mapping.sh  ${!CONTROLIP}:/tmp
-        ${SSH} ${!CONTROLIP} "sudo bash /tmp/setup_host_cell_mapping.sh"
-    fi
     ${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
@@ -1246,12 +1221,14 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         exit 1
     fi
 
-    # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
-    # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
-    # of these libs that are not working for tempest.
-    ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
-    ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
-    ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
+    if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then
+        # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
+        # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
+        # of these libs that are not working for tempest.
+        ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip"
+        ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade"
+        ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade"
+    fi
 
     # Gather Compute IPs for the site
     for j in `seq 1 ${NUM_COMPUTES_PER_SITE}`; do
@@ -1439,6 +1416,7 @@ for suite in ${SUITES}; do
     -v HA_PROXY_2_IP:${HA_PROXY_2_IP} \
     -v HA_PROXY_3_IP:${HA_PROXY_3_IP} \
     -v JDKVERSION:${JDKVERSION} \
+    -v JENKINS_WORKSPACE:${WORKSPACE} \
     -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
     -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
     -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \
index f28711cd8b736bf32b786c9500b0135639842280..542b0dcc1eac95dfd097cf2c68a0ef78328f5cbe 100644 (file)
@@ -8,29 +8,29 @@ 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"
-    # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)"
-    echo "Bundle version is ${BUNDLEVERSION}"
+    # 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}"
     # Acquire the timestamp information from maven-metadata.xml
     NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}"
-    wget "${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml"
+    wget "${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml"
     less "maven-metadata.xml"
     TIMESTAMP="$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)"
     echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
-    ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+    ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
 else
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
     ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"
-    BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
-    BUNDLEFOLDER="${ARTIFACT}-${BUNDLEVERSION}"
+    BUNDLE_VERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
+    BUNDLEFOLDER="${ARTIFACT}-${BUNDLE_VERSION}"
 fi
 
 echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}"
 echo "Distribution bundle is ${BUNDLE}"
-echo "Distribution bundle version is ${BUNDLEVERSION}"
+echo "Distribution bundle version is ${BUNDLE_VERSION}"
 echo "Distribution folder is ${BUNDLEFOLDER}"
 echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 
@@ -38,7 +38,7 @@ echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 cat > "${WORKSPACE}/detect_variables.env" <<EOF
 ACTUAL_BUNDLE_URL=${ACTUAL_BUNDLE_URL}
 BUNDLE=${BUNDLE}
-BUNDLEVERSION=${BUNDLEVERSION}
+BUNDLE_VERSION=${BUNDLE_VERSION}
 BUNDLEFOLDER=${BUNDLEFOLDER}
 NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
 EOF
index 3933b0cd989e42049a612d199baf83f0da891530..366e4f2ec77b0347398df3477240d2b04e3325fb 100644 (file)
@@ -17,7 +17,7 @@
       - string:
           name: KARAF_VERSION
           default: '{karaf-version}'
-          description: 'karaf3 or karaf4, affects ODL deploy scripts'
+          description: 'karaf3, karaf4, odl, affects ODL deploy scripts'
 
 - parameter:
     name: integration-bundle-url
index 90210ebb3527653bd68da5b3566a09f8d1d020ae..93cd0eb99537f42d0dc0843d20915cb8b354d765 100644 (file)
@@ -1,5 +1,7 @@
 
-if [[ "$KARAF_VERSION" == "karaf3" ]]; then
+if [[ "$KARAF_VERSION" == "odl" ]]; then
+    KARAF_ARTIFACT="opendaylight"
+elif [[ "$KARAF_VERSION" == "karaf3" ]]; then
     KARAF_ARTIFACT="distribution-karaf"
 else
     KARAF_ARTIFACT="karaf"
index 4ce0682170e8090514dd09e8a31506b231b22180..8a548b938df0ffd7f8982873f0f36ccf6e6464ed 100644 (file)
@@ -130,15 +130,34 @@ else
 fi
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} \
--v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} -v JAVA_HOME:${JAVA_HOME} \
--v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
--v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
-${odl_variables} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} -v \
-TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} -v TOOLS_SYSTEM_USER:${USER} \
--v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
--v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
-# FIXME: Sort (at least -v) options alphabetically.
+pybot -N ${TESTPLAN} \
+      --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+      -v BUNDLEFOLDER:${BUNDLEFOLDER} \
+      -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
+      -v CONTROLLER:${ODL_SYSTEM_IP} \
+      -v CONTROLLER1:${ODL_SYSTEM_2_IP} \
+      -v CONTROLLER2:${ODL_SYSTEM_3_IP} \
+      -v CONTROLLER_USER:${USER} \
+      -v JAVA_HOME:${JAVA_HOME} \
+      -v JDKVERSION:${JDKVERSION} \
+      -v JENKINS_WORKSPACE:${WORKSPACE} \
+      -v MININET:${TOOLS_SYSTEM_IP} \
+      -v MININET1:${TOOLS_SYSTEM_2_IP} \
+      -v MININET2:${TOOLS_SYSTEM_3_IP} \
+      -v MININET_USER:${USER} \
+      -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
+      -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
+      -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
+      -v ODL_STREAM:${DISTROSTREAM} \
+      -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} ${odl_variables} \
+      -v ODL_SYSTEM_USER:${USER} \
+      -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} \
+      -v TOOLS_SYSTEM_USER:${USER} \
+      -v USER_HOME:${HOME} \
+      -v WORKSPACE:/tmp \
+      ${TESTOPTIONS} ${SUITES} || true
+
+
 
 echo "Examining the files in data/log and checking filesize"
 ssh ${ODL_SYSTEM_1_IP} "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"
index 2a4d96a0c7c7f84cc04d4d685110cba733e4c6b6..74fb386fa2dc30dac9b4680a34da99533b9d0192 100644 (file)
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
     name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
     id: inttest-csit-1node
-    # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
     project-type: freestyle
           controller-scope: '{scope}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           controller-scope: '{scope}'
       - integration-controller-features:
           controller-features: 'odl-jolokia,{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
index e7ac0966e0f582437bbe3c5e1ffb344d1d15db31..26f9cf6cc087c93aa0bb94ba1d7ef83f7cce5e2d 100644 (file)
@@ -3,15 +3,9 @@
     name: integration-test
     project: integration/test
     project-name: integration-test
-    test-branch: master
     jobs:
-      - 'integration-distribution-test-{stream}'
-      - 'integration-sanity-test-{stream}'
       - 'integration-patch-test-{stream}'
       - 'integration-multipatch-test-{stream}'
-      - 'integration-distribution-weekly-test-trigger-{stream}'
-      - 'integration-distribution-high-frequency-test-trigger-{stream}'
-      - 'integration-update-csit-tests-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: integration/test
           branch: master
           stream: master
 
+    # CSIT Lists in releng-defaults.yaml
+    stream:
+      - fluorine:
+          branch: 'master'
+          mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-fluorine.lst
+          build-order: >
+              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
+              lispflowmapping openflowplugin coe genius sfc netvirt
+
+      - oxygen:
+          branch: 'stable/oxygen'
+          mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-oxygen.lst
+          build-order: >
+              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
+              lispflowmapping openflowplugin coe genius sfc netvirt
+
+- project:
+    name: integration-distribution
+    project: integration/test
+    project-name: integration-test
+    jobs:
+      - 'integration-distribution-test-{stream}'
+      - 'integration-distribution-weekly-test-trigger-{stream}'
+      - 'integration-distribution-high-frequency-test-trigger-{stream}'
+      - 'integration-update-csit-tests-{stream}'
+
     # CSIT Lists in releng-defaults.yaml
     stream:
       - fluorine:
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
               sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-fluorine.lst
-          csit-sanity-list: '{csit-sanity-list-fluorine}'
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
-          mvn-version: 'mvn35'
       - oxygen:
           branch: 'stable/oxygen'
           csit-blacklist: >
               capwap centinel coe didm iotdm jsonrpc lacp messaging4transport netide nic
               ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-oxygen.lst
-          csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
-          mvn-version: 'mvn35'
 
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          csit-blacklist: capwap centinel coe didm iotdm jsonrpc lacp netide tsdr gate longevity sanity tdd wip
-          csit-list: !include: csit-jobs-nitrogen.lst
-          csit-sanity-list: '{csit-sanity-list-nitrogen}'
-          csit-weekly-list: '{csit-weekly-list-nitrogen}'
-          csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-          mvn-version: 'mvn35'
-
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          csit-blacklist: capwap centinel coe jsonrpc gate longevity sanity tdd wip
-          csit-list: !include: csit-jobs-carbon.lst
-          csit-sanity-list: '{csit-sanity-list-carbon}'
-          csit-weekly-list: '{csit-weekly-list-carbon}'
-          csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
-          mvn-version: 'mvn35'
-
-    # tools system image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+- project:
+    name: integration-sanity
+    project: integration/test
+    project-name: integration-test
+    jobs:
+      - 'integration-sanity-test-{stream}'
 
-# Template: integration-distribution-test-{stream}
-# Goal: Verify a distribution through all system test available
-# Operation: This template takes a distribution and passes all available system test
+    stream:
+      - fluorine:
+          branch: 'master'
+          karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-fluorine}'
+      - oxygen:
+          branch: 'stable/oxygen'
+          karaf-version: karaf4
+          csit-sanity-list: '{csit-sanity-list-oxygen}'
 
 - job-template:
     name: 'integration-distribution-test-{stream}'
+    # Goal: Verify a distribution through all system test available
+    # Operation: This template takes a distribution and passes all available system test
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-disttest-2c-1g
 
     properties:
       - opendaylight-infra-properties:
           email-prefix: '[integration]'
       - lf-infra-publish
 
-# Template: integration-sanity-test-{stream}
-# Goal: Verify a distribution through sanity test
-# Operation: This template takes a distribution and passes sanity test
-
 - job-template:
     name: 'integration-sanity-test-{stream}'
+    # Goal: Verify a distribution through sanity test
+    # Operation: This template takes a distribution and passes sanity test
+    # This jobs works for both managed & unmanaged distro.
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
 
+    triggers:
+      - timed: '{schedule-daily}'
+
     builders:
       - trigger-builds:
           - project: '{csit-sanity-list}'
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
 
-# Template: integration-patch-test-{stream}
-# Goal: Build a patch and run all available system test on a distribution containing the change
-# Operation: This job template builds a patch, creates a distribution containing the patch, and
-# triggers the distribution test when test-integration is used in gerrit comments
-
 - job-template:
     name: 'integration-patch-test-{stream}'
+    # Template: integration-patch-test-{stream}
+    # Goal: Build a patch and run all available system test on a distribution containing the change
+    # Operation: This job template builds a patch, creates a distribution containing the patch, and
+    # triggers the distribution test when test-integration is used in gerrit comments
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     # (if not all) available CSIT jobs.
 
     project-type: freestyle
-    node: centos7-builder-4c-4g
+    node: centos7-builder-8c-8g
+    concurrent: true
     jdk: '{java-version}'
 
     properties:
     parameters:
       - patches-to-build-parameter:
           patches_to_build: '$PATCHES_TO_BUILD'
+      - build-order-parameter:
+          build-order: '{build-order}'
+      - build-fast-parameter:
+          build-fast: 'false'
       - run-test-parameter:
           run-test: 'false'
       - integration-distribution-branch:
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: mvn35
+      - lf-infra-maven-parameters:
+          mvn-opts: ''
+          mvn-params: ''
+          mvn-version: mvn35
+          staging-profile-id: ''  # Staging repos do not make sense for this job
 
     wrappers:
       - opendaylight-infra-wrappers:
           server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'multipatch-build:'
+                comment-contains-value: 'multipatch-build'
           projects:
             - project-compare-type: ANT
               project-pattern: '**'
           dist-pom: patch_tester/distribution/pom.xml
       - conditional-step:
           condition-kind: boolean-expression
-          condition-expression: $RUNTEST
+          condition-expression: $RUN_TEST
           steps:
             - trigger-builds:
                 - project: '{csit-list}'
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
       - shell: |
           git status
           git add jjb/integration/*.lst
-      - opendaylight-infra-push-gerrit-patch:
-          project: "releng/builder"
-          gerrit-topic: "auto-update-csit-jobs-{stream}"
-          gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}"
+      - lf-infra-push-gerrit-patch:
+          project: 'releng/builder'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
+          gerrit-topic: 'auto-update-csit-jobs-{stream}'
+          gerrit-commit-message: 'Auto Update CSIT Jobs to run for {stream}'
+          reviewers-email: 'integration-dev@lists.opendaylight.org'
 
     publishers:
       - lf-infra-publish
index e9e2bdf828c28cf9075947fde2c66a9a83e2e17d..073db0ebdc0baa10fb20f25ea28d4fc048138e77 100644 (file)
@@ -2,16 +2,17 @@
 set -xeu -o pipefail
 
 BUNDLE_VERSION=$(xpath "${BUNDLE_POM}" '/project/version/text()' 2> /dev/null)
-BUNDLE="${KARAF_ARTIFACT}-${BUNDLE_VERSION}.zip"
-BUNDLE_FILEPATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}"
-ls -l "${BUNDLE_FILEPATH}"
+BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
+BUNDLE="${BUNDLEFOLDER}.zip"
+BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}"
+ls -l "${BUNDLE_PATH}"
 LOG_FILE='integration-upload-distribution.log'
 echo "Uploading distribution to Nexus..."
 "$MVN" deploy:deploy-file \
     --log-file ${LOG_FILE} \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
-    -Dfile="${BUNDLE_FILEPATH}" \
+    -Dfile="${BUNDLE_PATH}" \
     -DrepositoryId=opendaylight-snapshot \
     -Durl="$ODLNEXUSPROXY/content/repositories/opendaylight.snapshot/" \
     -DgroupId="org.opendaylight.integration.${GERRIT_PROJECT//\//.}" \
@@ -22,10 +23,14 @@ echo "Uploading distribution to Nexus..."
 
 cat "${LOG_FILE}"
 
-BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $3}') || true
+BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $5}') || true
 echo "Bundle uploaded to ${BUNDLE_URL}"
 
 # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus
 cat > "${WORKSPACE}/integration-upload-distribution.env" <<EOF
 BUNDLE_URL=${BUNDLE_URL}
+BUNDLE_VERSION=${BUNDLE_VERSION}
+BUNDLEFOLDER=${BUNDLEFOLDER}
+BUNDLE=${BUNDLE}
+BUNDLE_PATH=${BUNDLE_PATH}
 EOF
old mode 100644 (file)
new mode 100755 (executable)
index ce0fcb4..b136eda
@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -e
+
 # TODO: 1) clean up inline todo's below :)
 # TODO: 2) Use just a topic branch to create a distribution.  see this email:
 #          https://lists.opendaylight.org/pipermail/discuss/2015-December/006040.html
@@ -18,7 +22,7 @@ MAVEN_OPTIONS="$(echo --show-version \
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
-cd $BUILD_DIR || exit 1
+cd $BUILD_DIR
 
 # Set up git committer name and email, needed for commit creation when cherry-picking.
 export EMAIL="sandbox@jenkins.opendaylight.org"
@@ -29,12 +33,64 @@ export GIT_COMMITTER_NAME="Multipatch Job"
 #
 # multipatch-build:openflowplugin:45/69445/1,genius:46/69446/1,netvirt:47/69447/1
 if [ -n "$GERRIT_EVENT_COMMENT_TEXT" ]; then
-    # Grep the multipatch-build: line and then strip from the beginning to the :
-    PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'multipatch-build:')
+    if [[ "$GERRIT_EVENT_COMMENT_TEXT" == *fast* ]]; then
+        BUILD_FAST="true"
+        PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'multipatch-build-fast:')
+    else
+        BUILD_FAST="false"
+        PATCHES_TO_BUILD=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'multipatch-build:')
+    fi
     PATCHES_TO_BUILD=${PATCHES_TO_BUILD#*:}
 fi
+if ${BUILD_FAST}; then
+    fast_option="-Pq"
+else
+    fast_option=""
+fi
+# check if topic exists, e.g. topic=binding-tlc-rpc
+if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
+    TOPIC="${PATCHES_TO_BUILD#*=}"
+    echo "Create topic ${TOPIC} patch list"
+    PATCHES_TO_BUILD=""
+    read -ra PROJECT_LIST <<< "${BUILD_ORDER}"
+    for PROJECT in "${PROJECT_LIST[@]}"; do
+        # get all patches number for a topic for a given project
+        IFS=$'\n' read -rd '' -a GERRIT_PATCH_LIST <<< "$(ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query status:open topic:${TOPIC} project:${PROJECT} \
+        | grep 'number:' | awk '{{ print $2 }}')" || true
+        echo "Add ${PROJECT}:${GERRIT_PATCH_LIST[*]}"
+        # add project if it is the first with patches or it is not the first
+        if [[ -z "${PATCHES_TO_BUILD}" && ! -z "${GERRIT_PATCH_LIST[*]}" ]]; then
+            PATCHES_TO_BUILD="${PROJECT}"
+        elif [[ ! -z "${PATCHES_TO_BUILD}" ]]; then
+            PATCHES_TO_BUILD="${PATCHES_TO_BUILD},${PROJECT}"
+        fi
+        # sort project patches
+        if [[ ! -z "${GERRIT_PATCH_LIST[*]}" ]]; then
+            REF_LIST=()
+            # create reference list with patch number-refspec
+            for PATCH in "${GERRIT_PATCH_LIST[@]}"; do
+                REFSPEC=$(ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query change:${PATCH} --current-patch-set \
+                | grep 'ref:' | awk '{{ print $2 }}')
+                REF_LIST+=("${PATCH}-${REFSPEC/refs\/changes\/}")
+            done
+            # sort reference list by patch number
+            IFS=$'\n' SORT_REF=$(sort <<<"${REF_LIST[*]}") && unset IFS
+            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/*-/}"
+            done
+        fi
+    done
+fi
+
+echo "Patches to build: ${PATCHES_TO_BUILD}"
 IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 
+# First phase: clone the necessary repos and set the patches up
+
+declare -a PROJECTS
+
 # For each patch:
 # * Clone the project.
 # * Optionally, checkout a specific (typically unmerged) Gerrit patch. If none,
@@ -66,9 +122,10 @@ do
         distribution_status="included"
     fi
     PROJECT_SHORTNAME="${PROJECT##*/}"  # http://stackoverflow.com/a/3162500
+    PROJECTS+=("${PROJECT_SHORTNAME}")
     echo "cloning project ${PROJECT}"
     git clone "https://git.opendaylight.org/gerrit/p/${PROJECT}"
-    cd ${PROJECT_SHORTNAME} || exit 1
+    cd ${PROJECT_SHORTNAME}
     if [ "$(echo -n ${proto_patch} | tail -c 1)" == 'r' ]; then
         pure_patch="$(echo -n $proto_patch | head -c -1)"
     else
@@ -98,31 +155,42 @@ do
         # Here 'r' means release. Useful for testing Nitrogen Odlparent changes.
         find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
     fi
-    # Build project
-    "$MVN" clean install \
-    -e -Pq \
-    -Dstream=oxygen \
-    -Dgitid.skip=false \
-    -Dmaven.gitcommitid.skip=false \
-    --global-settings "$GLOBAL_SETTINGS_FILE" \
-    --settings "$SETTINGS_FILE" \
-    $MAVEN_OPTIONS
-    cd "${BUILD_DIR}" || exit 1
+    cd "${BUILD_DIR}"
 done
 
 if [ "${distribution_status}" == "not_included" ]; then
     echo "adding integration/distribution"
+    PROJECTS+=(distribution)
     # clone distribution and add it as a module in root pom
     git clone "https://git.opendaylight.org/gerrit/p/integration/distribution"
-    cd distribution || exit 1
+    cd distribution
     git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
+    cd "${BUILD_DIR}"
+fi
+
+# Second phase: build everything
+
+for PROJECT_SHORTNAME in "${PROJECTS[@]}"; do
+    pushd "${PROJECT_SHORTNAME}"
     # Build project
     "$MVN" clean install \
-    -e -Pq \
+    -e ${fast_option} \
     -Dstream="$DISTROSTREAM" \
+    -Dgitid.skip=false \
+    -Dmaven.gitcommitid.skip=false \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     $MAVEN_OPTIONS
-    cd "${BUILD_DIR}" || exit 1
-fi
+    # Since we've installed the artifacts, we can clean the build and save
+    # disk space
+    "$MVN" clean \
+    -e ${fast_option} \
+    -Dstream="$DISTROSTREAM" \
+    -Dgitid.skip=false \
+    -Dmaven.gitcommitid.skip=false \
+    --global-settings "$GLOBAL_SETTINGS_FILE" \
+    --settings "$SETTINGS_FILE" \
+    $MAVEN_OPTIONS
+    popd
+done
 
index fcbaa7eef52a4e0c21905f8650657f7d33f1c921..faac19f1eee7238132133e9159cfc8fe7a667425 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 7ebc16da4c9f0e966c549dec3cdf173a9406a092..fd58902819db0203602a16f910e6e54b55f07335 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: iotdm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96fd6e9453970
 
-- project:
-    name: iotdm-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96fd6e9453970
-
-- project:
-    name: iotdm-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96fd6e9453970
-
 - project:
     name: iotdm-sonar
     jobs:
index 5612eab04da57355a85b8f5e5637c380eae1fc5f..49f1336b668df0a31972acc4914ca9680a59092e 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          karaf-version: karaf3
-          # yamllint disable-line rule:line-length
-          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          # yamllint disable-line rule:line-length
-          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip'
-
 
     install:
       - only:
index 1eaa52fb678d2a5cdf5459177da435b4aa6fb280..4b0311c705e2044a3197e8efc3fe2e7f03d3ee2b 100644 (file)
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
-- project:
-    name: jsonrpc-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
 - project:
     name: jsonrpc-sonar
     jobs:
index 63be624c0097db7ffe7e0a597fa62b8345630ef2..5b7bd6afc08e9d5bfca702d7d451cffc90357534 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index f5657336913f6ed019f6b5e1083a5d798c6b36d5..615aee50e6c43633bac02b7d170200a02889efc6 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 54fb5958c1085a387fddc75018103305167bb5e5..52756aa828f01e59293d5220a9c4036c774cee09 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index fd3e64984569a54c09f736cfcdc2fce44c8f9c7f..d579e9f51ba3f92db5009dcf4ff62353a1fa6f8a 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - all:
index e2955c1019f0da4693fa73af00f9fa2607c565fb..ab0fc666c97f585c050c179cb3b784301a3f1a74 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: l2switch-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
-- project:
-    name: l2switch-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
-- project:
-    name: l2switch-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
 - project:
     name: l2switch-sonar
     jobs:
index 1cf3cabbd4f3fa54964ad8d4e51fc6004bf92840..4996065d7c94eff2b11ffccf547662f140083622 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index c089d6123237479e1a01b2e15d9f561c0f6e4426..cdeed106f7d379aa7c5032ebb09d929ad00528f5 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: lacp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
 
-- project:
-    name: lacp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96ff6c0ff6ab1
-
-- project:
-    name: lacp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96ff6c0ff6ab1
-
 - project:
     name: lacp-sonar
     jobs:
index d373f1327717672927247b617c168cf85b1839c4..1472f1d1b8778446bedd627c9dd24abf08297746 100644 (file)
 - project:
     name: lf-infra-common-packer
     jobs:
+      - '{project-name}-rtd-jobs'
       - gerrit-tox-verify
 
     project-name: lf-infra-common-packer
     project: releng/common-packer
     build-node: centos7-builder-2c-8g
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-common-packer/38930/
+    rtd-token: 0cdf727cc22f8f888ffec0e69f46d89031018776
     stream: any
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
 
-- project:
-    name: lf-infra-lf-ansible
-    jobs:
-      - gerrit-tox-verify
-
-    project-name: lf-infra-lf-ansible
-    project: releng/lf-ansible
-    project-pattern: releng/lf-ansible
-    build-node: centos7-docker-2c-8g
-    build-timeout: 60
-    stream: any
-    branch: '*'
-
-    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
-
 - project:
     name: lf-infra-lftools
     jobs:
diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml
new file mode 100644 (file)
index 0000000..d43a067
--- /dev/null
@@ -0,0 +1,19 @@
+---
+- project:
+    name: lf-infra-lfn-process
+    jobs:
+      - '{project-name}-rtd-jobs'
+      - gerrit-tox-verify
+
+    project-name: lf-infra-lfn-process
+    project: lfn/process
+    project-pattern: lfn/process
+    build-node: centos7-builder-2c-1g
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lfn-process/33719/
+    rtd-token: e505b4ae2bf222dcd2b6b08d7b04384ac0459b19
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+
index fb0a4f21b21dd1bec866e2cb056117a59e633355..3ed9a65064bf09d82557ea38f2124dbeb5e0dbae 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index e9a27a52a02908e2c60efa21b82a9401412cf4bb..85662fa097cda07cbe0d466bfc259a5c15eb7a82 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index d3fc860f95a0d0cf8a9743b3799b39e643718f75..a14c7ffc8fec72427f6e5a5c303b2f18b65af5e9 100644 (file)
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: >
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
-- project:
-    name: lispflowmapping-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
 - project:
     name: lispflowmapping-sonar
     jobs:
index 6a6cb9b2ef5bdba66c05916b4bd8abe3515fbf1e..70cebc427a5d6a4b66231ee00a6fd57f356c762d 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
 
     install:
       - only:
diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml
new file mode 100644 (file)
index 0000000..136bd49
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: mdsal-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'mdsal'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index dd0a04631e5f205ec79094e35f8bd74f4189bb8e..2f9a39a92e283e9fe73a6aedba1ec320d243bd61 100644 (file)
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
-- project:
-    name: mdsal-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-8c-8g
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
-- project:
-    name: mdsal-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-8c-8g
-    karaf-version: karaf3
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
 - project:
     name: mdsal-sonar
     jobs:
index c6afc49a0d87f7e560c37a4e75b30ce2744c775e..3c620626f5aca03ad20b3f8464304cb900db2a25 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index b27a82795bc1e8cc8f233b95247b749cbe6bbb12..f1cc04467fe9e61b91b043f3c796f3bad8dafc7d 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: messaging4transport-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     # Used by the release job
     staging-profile-id: a677283157db4
 
-- project:
-    name: messaging4transport-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'messaging4transport-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[messaging4transport]'
-
-    # Used by the release job
-    staging-profile-id: a677283157db4
-
-- project:
-    name: messaging4transport-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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:
diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml
deleted file mode 100644 (file)
index cf27001..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: natapp-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'natapp'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf, odl-natapp'
-
-    # Robot custom options
-    robot-options: ''
index 5bffab7480d0849e7014a99e2589fc62631d4f66..f42bc0c8a1dcb255eb2539a09f00b47056aa5fab 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: natapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
 
-- project:
-    name: natapp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a679c0f4f08a8
-
-- project:
-    name: natapp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a679c0f4f08a8
-
 - project:
     name: natapp-sonar
     jobs:
index 8ffa8fd78ff6248e0fef3342b0281e2789b6178a..e856c23bc968b8ae789c4f342d7b7d0c56d00355 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 49d944258f209364dd48b6d9a84811610cf8388e..97c35cdbe55a06440c55f7cc900999477b6dc530 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: nemo-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
-- project:
-    name: nemo-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[nemo]'
-
-    # Used by the release job
-    staging-profile-id: a67a9890f6202
-
-- project:
-    name: nemo-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[nemo]'
-
-    # Used by the release job
-    staging-profile-id: a67a9890f6202
-
 - project:
     name: nemo-sonar
     jobs:
index 1227599900e0a2755da7bed96a29fd972622bb3b..e107549d24855354edeaa2a24102c981726580b3 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 9b992e5760cdd4e3ac0353364ab82d619916336d..35393c283ec5a1c8d53adaef248536e7d3f16bd8 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1cc6053f4174ccd514ca52276d9f1f864e47b1e5..0deef710b81d9bff5fb259e1f93e5ad17044c318 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 9579718bcfa8dfa8f8fc738901bc73de1e060833..0a400d422b6b56c1579331f949f4f749d4ed39cb 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index c64b959d0c5f02078fcbc8b8c98a5d45b2b82733..3834975a3cf20c9bdfa6698b366063ea9532e47b 100644 (file)
@@ -4,23 +4,30 @@
     jobs:
       - inttest-patch-test
 
-    # The project name
     project: 'netconf'
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
+          os-branch: 'queens'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          os-branch: 'queens'
 
     feature:
       - core:
           csit-list: >
                 netconf-csit-1node-gate-userfeatures-all-{stream},
                 netconf-csit-1node-gate-callhome-only-{stream}
+
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index b736bc20a33480c5c9f977417900cd0b90c54604..7c63b90f2710bedda099e907c7d9b2564a76d62e 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 90f8760655ec93fdf2cea04b0859df52b5b740c4..9b6af63a8b3a509f1621c33f0fba18695dcbdf9b 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 5e5054050696ab99aca8ba30262b54208c2915d8..67246a2fddd4d280e9ade05a0288b0393a008aaf 100644 (file)
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
-- project:
-    name: netconf-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
 - project:
     name: netconf-sonar
     jobs:
index c45a2ca2a87de3cd996504733c8c7e08d4970196..7677a6596a1889ff82e925624fdcb1ca74d0831e 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 732afd3c1c5b44f700b1e917dba04bc976c1aad3..8fbfacff1c6f9ee15c814ffd510f0d5e5e5ae597 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: netide-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a67bab3755815
 
-- project:
-    name: netide-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a67bab3755815
-
-- project:
-    name: netide-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a67bab3755815
-
 - project:
     name: netide-sonar
     jobs:
index ad9aefa2c9968dd6c8bb2827e60fa1632f366763..86cf45cc6f52daa7c682883fe56a599e9248139c 100644 (file)
 
     topology:
       - 1node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     topology:
       - 1node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
-    jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'nitrogen'
-    branch: 'stable/nitrogen'
-    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-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # 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: 1
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 1
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    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_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-carbon
-    jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'carbon'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # 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: 1
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 1
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - gate-stateful
-
-    openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - 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}'
index 8ae71e49b1d3811f5c702389b7ae2463f3759849..b88655e37be0fae96531584d07699d25a930fe5d 100644 (file)
@@ -81,6 +81,7 @@
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-- project:
-    name: netvirt-csit-openstack-integration-nitrogen
-    jobs:
-      - inttest-csit-openstack
-
-    project: 'netvirt'
-    stream: 'nitrogen'
-    branch: 'stable/nitrogen'
-    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-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-stateful
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-
-    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_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-
-- project:
-    name: netvirt-csit-openstack-integration-carbon
-    jobs:
-      - inttest-csit-openstack
-
-    project: 'netvirt'
-    stream: 'carbon'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '@daily'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '@daily'
-      - gate-stateful
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-
-    openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - 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}'
-
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
           testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - oxygen:
+          branch: 'stable/oxygen'
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           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}'
index bb4852f00fe9e2c15e731ef1213654d9ffd1275a..9b8698c7a3cdcb7701809ca8a798d6542864b37f 100644 (file)
@@ -9,11 +9,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
index 73b3adb169d08726512b4bf6a1a4e8e9312fbee4..d9369a1096f1a5b808cb701a5a153e91b72868bb 100644 (file)
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
index 8a00e9b51ce6b8fc70c17bc2c57f17689cb82381..4024faed806d113522fdbcea97c20b8b63f81493 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+
     project: 'netvirt'
     project-name: 'netvirt'
     mvn-settings: 'netvirt-settings'
diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
new file mode 100644 (file)
index 0000000..ec10ee5
--- /dev/null
@@ -0,0 +1,22 @@
+---
+- project:
+    name: neutron-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'neutron'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
index 766bd81c7ce2459e277a6572619e1253efb89013..48bd2756b3409ee45db5694df9ed7bfd748ee476 100644 (file)
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/nitrogen'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
-- project:
-    name: neutron-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs:
index b160dc6d3623499cd2966fdbaf70d29ba6878162..86b6a16d8a687e33323a137f57a70c30adf7b8f0 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: next-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a67e7c516f385
 
-- project:
-    name: next-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-
-    # Used by the release job
-    staging-profile-id: a67e7c516f385
-
-- project:
-    name: next-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-
-    # Used by the release job
-    staging-profile-id: a67e7c516f385
-
 - project:
     name: next-sonar
     jobs:
diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
deleted file mode 100644 (file)
index 6d21673..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- project:
-    name: nic-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'nic'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-nic-intent-common'
-
-    # Robot custom options
-    robot-options: ''
index bf200779bc98a87860e09ecf472cf05540f1e5c1..8bf2afef336f56828e2b6a716fa88125e5ff5b6f 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: nic-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a67ef386204aa
 
-- project:
-    name: nic-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
-- project:
-    name: nic-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
 - project:
     name: nic-sonar
     jobs:
diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
deleted file mode 100644 (file)
index 142e659..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- project:
-    name: ocpplugin-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'ocpplugin'
-
-    # The functionality under test
-    functionality: 'get'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
deleted file mode 100644 (file)
index a7c7c56..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- project:
-    name: ocpplugin-csit-scalability
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'ocpplugin'
-
-    # The functionality under test
-    functionality: 'scalability'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all'
-
-    # Robot custom options
-    robot-options: ''
index f9e55c810e20df10dc2c535d6853573105b896b6..496e31ec7e2b14fcb1fec297ca721dc83bbefe2f 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: ocpplugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a687673279f9c
 
-- project:
-    name: ocpplugin-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a687673279f9c
-
-- project:
-    name: ocpplugin-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a687673279f9c
-
 - project:
     name: ocpplugin-sonar
     jobs:
index db639d1a4dca5e3b7e13b209dd7a1bd4895c592f..01e420dde66d9d30d6a91fa87ed01ffa8fc4891a 100644 (file)
@@ -11,6 +11,6 @@
 # Removes openstack images older than 30 days in the cloud
 echo "---> Cleanup old images"
 
-# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-source "/tmp/v/lftools/bin/activate"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
 lftools openstack --os-cloud vex image cleanup --days=30
index 1b7f0c68e47389c6ab0d7cd2f2d63f12bf48b0f2..c3c6b35a24e23c25b85e77ff60dd2851ee8d2dc1 100644 (file)
@@ -50,15 +50,10 @@ source "/tmp/v/openstack/bin/activate"
 # shellcheck disable=SC2207
 mapfile -t OS_SERVERS < <(openstack server list -f value -c "Name" | grep -E 'prd|snd')
 
-deactivate
-
 #############################
 ## DELETE ORPHANED SERVERS ##
 #############################
 
-# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-source "/tmp/v/lftools/bin/activate"
-
 # Search for servers that are not in use by either releng or sandbox silos and
 # delete them.
 for server in "${OS_SERVERS[@]}"; do
index ddd104180613badd389c4da532de706874a6da05..f9af3c8e168918ceec06153f9bc65551ec6ca2a4 100644 (file)
 ##############################################################################
 echo "---> Cleanup stale nodes"
 
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
+
 # Todo: As a safe check we could obtain the list of active jobs from Jenkins and
 # compute the checksum from $JOB_NAME to check if any active nodes exist and
 # skip deleting those nodes. This step may not be required since there is already
 # 24H timeout in place for all jobs therefore all jobs are expected to complete
 # within the timeout.
 
-# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-source "/tmp/v/lftools/bin/activate"
 lftools openstack --os-cloud vex server list --days=1
 lftools openstack --os-cloud vex server cleanup --days=1
index 09f7a5257fbcdd59eedcfc6efc88187c687097ad..433aecf2cc45aeb33d47e2005160d2f1544b1f83 100644 (file)
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 mapfile -t os_volumes < <(openstack volume list -f value -c ID --status Available)
-deactivate
 
-# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
-source "/tmp/v/lftools/bin/activate"
 echo "---> Orphaned volumes"
 if [ ${#os_volumes[@]} -eq 0 ]; then
     echo "No orphaned volumes found."
@@ -26,4 +23,5 @@ else
         lftools openstack --os-cloud vex volume remove --minutes 15 "$volume"
     done
 fi
+
 deactivate
index 0fb1b199e1e9930c7de41c5ade3f91069e67577c..776b2b8581b2f4473ac90538f56eb3a57c245ff2 100644 (file)
@@ -15,5 +15,5 @@ virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 pip install --upgrade "pip<10.0.0" setuptools
-pip install --upgrade python-openstackclient python-heatclient
+pip install --upgrade lftools lftools[openstack] python-openstackclient python-heatclient
 pip freeze
diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml
new file mode 100644 (file)
index 0000000..72c78e9
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: odlparent-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'odlparent'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 24da0238326a059a50b5c16bbb1d5da260b7563a..6b87b0719cc3eafeb0cbdcacfccc137897e07449 100644 (file)
@@ -30,7 +30,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.1.x
+    name: odlparent-3.2.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -38,8 +38,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.x
+    stream: 3.2.x
+    branch: 3.2.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
@@ -60,7 +60,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.0.x
+    name: odlparent-3.1.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -68,8 +68,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.0.x
-    branch: 3.0.x
+    stream: 3.1.x
+    branch: 3.1.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
@@ -90,7 +90,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-2.0.x
+    name: odlparent-3.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -98,8 +98,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 2.0.x
-    branch: 2.0.x
+    stream: 3.0.x
+    branch: 3.0.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
     javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
-- project:
-    name: odlparent-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - gerrit-tox-verify
-
-    stream: carbon
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'odlparent-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
-    staging-profile-id: 880d5ac25eaa
-
 - project:
     name: odlparent-sonar
     jobs:
index a614b79684c0b88e56e4ba160ba3bfd7a6f590cb..5af38839360fd11953c29e576003843441fb4ea7 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index c7a309ad8e9e4db2986732970f528c30b095e3ff..b9366d2c9ea2324858602dfcd020c2ded6aa6e32 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: of-config-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a6880455efe67
 
-- project:
-    name: of-config-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: netconf-merge-{stream}'
-    email-upstream: '[of-config] [netconf]'
-
-    # Used by the release job
-    staging-profile-id: a6880455efe67
-
-- project:
-    name: of-config-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: netconf-merge-{stream}'
-    email-upstream: '[of-config] [netconf]'
-
-    # Used by the release job
-    staging-profile-id: a6880455efe67
-
 - project:
     name: of-config-sonar
     jobs:
index 2cdba404694c2c9a8605b46ab533ed627ce6f26e..4198831a93a588c4e330cce3bcbf7878fd46af66 100644 (file)
     # Used by the release job
     staging-profile-id: a68970cf5b25c
 
-- project:
-    name: circuitsw-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[circuitsw]'
-
-    # Used by the release job
-    staging-profile-id: a68970cf5b25c
-
-- project:
-    name: circuitsw-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/carbon'
-    mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[circuitsw]'
-
-    # Used by the release job
-    staging-profile-id: a68970cf5b25c
-
 - project:
     name: circuitsw-sonar
     jobs:
diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh
new file mode 100755 (executable)
index 0000000..3a4c8af
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 Ericsson AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# This script creates ArtifactPublishedEvent (APE)
+# The JMS Messaging Plugin doesn't handle the newlines well so the eventBody is
+# constructed on a single line. This is something that needs to be fixed properly
+
+cat << EOF > $WORKSPACE/event.properties
+type=$PUBLISH_EVENT_TYPE
+origin=$PUBLISH_EVENT_ORIGIN
+eventBody="{ 'type': '$PUBLISH_EVENT_TYPE', 'id': '$(uuidgen)', \
+'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$PUBLISH_EVENT_ORIGIN', \
+'buildUrl': '$BUILD_URL', 'branch': 'master', 'artifactLocation': '$ARTIFACT_LOCATION', \
+'confidenceLevel': { $CONFIDENCE_LEVEL } }"
+EOF
+echo "Constructed $PUBLISH_EVENT_TYPE"
+echo "--------------------------------------------"
+cat $WORKSPACE/event.properties
+echo "--------------------------------------------"
diff --git a/jjb/openci/openci-odl-daily-jobs.yaml b/jjb/openci/openci-odl-daily-jobs.yaml
new file mode 100644 (file)
index 0000000..1ef00f0
--- /dev/null
@@ -0,0 +1,103 @@
+---
+- project:
+    name: openci-odl
+
+    project: '{name}'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+
+    jobs:
+      - 'openci-odl-autorelease-daily-{stream}'
+      - 'openci-odl-promote-daily-{stream}'
+
+# This job gets triggered manually for the demo purposes.
+#
+# In prototype, either what this job does needs to be integrated to
+# ODL autorelease job or triggered by the upstream autorelease job.
+- job-template:
+    name: 'openci-odl-autorelease-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    build-node: centos7-builder-2c-2g
+
+    parameters:
+      - string:
+          name: PUBLISH_EVENT_TYPE
+          default: ArtifactPublishedEvent
+          description: 'The type of the event this job publishes'
+      - string:
+          name: PUBLISH_EVENT_ORIGIN
+          default: ODL
+          description: 'Originating community'
+      - string:
+          name: ARTIFACT_LOCATION
+          default: https://url/to/artifact/on/odl/nexus/$BUILD_NUMBER
+          description: 'The location of the artifact on ODL Nexus'
+      - string:
+          name: CONFIDENCE_LEVEL
+          default: "'autorelease': 'SUCCESS'"
+          description: 'The confidence level the published artifact gained'
+
+    builders:
+      # first build step in the job executes create-ape.sh to construct the
+      # ArtifactPublishedEvent (ape)
+      - shell:
+          !include-raw-escape: ./create-ape.sh
+      # constructed event gets injected into environment so JME Messaging
+      # plugin can publish the event and its properties in post-build step
+      - inject:
+          properties-file: "$WORKSPACE/event.properties"
+
+    publishers:
+      - jms-messaging:
+          provider-name: openci.activemq
+          msg-type: Custom
+          msg-props: |
+            type=$type
+            origin=$origin
+          msg-content:
+            $eventBody
+
+# This job gets triggered by a ConfidenceLevelModifiedEvent published
+# by OPNFV jobs so ODL can promote the autorelease artifact even further.
+#
+# This job is created for the demo purposes and might not be there for
+# the prototype.
+- job-template:
+    name: 'openci-odl-promote-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    build-node: centos7-builder-2c-2g
+
+    triggers:
+      - jms-messaging:
+          provider-name: openci.activemq
+          selector: CI_TYPE = 'custom'
+          checks:
+            - field: origin
+              expected-value: 'OPNFV'
+            - field: type
+              expected-value: 'ConfidenceLevelModifiedEvent'
+            - field: scenario
+              expected-value: 'os-odl-nofeature'
+
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          echo
+          echo "Triggered by $type"
+          echo "----------------------------------"
+          echo $CI_MESSAGE
+          echo "----------------------------------"
+          echo " Promoted ODL Autorelease artifact as release candidate!"
index 381f9bec3f6a981992609e3d8d8f9359290a72b9..af5d2fa13ed7e5bc1034242eb184af610d349717 100644 (file)
@@ -13,7 +13,9 @@ virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 pip install --upgrade "pip<10.0.0" setuptools
-pip install --upgrade python-openstackclient python-heatclient
+# hardcoding cmd2 version as the most recent version seems to be broken.
+# reference: https://pypi.org/project/cmd2/#history
+pip install --upgrade cmd2==0.8.5 python-openstackclient python-heatclient
 pip freeze
 
 cd /builder/openstack-hot || exit 1
index a6c61b25101394cdc99817dba28a3e264f62e054..1122dbd609e4dc9c78ad7ac799e39e4aa4adaf45 100644 (file)
@@ -13,7 +13,7 @@ virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 pip install --upgrade --quiet "pip<10.0.0" setuptools
-pip install --upgrade --quiet python-openstackclient python-heatclient
+pip install --upgrade --quiet python-openstackclient
 pip freeze
 
 cat > "$WORKSPACE/docs/cloud-images.rst" << EOF
diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
deleted file mode 100644 (file)
index 5a921c0..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: openflowjava-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'master'
-    mvn-settings: 'openflowjava-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a68a1507dae22
-
-- project:
-    name: openflowjava-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'openflowjava-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a68a1507dae22
-
-- project:
-    name: openflowjava-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'master'
-    mvn-settings: 'openflowjava-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
new file mode 100644 (file)
index 0000000..ec8e0f1
--- /dev/null
@@ -0,0 +1,27 @@
+---
+- project:
+    name: openflowplugin-csit-bundle-based-reconciliation
+    jobs:
+      - inttest-csit-1node
+
+    project: 'openflowplugin'
+
+    functionality: 'bundle-based-reconciliation'
+
+    # Project branches
+    stream:
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+
+    install:
+      - all:
+          scope: 'all'
+
+    # Job images
+    tools_system_count: 2
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-rest'
index 00fdc970293612f64a99dc097bbd650663143d3c..0dbd48791b1fd2724aee378512f5fb9a84cf1d8b 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 045b935ad72397197ef083af184acd7fa1ff66c9..3bdae033aa327bba636614d205791deacc310398 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index bca8ed3d6b2b27b01242fb00b94b73b76279273e..e5014dcc9e866eb7ba0dbb3d3f1b4ff5cedc9d7d 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index b93b6767530842433bc77f8be010985f79f27ac1..9dbcd65dc3d546ebe50233e03a4fd71ee4e5c595 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 12df50ccca5859abd02ed1ef1d05d34f4c1d2d3b..abf8635579e346fe6cf6f2dd55eeb267327c155f 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - all:
index 7705e08f99d5749b72e52aa2625f386461f6baf2..936c67d836cd4ec5b6a6d566ab249f6f3098b114 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 3d37ea4510cd6e4ce923728714e4443d816e6430..7bf25d470d7462672ef412f9066f84db33473471 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 8a65460cc6e78bb74e49973282919370483caecf..e45e444cadc58056974b11a34268ba3e98fb7b31 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 5fe0ab123bd20fab28cf9450625cfdfcb88bafe1..7154b80d0f4c9c07a90a15a64d944c638ffc6b96 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 835926e9632c3c9e22859a970777ea6074198184..32d727a13593cb63e7aadf364e05985ba602abf8 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index ff29a4fd914db12b0e472e026729253b17d3c7bb..fb43dd5991c9ef84011a951596d2f59e0a35bb4c 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 9a7c3468501d58518df3201dc2fd8ad2b3447bbb..ed891598f6e1f9912cad5b744d802d8ef57e78f2 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
index 01a735dccfbeeec4364b1192e0e3cda2d56e6889..6af721d6c11e1da36e117ae312cacc4cd83b528b 100644 (file)
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: 'karaf3'
 
     jdk: 'openjdk8'
 
@@ -43,3 +36,7 @@
       - cluster-netvirt:
           csit-list: >
               netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 35644407354118dfaa2d0783f3d94f1f608a65f9..e591415ce2f79cdc54affde85003b780543641f1 100644 (file)
@@ -4,6 +4,12 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
     stream: fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
     stream: oxygen
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
-
-- project:
-    name: openflowplugin-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    karaf-version: 'karaf3'
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
-
 - project:
     name: openflowplugin-sonar
     jobs:
index 2ace6c4ad9aacf6c928a3f8f0eaf838835c5ce13..4490a389877efc7e9403c0605dc525b1d1fe175c 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
index 516fa7195bbbafea562720f5ec85d511bac1e3d4..a0f30f7244813921eac626511a9cbabc81254e3c 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
 
index 6e2100179e6fb8fe7c254bfc6a1c8cd066aa2b85..c3c7a6699b8b6b4c5a39f0c7ed8d8745d35f5750 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     project-name: 'opflex'
index e0e4969a03c80675c17d29578cfde483abf9de22..d819198819a94e4a42e66d1610eb88d24caa50e1 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index b88d63f4601330dd51bd1dabb2fe2e4a4ba29990..bb00aba5f0791842259ffc0ba11aaafec337cb5a 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 0e24962d8046d150eafb5cc7030a3ed2717faaa4..034696f571437adbe2a17c7285bebdb9e0a287e7 100644 (file)
@@ -9,11 +9,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
index 8495123cbd9d3d766336dfe1659b1a3bc257073a..b1f000bedcd28010b3c5cf80c63f3102db08f4fb 100644 (file)
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
index 60064bd31a1fd7a8b0a577c2812f7e1340c15a30..7fcc646addbc950920f5dc82feee938ed6672f76 100644 (file)
@@ -4,6 +4,11 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: ovsdb
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
+          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs
 
     stream: fluorine
 
     # Used by the release job
     staging-profile-id: a68b188166958
-
-- project:
-    name: ovsdb-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
-
-- project:
-    name: ovsdb-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
index 90802ab7385a9fa728cac918291c36510459e038..05c04d96781b7035e862e796e7d7e25caa11e0f6 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: p4plugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index bcb79b5f8330ac1f28cc4fa7c8444a596b03f2d4..cffc29bdbbb79b39716f2ada594d6d5fd570cc09 100644 (file)
@@ -15,11 +15,7 @@ $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Convert stream to numeric ODL major version
-if [ "$STREAM" == "carbon" ]; then
-  VERSION_MAJOR=6
-elif [ "$STREAM" == "nitrogen" ]; then
-  VERSION_MAJOR=7
-elif [ "$STREAM" == "oxygen" ]; then
+if [ "$STREAM" == "oxygen" ]; then
   VERSION_MAJOR=8
 elif [ "$STREAM" == "fluorine" ]; then
   VERSION_MAJOR=9
@@ -34,4 +30,3 @@ fi
                                          --changelog_email "$CHANGELOG_EMAIL" \
                                          latest_snap \
                                          --major "$VERSION_MAJOR"
-
index 56dd06a9dba802e92841ec26ed3e955957b606c8..5c862b2abba569958b9e67cada8eb7038fe5f59b 100644 (file)
@@ -26,8 +26,6 @@
 
     stream:
       - fluorine
-      - carbon
-      - nitrogen
       - oxygen
     distro:
       - opensuse-42
@@ -69,7 +67,7 @@
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
       - string:
           name: CHANGELOG_NAME
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Nitrogen tarball
+      # Test Oxygen SR1 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen pre-release autorelease tarball
+      # Test latest Oxygen snapshot
+      - inject:
+          properties-content: 'STREAM=oxygen'
+      - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
+
+      # Test Fluorine pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2131/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen multipatch zip (no parallel tarball available)
+      # Test Fluorine multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.1-SNAPSHOT/karaf-0.8.1-20180417.030111-15.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Oxygen snapshot
+      # Test latest Fluorine snapshot
       - inject:
-          properties-content: 'STREAM=oxygen'
+          properties-content: 'STREAM=fluorine'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Carbon SR2 tarball
+      # Test Oxygen SR1 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Carbon multipatch zip (no parallel tarball available)
+      # Test Oxygen pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.4-SNAPSHOT/distribution-karaf-0.6.4-20180408.212935-2.zip'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
-      # Test latest Carbon snapshot
-      - inject:
-          properties-content: 'STREAM=carbon'
-      - shell: !include-raw: build-rpm-snap.sh
-      - install-test-uninstall-rpm
-
-      # Test Nitrogen tarball
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
-      # Test Nitrogen SR1 tarball
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2192/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Nitrogen multipatch zip (no parallel tarball available)
+      # Test Oxygen multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.3-SNAPSHOT/karaf-0.7.3-20180408.214158-1.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.2-SNAPSHOT/karaf-0.8.2-20180524.145206-1.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Nitrogen snapshot
+      # Test latest Oxygen snapshot
       - inject:
-          properties-content: 'STREAM=nitrogen'
+          properties-content: 'STREAM=oxygen'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen pre-release autorelease tarball
+      # Test Fluorine pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2131/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Oxygen multipatch zip (no parallel tarball available)
+      # Test Fluorine multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.1-SNAPSHOT/karaf-0.8.1-20180417.030111-15.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test latest Oxygen snapshot
+      # Test latest Fluorine snapshot
       - inject:
-          properties-content: 'STREAM=oxygen'
+          properties-content: 'STREAM=fluorine'
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo'
+          default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-9-devel.repo'
           description: 'Link to .repo or .rpm file'
 
     scm:
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-release.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-8-release.repo'
           description: 'Link to .repo or .rpm file'
       - string:
           name: UPGRADE_URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-devel.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-8-devel.repo'
           description: 'Link to .repo or .rpm file'
 
     scm:
           artifacts: '{archive-artifacts}'
       - string:
           name: PACKAGE
-          default: 'ppa:odl-team/nitrogen'
+          default: 'ppa:odl-team/oxygen'
           description: 'Link to .deb package or name of PPA repo'
 
     scm:
index 0ec0a7b3812c748990d306ded38cf6ad0da2d566..0fd69b51c6ae0c04102384507a0fbe391e5bcf35 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
index a6cc205e184b80e8a12430d6bcf6731582b32c9e..84f4a6968d0110cbe2502b3b3b987fe00ee41868 100644 (file)
@@ -13,8 +13,7 @@ set -ex -o pipefail
 declare -a expected_ports=("1099" "8101" "44444")
 
 # Ports that should only be open after odl-nevirt-openstack is installed
-# 8080 is Nitrogen and Carbon only, not Oxygen
-declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8080" "8181" "8185")
+declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8181" "8185")
 
 # Make sure expected ports open
 COUNT="0"
index 13eb0eb1f2ce91c49912c104b750295f61f8e444..44a7263f0885b323e864ac11a7f14b76a1775f8e 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 14a83cd2283ed95041c31c3b7f03f4c0f477bb7f..ebf860f78bd1baf7dc91c45a2eb2a818c89da504 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: packetcable-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
-- project:
-    name: packetcable-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
-
-    # Used by the release job
-    staging-profile-id: a68ca4a24655c
-
-- project:
-    name: packetcable-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
-
-    # Used by the release job
-    staging-profile-id: a68ca4a24655c
-
 - project:
     name: packetcable-sonar
     jobs:
index c745e21788534770c48f7cf972302ff03db62e65..4d6d1ff3837bed6b41b9bb1c39d2c41313a0d16c 100644 (file)
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
 
-- project:
-    name: persistence-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/nitrogen'
-    jdk: openjdk7
-    mvn-settings: 'persistence-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[persistence]'
-
-    # Used by the release job
-    staging-profile-id: a68d3c2bb44d1
-
-- project:
-    name: persistence-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk7
-    mvn-settings: 'persistence-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[persistence]'
-
-    # Used by the release job
-    staging-profile-id: a68d3c2bb44d1
-
 - project:
     name: persistence-sonar
     jobs:
index 0c37c0bb49b0f58c9bb7b6367d5518252bce164b..f2a600d00168f8c6411f16709007a391cf6ba0d3 100644 (file)
@@ -13,6 +13,7 @@
     build-timeout: 360
     build-node: centos7-builder-4c-4g
     schedule: ''
+    schedule-daily: 'H H * * *'
     schedule-saturday: 'H H * * 6'
     schedule-weekly: 'H 23 * * 6'
     schedule-high-frequency: 'H H/4 * * *'
@@ -68,6 +69,9 @@
     # Distribution bundle URL
     bundle-url: 'last'
     repo-url: ''
+    install-features: ''
+    sm-repos: ''
+    sm-features: ''
 
     # CSIT images configuration
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/carbon
+    verify-branch: stable/oxygen
     # Value for ODL_STREAM
-    verify-stream: carbon
-    verify-karaf-version: karaf3
+    verify-stream: oxygen
+    verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 
     # Maven / Java
         netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
         netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
-    csit-high-frequency-list-nitrogen: >
-        netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen
-    csit-high-frequency-list-carbon: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon
     csit-sanity-list-fluorine: >
-        openflowplugin-csit-1node-sanity-only-fluorine
+        openflowplugin-csit-1node-sanity-only-fluorine,
+        distribution-sanity-fluorine
     csit-sanity-list-oxygen: >
-        openflowplugin-csit-1node-sanity-only-oxygen
-    csit-sanity-list-nitrogen: >
-        openflowplugin-csit-1node-sanity-only-nitrogen
-    csit-sanity-list-carbon: >
-        openflowplugin-csit-1node-sanity-only-carbon
+        openflowplugin-csit-1node-sanity-only-oxygen,
+        distribution-sanity-oxygen
     csit-weekly-list-fluorine: >
         controller-csit-1node-notifications-longevity-only-fluorine,
         controller-csit-3node-drb-partnheal-longevity-only-fluorine,
         distribution-deploy-oxygen,
         distribution-offline-oxygen,
         openflowplugin-csit-1node-longevity-only-oxygen
-    csit-weekly-list-nitrogen: >
-        controller-csit-1node-notifications-longevity-only-nitrogen,
-        controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
-        controller-csit-3node-drb-precedence-longevity-only-nitrogen,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen,
-        bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
-        distribution-deploy-nitrogen,
-        distribution-offline-nitrogen,
-        openflowplugin-csit-1node-longevity-only-nitrogen
-    csit-weekly-list-carbon: >
-        controller-csit-1node-notifications-longevity-only-carbon,
-        controller-csit-3node-cs-chasing-leader-longevity-only-carbon,
-        controller-csit-3node-cs-partnheal-longevity-only-carbon,
-        controller-csit-3node-drb-partnheal-longevity-only-carbon,
-        controller-csit-3node-drb-precedence-longevity-only-carbon,
-        controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon,
-        bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
-        distribution-deploy-carbon,
-        distribution-offline-carbon,
-        openflowplugin-csit-1node-longevity-only-carbon
index bb78183ea4891f7e561f6b0bb1b47d38111a60a9..9fad16fc8dd1651e7a2a2cdccaf5dab9267a803a 100644 (file)
@@ -29,7 +29,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.0.3
+    jjb-version: 2.0.6
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
       - string:
           name: OS_CLOUD
           default: '{os-cloud}'
-          description: Artifacts to archive to the logs server.
+          description: |
+              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
+              variable name that is significant to openstack client as a
+              environment variable. Please refer to the documentation for
+              further details.
+              https://docs.openstack.org/developer/python-openstackclient/
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           files:
             - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
+            - file-id: npmrc
+              target: '$HOME/.npmrc'
+            - file-id: pipconf
+              target: '$HOME/.config/pip/pip.conf'
 
     triggers:
       - timed: '0,30 * * * *'
 
     builders:
       - odl-openstack-install
-      - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh
       # Servers
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
 
     builders:
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
-      - opendaylight-infra-push-gerrit-patch:
+      - lf-infra-push-gerrit-patch:
           project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'releng-update-cloud-image-list'
           gerrit-commit-message: 'Update cloud image list docs'
+          reviewers-email: 'jluhrsen@redhat.com'
 
     publishers:
       - email-notification:
index 2316b19ca3cc6c16b5b9d94365861edc4d298441..6487231cb84ca48bb13e9cf97eb8ef653037bec7 100644 (file)
           default: ''
           description: |
               Ordered list of patches to build in the format of project=changeset (checkout) or
-              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.
+              A topic is also allowed, for example: topic=binding-tlc-rpc
+
+- parameter:
+    name: build-order-parameter
+    parameters:
+      - string:
+          name: BUILD_ORDER
+          default: '{build-order}'
+          description: 'Build order for multipatch test when topic is used'
+
+- parameter:
+    name: build-fast-parameter
+    parameters:
+      - string:
+          name: BUILD_FAST
+          default: '{build-fast}'
+          description: 'Set true to build fast -Pq'
 
 - parameter:
     name: run-test-parameter
     parameters:
       - string:
-          name: RUNTEST
+          name: RUN_TEST
           default: '{run-test}'
           description: 'Set true to run test after build'
 
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
-- builder:
-    name: opendaylight-infra-push-gerrit-patch
-    # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to
-    # Gerrit in an automated fashion. This is meant for tasks that creates
-    # the same patch regularly and needs the ability to detect if an unreviewed
-    # patch already exists. In which case it will update the existing patch.
-    #
-    # Note: This patch assumes the $WORKSPACE contains the project repo with
-    #       the files changed already "git add" and waiting for a "git commit" call.
-    #
-    # This script requires the following JJB variables to be passed in:
-    #     {project}       Gerrit project-name
-    #     {gerrit-topic}  Gerrit topic, please make a unique topic.
-    #     {gerrit-commit-message} Commit message to assign to commit.
-    # NOTE: Requires git review to be installed on node.
-    builders:
-      - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh
-
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
                 settings: '{settings}'
                 global-settings: '{global-settings}'
 
+- publisher:
+    name: releng-openstack-stack-delete
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - shell: |
+                    #!/bin/bash
+                    echo "Deleting $STACK_NAME"
+                    source "/tmp/v/openstack/bin/activate"
+                    openstack stack delete --yes "$STACK_NAME"
+          mark-unstable-if-failed: false
+
 - builder:
     name: releng-stage-release
     builders:
index 72007f085080da54d8457d20350b0dd3078203ab..6e876dd0120a187c290aae8c6d4ae154a747e91e 100644 (file)
 
     platforms: centos-7
     templates: robot
+
+- project:
+    name: packer-kubernetes-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
+
+    platforms: ubuntu-16.04
+    templates: kubernetes
diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml
new file mode 100644 (file)
index 0000000..551d448
--- /dev/null
@@ -0,0 +1,695 @@
+---
+- releng_view: &releng_view_common
+    name: releng-view-common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+    recurse: false
+
+# Note: most-recent Job Filter requires JJB 2.1 to be released.
+- view:
+    name: 01-recent
+    regex: '.*'
+    description: 'List of most recent jobs'
+    job-filters:
+      most-recent:
+        max-to-include: 25
+        check-start-time: true
+    <<: *releng_view_common
+
+- view:
+    name: All-Sonar
+    regex: '.*-sonar$'
+    description: 'List of Sonar jobs'
+    <<: *releng_view_common
+
+- view:
+    name: CLM
+    description: 'List of CLM jobs'
+    regex: '.*-clm-.*'
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - policy-violations
+    recurse: false
+
+- view:
+    name: CSIT-1node
+    description: 'List of CSIT 1node jobs'
+    regex: '^.*-csit-1node.*'
+    <<: *releng_view_common
+
+- view:
+    name: CSIT-3node
+    description: 'List of CSIT 3node jobs'
+    regex: '^.*-csit-3node.*'
+    <<: *releng_view_common
+
+- view:
+    name: CSIT
+    description: 'List of CSIT jobs'
+    regex: '^.*-csit-.*'
+    <<: *releng_view_common
+
+- view:
+    name: CSIT-Verify
+    description: 'List of CSIT Verify jobs'
+    regex: '^.*-csit-verify.*'
+    <<: *releng_view_common
+
+- view:
+    name: Distribution-Check
+    description: 'List of Distribution Check jobs'
+    regex: '.*-distribution.*-check-.*'
+    <<: *releng_view_common
+
+- view:
+    name: Distribution-Jobs
+    description: 'List of Distribution jobs (test, check, merge, deploy, offline, verify)'
+    regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*'
+    <<: *releng_view_common
+
+- view:
+    name: Gate
+    description: 'List of Gate jobs'
+    regex: '.*-gate-.*'
+    <<: *releng_view_common
+
+# Note: column plugins implementations requires JJB 2.1 to be released.
+- view:
+    name: Integration
+    description: 'List of Integration jobs'
+    regex: '.*-integration-.*'
+    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-Jobs
+    description: 'List of Merge jobs'
+    regex: '.*-merge-.*'
+    <<: *releng_view_common
+
+- view:
+    name: Patch-Test
+    description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
+    regex: '.*-patch-test-.*'
+    <<: *releng_view_common
+
+- view:
+    name: Periodic
+    description: 'List of Periodic jobs'
+    regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+'
+    <<: *releng_view_common
+
+- view:
+    name: Release
+    description: 'List of Release jobs'
+    regex: '.*-release-.*'
+    <<: *releng_view_common
+
+- view:
+    name: Sanity
+    description: 'List of Sanity jobs'
+    regex: '.*-sanity-.*'
+    <<: *releng_view_common
+
+- view:
+    name: Thirdparty
+    description: 'List of ODL Nexus Thirdparty dependencies jobs'
+    regex: '.*-thirdparty-.*'
+    <<: *releng_view_common
+
+- view:
+    name: Validate
+    description: 'List of Validate jobs'
+    regex: '.*-validate-autorelease-.*'
+    <<: *releng_view_common
+
+- view:
+    name: Verify
+    description: 'List of Verify jobs, exluding CSIT jobs'
+    regex: '^(?!.*-csit).*-verify-.*'
+    <<: *releng_view_common
+
+- view:
+    name: aaa
+    description: 'List of aaa jobs'
+    regex: '^aaa-.*'
+    <<: *releng_view_common
+
+- view:
+    name: alto
+    description: 'List of alto jobs'
+    regex: '^alto-.*'
+    <<: *releng_view_common
+
+- view:
+    name: archetypes
+    regex: '^archetypes-.*'
+    description: 'List of archetypes jobs'
+    <<: *releng_view_common
+
+- view:
+    name: atrium
+    description: 'List of atrium jobs'
+    regex: '^atrium-.*'
+    <<: *releng_view_common
+
+- view:
+    name: autorelease
+    description: 'List of autorelease jobs'
+    regex: '^autorelease-.*'
+    <<: *releng_view_common
+
+- view:
+    name: bgpcep
+    description: 'List of bgpcep jobs'
+    regex: '^bgpcep-.*'
+    <<: *releng_view_common
+
+- view:
+    name: bier
+    description: 'List of bier jobs'
+    regex: '^bier-.*'
+    <<: *releng_view_common
+
+- view:
+    name: builder
+    description: 'List of builder jobs'
+    regex: '^(builder|lf-infra)-.*'
+    <<: *releng_view_common
+
+- view:
+    name: capwap
+    description: 'List of capwap jobs'
+    regex: '^capwap-.*'
+    <<: *releng_view_common
+
+- view:
+    name: cardinal
+    description: 'List of cardinal jobs'
+    regex: '^cardinal-.*'
+    <<: *releng_view_common
+
+- view:
+    name: centinel
+    description: 'List of centinel jobs'
+    regex: '^centinel-.*'
+    <<: *releng_view_common
+
+- view:
+    name: circuitsw
+    description: 'List of circuitsw jobs'
+    regex: '^circuitsw-.*'
+    <<: *releng_view_common
+
+- view:
+    name: coe
+    description: 'List of coe jobs'
+    regex: '^coe-.*'
+    <<: *releng_view_common
+
+- view:
+    name: controller
+    description: 'List of controller jobs'
+    regex: '^controller-.*'
+    <<: *releng_view_common
+
+- view:
+    name: coretutorials
+    description: 'List of coretutorials jobs'
+    regex: '^coretutorials-.*'
+    <<: *releng_view_common
+
+- view:
+    name: daexim
+    description: 'List of daexim jobs'
+    regex: '^daexim-.*'
+    <<: *releng_view_common
+
+- view:
+    name: didm
+    description: 'List of didm jobs'
+    regex: '^didm-.*'
+    <<: *releng_view_common
+
+- view:
+    name: distribution
+    description: 'List of distribution jobs'
+    regex: '^(integration-)?distribution-.*'
+    <<: *releng_view_common
+
+- view:
+    name: dlux
+    description: 'List of dlux jobs'
+    regex: '^dlux-.*'
+    <<: *releng_view_common
+
+- view:
+    name: dluxapps
+    description: 'List of dluxapps jobs'
+    regex: '^dluxapps-.*'
+    <<: *releng_view_common
+
+- view:
+    name: docs
+    description: 'List of docs jobs'
+    regex: '^docs-.*'
+    <<: *releng_view_common
+
+- view:
+    name: eman
+    description: 'List of eman jobs'
+    regex: '^eman-.*'
+    <<: *releng_view_common
+
+- view:
+    name: epc
+    description: 'List of epc jobs'
+    regex: '^epc-.*'
+    <<: *releng_view_common
+
+- view:
+    name: faas
+    description: 'List of faas jobs'
+    regex: '^faas-.*'
+    <<: *releng_view_common
+
+- view:
+    name: federation
+    description: 'List of federation jobs'
+    regex: '^federation-.*'
+    <<: *releng_view_common
+
+- view:
+    name: fpc
+    description: 'List of fpc jobs'
+    regex: '^fpc-.*'
+    <<: *releng_view_common
+
+- view:
+    name: genius
+    description: 'List of genius jobs'
+    regex: '^genius-.*'
+    <<: *releng_view_common
+
+- view:
+    name: gnt
+    description: 'List of gnt jobs'
+    regex: '^gnt-.*'
+    <<: *releng_view_common
+
+- view:
+    name: groupbasedpolicy
+    description: 'List of groupbasedpolicy jobs'
+    regex: '^groupbasedpolicy-.*'
+    <<: *releng_view_common
+
+- view:
+    name: intrautils
+    description: 'List of infrautils jobs'
+    regex: '^infrautils-.*'
+    <<: *releng_view_common
+
+- view:
+    name: integration
+    description: 'List of integration jobs'
+    regex: '^integration-.*'
+    <<: *releng_view_common
+
+- view:
+    name: iotdm
+    description: 'List of iotdm jobs'
+    regex: '^iotdm-.*'
+    <<: *releng_view_common
+
+- view:
+    name: jsonrpc
+    description: 'List of jsonrpc jobs'
+    regex: '^jsonrpc-.*'
+    <<: *releng_view_common
+
+- view:
+    name: kafkaproducer
+    description: 'List of kafkaproducer jobs'
+    regex: '^kafkaproducer-.*'
+    <<: *releng_view_common
+
+- view:
+    name: l2switch
+    description: 'List of l2switch jobs'
+    regex: '^l2switch-.*'
+    <<: *releng_view_common
+
+- view:
+    name: lacp
+    description: 'List of lacp jobs'
+    regex: '^lacp-.*'
+    <<: *releng_view_common
+
+- view:
+    name: lispflowmapping
+    description: 'List of lispflowmapping jobs'
+    regex: '^lispflowmapping-.*'
+    <<: *releng_view_common
+
+- view:
+    name: mdsal
+    description: 'List of mdsal jobs'
+    regex: '^mdsal-.*'
+    <<: *releng_view_common
+
+- view:
+    name: messaging4transport
+    description: 'List of messaging4transport jobs'
+    regex: '^messaging4transport-.*'
+    <<: *releng_view_common
+
+- view:
+    name: natapp
+    description: 'List of natapp jobs'
+    regex: '^natapp-.*'
+    <<: *releng_view_common
+
+- view:
+    name: nemo
+    description: 'List of nemo jobs'
+    regex: '^nemo-.*'
+    <<: *releng_view_common
+
+- view:
+    name: netconf
+    description: 'List of netconf jobs'
+    regex: '^netconf-.*'
+    <<: *releng_view_common
+
+- view:
+    name: netide
+    description: 'List of netide jobs'
+    regex: '^netide-.*'
+    <<: *releng_view_common
+
+- view:
+    name: netvirt
+    description: 'List of netvirt jobs'
+    regex: '^netvirt-.*'
+    <<: *releng_view_common
+
+- view:
+    name: netvirt-csit
+    description: 'List of netvirt-csit jobs'
+    regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
+    <<: *releng_view_common
+
+- view:
+    name: neutron
+    description: 'List of neutron jobs'
+    regex: '^neutron-.*'
+    <<: *releng_view_common
+
+- view:
+    name: next
+    description: 'List of next jobs'
+    regex: '^next-.*'
+    <<: *releng_view_common
+
+- view:
+    name: nic
+    description: 'List of nic jobs'
+    regex: '^nic-.*'
+    <<: *releng_view_common
+
+- view:
+    name: ocpplugin
+    description: 'List of ocpplugin jobs'
+    regex: '^ocpplugin-.*'
+    <<: *releng_view_common
+
+- view:
+    name: odlparent
+    description: 'List of odlparent jobs'
+    regex: '^odlparent-.*'
+    <<: *releng_view_common
+
+- view:
+    name: of-config
+    description: 'List of of-config jobs'
+    regex: '^of-config-.*'
+    <<: *releng_view_common
+
+- view:
+    name: openci
+    description: 'List of openci jobs'
+    regex: '^openci-.*'
+    <<: *releng_view_common
+
+- view:
+    name: openflowjava
+    description: 'List of openflowjava jobs'
+    regex: '^openflowjava-.*'
+    <<: *releng_view_common
+
+- view:
+    name: openflowplugin
+    description: 'List of openflowplugin jobs'
+    regex: '^openflowplugin-.*'
+    <<: *releng_view_common
+
+- view:
+    name: openflowplugin-oxygen
+    description: 'List of openflowplugin oxygen jobs'
+    regex: 'openflowplugin-.*-oxygen'
+    <<: *releng_view_common
+
+- view:
+    name: opflex
+    description: 'List of opflex jobs'
+    regex: '^opflex-.*'
+    <<: *releng_view_common
+
+- view:
+    name: ovil
+    description: 'List of ovil jobs'
+    regex: '^ovil-.*'
+    <<: *releng_view_common
+
+- view:
+    name: ovsdb
+    description: 'List of ovsdb jobs'
+    regex: '^ovsdb-.*'
+    <<: *releng_view_common
+
+- view:
+    name: p4plugin
+    description: 'List of p4plugin jobs'
+    regex: '^p4plugin-.*'
+    <<: *releng_view_common
+
+- view:
+    name: packaging
+    description: 'List of packaging, ansible and puppet jobs'
+    regex: '^packaging.*|ansible.*|puppet.*'
+    <<: *releng_view_common
+
+- view:
+    name: packer
+    description: 'List of packer jobs'
+    regex: '^builder-.*packer.*'
+    <<: *releng_view_common
+
+- view:
+    name: packetcable
+    description: 'List of packetcable jobs'
+    regex: '^packetcable-.*'
+    <<: *releng_view_common
+
+- view:
+    name: persistence
+    description: 'List of persistence jobs'
+    regex: '^persistence-.*'
+    <<: *releng_view_common
+
+- view:
+    name: potn
+    description: 'List of potn jobs'
+    regex: '^potn-.*'
+    <<: *releng_view_common
+
+- view:
+    name: reservation
+    description: 'List of reservation jobs'
+    regex: '^reservation-.*'
+    <<: *releng_view_common
+
+- view:
+    name: sdninterfaceapp
+    description: 'List of sdninterfaceapp jobs'
+    regex: '^sdninterfaceapp-.*'
+    <<: *releng_view_common
+
+- view:
+    name: sfc
+    description: 'List of sfc jobs'
+    regex: '^sfc-.*'
+    <<: *releng_view_common
+
+- view:
+    name: snbi
+    description: 'List of snbi jobs'
+    regex: '^snbi-.*'
+    <<: *releng_view_common
+
+- view:
+    name: snmp
+    description: 'List of snmp jobs'
+    regex: '^snmp-.*'
+    <<: *releng_view_common
+
+- view:
+    name: snmp4sdn
+    description: 'List of snmp4sdn jobs'
+    regex: '^snmp4sdn-.*'
+    <<: *releng_view_common
+
+- view:
+    name: spectrometer
+    description: 'List of spectrometer jobs'
+    regex: '^spectrometer-.*'
+    <<: *releng_view_common
+
+- view:
+    name: sptn
+    description: 'List of sptn jobs'
+    regex: '^sptn-.*'
+    <<: *releng_view_common
+
+- view:
+    name: spx
+    description: 'List of spx jobs'
+    regex: '^sxp-.*'
+    <<: *releng_view_common
+
+- view:
+    name: systemmetrics
+    description: 'List of systemmetrics jobs'
+    regex: '^systemmetrics-.*'
+    <<: *releng_view_common
+
+- view:
+    name: telemetry
+    description: 'List of telemetry jobs'
+    regex: '^telemetry-.*'
+    <<: *releng_view_common
+
+- view:
+    name: topoprocessing
+    description: 'List of topoprocessing jobs'
+    regex: '^topoprocessing-.*'
+    <<: *releng_view_common
+
+- view:
+    name: transportpce
+    description: 'List of transportpce jobs'
+    regex: '^transportpce-.*'
+    <<: *releng_view_common
+
+- view:
+    name: tsdr
+    description: 'List of tsdr jobs'
+    regex: '^tsdr-.*'
+    <<: *releng_view_common
+
+- view:
+    name: ttp
+    description: 'List of ttp jobs'
+    regex: '^ttp-.*'
+    <<: *releng_view_common
+
+- view:
+    name: unimgr
+    description: 'List of unimgr jobs'
+    regex: '^unimgr-.*'
+    <<: *releng_view_common
+
+- view:
+    name: usc
+    description: 'List of usc jobs'
+    regex: '^usc-.*'
+    <<: *releng_view_common
+
+- view:
+    name: uscplugin
+    description: 'List of uscplugin jobs'
+    regex: '^usecplugin-.*'
+    <<: *releng_view_common
+
+- view:
+    name: vbd
+    description: 'List of vbd jobs'
+    regex: '^vbd-.*'
+    <<: *releng_view_common
+
+- view:
+    name: verify-python
+    description: 'List of pyhton-verify jobs'
+    regex: '.*-python-.*'
+    <<: *releng_view_common
+
+- view:
+    name: vpnservice
+    description: 'List of vpnservice jobs'
+    regex: '^vpnservice-.*'
+    <<: *releng_view_common
+
+- view:
+    name: vtn
+    description: 'List of vtn jobs'
+    regex: '^vtn-.*'
+    <<: *releng_view_common
+
+- view:
+    name: yang-push
+    description: 'List of yang-push jobs'
+    regex: '^yang-push-.*'
+    <<: *releng_view_common
+
+- view:
+    name: yangide
+    description: 'List of yangide jobs'
+    regex: '^yangide-.*'
+    <<: *releng_view_common
+
+- view:
+    name: yangtools
+    description: 'List of yangtools jobs'
+    regex: '^yangtools-.*'
+    <<: *releng_view_common
index 61d8a13567be36043c93cc83417f1e9a9f6e76bb..b6e748b49aec3b693dd3ac6b523a19eadde0e84c 100644 (file)
@@ -1 +1 @@
-jenkins-job-builder==2.0.3
+jenkins-job-builder==2.0.6
index 47b06b04e7d5066710557a7e74eabe31eee94072..33c6313e209f27fa38cf46847dc0ac08f9ab2ae2 100644 (file)
     # Used by the release job
     staging-profile-id: a68d9bc504037
 
-- project:
-    name: reservation-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'reservation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[reservation]'
-
-    # Used by the release job
-    staging-profile-id: a68d9bc504037
-
-- project:
-    name: reservation-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'reservation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[reservation]'
-
-    # Used by the release job
-    staging-profile-id: a68d9bc504037
-
 - project:
     name: reservation-sonar
     jobs:
index da2df481e3589885e6df5b9a8e1a7e4d672c194a..91b9e89bc30c824401d0548fbad5dbbecc62568b 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index d14de626599d1740443b8149ac1b788265d21730..664877e84b247505f703d66605df9535eba3e291 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: sdninterfaceapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
 
-- project:
-    name: sdninterfaceapp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-
-    # Used by the release job
-    staging-profile-id: a68e3d1ff55e3
-
-- project:
-    name: sdninterfaceapp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-
-    # Used by the release job
-    staging-profile-id: a68e3d1ff55e3
-
 - project:
     name: sdninterfaceapp-sonar
     jobs:
index c050efa8c3cbe1334966e7c662d03595a620f496..56d49f56369cbe042b0bc0fa8e053d8acc498bb3 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a0dc38318246cf4a53ed5a5cd53ca066932886f9..e085c8e68d93aa262e18cf4d064c6f842936f9be 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index d3da132334eea099e309939671688afb2257d8db..2ee117d46d6bad5a37873e18361f6b0895f02aa7 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - basic:
index 331afd100d16fac746af45b9ab22613bf0a6cf42..ec17b9949bdd5855d21a78587ea16048ae7a6515 100644 (file)
@@ -9,10 +9,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
 
     project: 'sfc'
     project-name: 'sfc'
index ab58e449b15e736227e610c6102eea5ed924ed16..cb3c8a874179eff0bcd8e68da8db70a7c70fc634 100644 (file)
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
-- project:
-    name: sfc-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: a68eb361ca48a
-
-- project:
-    name: sfc-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: a68eb361ca48a
-
 - project:
     name: sfc-sonar
     jobs:
index f9ecd01f649f73a69225107c4cd71346fcb1171e..84a9ca9fe8483cda0b81f51175b3f8d735e73180 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: snbi-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a68f328cefed6
 
-- project:
-    name: snbi-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-
-    # Used by the release job
-    staging-profile-id: a68f328cefed6
-
-- project:
-    name: snbi-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-
-    # Used by the release job
-    staging-profile-id: a68f328cefed6
-
 - project:
     name: snbi-sonar
     jobs:
index 4a5c47d15e91d55e2b194ad9f9ea6ff6f89d9d48..c959329d84046c20a612635bc1b71a368280f7e6 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: snmp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
-- project:
-    name: snmp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a68fb236b93a6
-
-- project:
-    name: snmp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a68fb236b93a6
-
 - project:
     name: snmp-sonar
     jobs:
index 1ad2b6a864bd6f71ff1cebb2a1798402a1fbae23..87431891b5c7f8546a531df9d9665191c6dac586 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: snmp4sdn-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
-- project:
-    name: snmp4sdn-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a69034a4b6ef5
-
-- project:
-    name: snmp4sdn-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a69034a4b6ef5
-
 - project:
     name: snmp4sdn-sonar
     jobs:
index 32f2fea771e467af5543570f75020b2254fb4b65..4c3271bc68c813ea192070d2f144be3757b41241 100644 (file)
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index d7b95d23c39cda248e2cde1e89081e4975e27402..71d140be32282a95c9a656d1838f0f85fa7feefe 100644 (file)
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
 
     install:
       - all:
index 7404e0b81caf58695110b1951cca966efcebf83c..f4488e2474b0313127c8caa85a896a2646373cee 100644 (file)
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1c18ccd314298a46970f952e1d1b14ab65838686..922b788958cf024f96fa2a2ab145a1302d3f5999 100644 (file)
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 954ab23cab2878565f51116168a1f34d1ec141ab..9a4f593310f11c741be0c4957834959a9bee3892 100644 (file)
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 28abaf89d3d86ccf7bf4f78a1e7044cb6dc931a6..3db08c4126a0692f33dd874ecb23c43d1ffcd9c4 100644 (file)
           repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 08b5b7556db68a1ae56d50399cb0de0d33ca65c4..e8b6c02b50bbcaf818d69115123a809bddbe09d4 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: sxp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
-- project:
-    name: sxp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
-- project:
-    name: sxp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
 - project:
     name: sxp-sonar
     jobs:
index f6b280bb9eacc3ae813370238164cc06b8578452..d3bd2887352ebb07bdd41fc97786aae795c5838f 100644 (file)
     # Used by the release job
     staging-profile-id: a69113575458e
 
-- project:
-    name: systemmetrics-oxygen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: oxygen
-    branch: 'stable/oxygen'
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
-- project:
-    name: systemmetrics-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
-- project:
-    name: systemmetrics-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
 - project:
     name: systemmetrics-sonar
     jobs:
index 75a34f5a7c2e276fbceee18b67745ddbdc00b104..c28c14e24414f4effefa8e4b52cd512886132dfd 100644 (file)
@@ -3,7 +3,6 @@
     name: telemetry-fluorine
     jobs:
       - 'odl-maven-jobs'
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
 
     stream: fluorine
diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
deleted file mode 100644 (file)
index a9def51..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- project:
-    name: topoprocessing-csit-topology-operations
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'topoprocessing'
-
-    # The functionality under test
-    functionality: 'topology-operations'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf'
-
-    # Robot custom options
-    robot-options: ''
index 8aacb504110802c81b455ff521d4aa3eae1d480f..8ee0a78fb30ff1c2130f457499caef8ba6a0c6c4 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: topoprocessing-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a691bbe2328cb
 
-- project:
-    name: topoprocessing-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a691bbe2328cb
-
-- project:
-    name: topoprocessing-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a691bbe2328cb
-
 - project:
     name: topoprocessing-sonar
     jobs:
index 30ab98e93c08fe4a30316aa1c6dc9caf9ac6fb39..d1ab65f8db34aeb04c0051645c828b787c07e6db 100644 (file)
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    project: 'transportpce'
-    project-name: 'transportpce'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
-- project:
-    name: transportpce-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'transportpce'
-    project-name: 'transportpce'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
 - project:
     name: transportpce-sonar
     jobs:
index 0abf934ed223dc04d3f8c33bef3fbd2cfc7105d3..e173dc988d933f896891b6f6282007fc71590f54 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 02e9df3cd6e5c086540387a9c6a1a5cd779a786f..ad5229baee45ac7adf91aff26218d64864d5e4fe 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index c574684aeee5be9b03943402d072bf477e974816..6b1c235c4ff93fbd4d09a79d36e9b87d121115a4 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 8c251df84db80e82624852ccaac0c84a21fb6048..a9fbd4761062d821184479335b1e7fbe01936cc9 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 04bd66db352550e77110f8d02aa185b36a1961f7..564849dd854d67929f0ebb9b71c8c7fb4e227ced 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: tsdr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a69373036303c
 
-- project:
-    name: tsdr-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
-
-    # Used by the release job
-    staging-profile-id: a69373036303c
-
-- project:
-    name: tsdr-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
-
-    # Used by the release job
-    staging-profile-id: a69373036303c
-
 - project:
     name: tsdr-sonar
     jobs:
index 323a75b8aaf19e1f4f490b7711e32bbb6b68f137..b52b0245cc9554f36c69711202812cf14836e432 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: ttp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a693f948563d5
 
-- project:
-    name: ttp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
-- project:
-    name: ttp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
 - project:
     name: ttp-sonar
     jobs:
diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
deleted file mode 100644 (file)
index f8e2542..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
-    name: unimgr-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'unimgr'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Mininet configuration
-    tools_system_count: 2
-
-    # Features to install
-    install-features: 'odl-unimgr-ui'
-
-    # Robot custom options
-    robot-options: ''
diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
deleted file mode 100644 (file)
index 4e74f04..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: unimgr-csit-legato
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'unimgr'
-
-    # The functionality under test
-    functionality: 'legato'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Mininet configuration
-    tools_system_count: 2
-
-    # Features to install
-    install-features: 'odl-unimgr-ui,odl-unimgr-netvirt'
-
-    # Robot custom options
-    robot-options: ''
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
index e53712d932f9d646d844ffff372823711a9b7aee..4c63ee1e642a45dc12bebb0902800a4951215fc6 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: unimgr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
-- project:
-    name: unimgr-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
-
-- project:
-    name: unimgr-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
-
 - project:
     name: unimgr-sonar
     jobs:
index a43ce024c75d3beacfa16ac30e0d9b54d77e94ad..72846d311e8ee0c48b8649ea2cf7b70dfa1731d2 100644 (file)
           repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index ca04c7f2d62aa361e2280c09a8ada5a273d7b189..c0a3cf701d6b60cf1de9671cb3acad824b6ca5c0 100644 (file)
           repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 772a8d932797bc59816592abedd581a0be2fd931..f7dfeb8c561c68ddf99d28c043c91e79e9b29049 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: usc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
-- project:
-    name: usc-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a697b633b3ffe
-
-- project:
-    name: usc-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a697b633b3ffe
-
 - project:
     name: usc-sonar
     jobs:
index ff278048d5b953193576dc6f9b565af4c368b3d9..edbf3601e11341dd357f2663b24af4bd0696157f 100644 (file)
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 459dccd32c83b02055ace6717e379e6483441240..1b017719b5a1825da9a3e8b65c20f758151203a2 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: usecplugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a69902281e037
 
-- project:
-    name: usecplugin-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a69902281e037
-
-- project:
-    name: usecplugin-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a69902281e037
-
 - project:
     name: usecplugin-sonar
     jobs:
diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
deleted file mode 100644 (file)
index e82edbe..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: vtn-manager-csit-openstack-integration
-    jobs:
-      - inttest-csit-openstack
-
-    # The project name
-    project: 'vtn'
-
-    topology:
-      - 1node:
-          openstack_system_count: 1
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-vtn-manager-neutron,odl-restconf-all'
-
-    testplan: '{project}-{topology}-openstack.txt'
-
-    # The project name
-    functionality: 'neutron'
-
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-services: 'n-cpu,placement-api,placement-client,tempest'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-          odl-ml2-port-binding: 'legacy-port-binding'
-
-    odl-enable-l3: 'no'
-    public-bridge: 'br-ex'
-    disable-openstack-services: 'n-net,q-l3'
-    tenant-network-type: 'local'
-    odl_system_flavor: odl-standard-8
-    openstack_system_flavor: odl-standard-8
-    odl-ml2-driver-version: 'v2'
diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml
deleted file mode 100644 (file)
index eceaf80..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- project:
-    name: vtn-patch-test
-    jobs:
-      - inttest-patch-test
-
-    # The project name
-    project: 'vtn'
-
-    feature: 'all'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-          csit-list: >
-             vtn-csit-1node-manager-all-{stream},
-             vtn-csit-3node-manager-all-{stream}
-      - oxygen:
-          branch: 'stable/oxygen'
-          csit-list: >
-             vtn-csit-1node-manager-all-{stream},
-             vtn-csit-3node-manager-all-{stream}
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          csit-list: >
-             vtn-csit-1node-manager-all-{stream},
-             vtn-csit-3node-manager-all-{stream}
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          csit-list: >
-             vtn-csit-1node-manager-all-{stream},
-             vtn-csit-3node-manager-all-{stream}
diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
deleted file mode 100644 (file)
index 9d47eaf..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
----
-- project:
-    name: vtn-fluorine
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'master'
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
-
-    # Please do not archive maven sites!!!
-    # Maven sites are published to Nexus at:
-    # https://nexus.opendaylight.org/content/sites/site/
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
-
-    # Used by the release job
-    staging-profile-id: a699799dd6fc9
-
-- project:
-    name: vtn-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/oxygen'
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
-
-    # Please do not archive maven sites!!!
-    # Maven sites are published to Nexus at:
-    # https://nexus.opendaylight.org/content/sites/site/
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
-
-    # Used by the release job
-    staging-profile-id: a699799dd6fc9
-
-- project:
-    name: vtn-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
-
-    # Please do not archive maven sites!!!
-    # Maven sites are published to Nexus at:
-    # https://nexus.opendaylight.org/content/sites/site/
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
-
-    # Used by the release job
-    staging-profile-id: a699799dd6fc9
-
-- project:
-    name: vtn-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
-    email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
-
-    # Please do not archive maven sites!!!
-    # Maven sites are published to Nexus at:
-    # https://nexus.opendaylight.org/content/sites/site/
-    archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
-
-    # Used by the release job
-    staging-profile-id: a699799dd6fc9
-
-- project:
-    name: vtn-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'vtn'
-    project-name: 'vtn'
-    branch: 'master'
-    mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index da08c4bdd5dbbad411c0c0d265bc64ebd8ec86a7..5083bbfae3726a11004c210f7da8984ca6822884 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: yang-push-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
     # Used by the release job
     staging-profile-id: a69aae2832869
 
-- project:
-    name: yang-push-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'yang-push-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[yang-push]'
-
-    # Used by the release job
-    staging-profile-id: a69aae2832869
-
-- project:
-    name: yang-push-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'yang-push-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[yang-push]'
-
-    # Used by the release job
-    staging-profile-id: a69aae2832869
-
 - project:
     name: yang-push-sonar
     jobs:
index 2e8ec0ae28d08bedc3db1ecd6a6fd08886fe69c4..be65fd219b5c788ef68a3eae8a13348936f2c0c9 100644 (file)
     # Used by the release job
     staging-profile-id: fba306956f98
 
-- project:
-    name: yangide-nitrogen
-    jobs:
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'yangide'
-    project-name: 'yangide'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'yangide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[yangide] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: fba306956f98
-
-- project:
-    name: yangide-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'yangide'
-    project-name: 'yangide'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'yangide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[yangide] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: fba306956f98
-
 - project:
     name: yangide-sonar
     jobs:
index 52320ec7e4ffae063cddd3b5bfc657a97b4123c6..5a68f2b1ecdf6d30c556fdb32561eff381245082 100644 (file)
 
     # Project branches.
     stream:
-      # The tested component was only introduced in Carbon.
       - fluorine:
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml
new file mode 100644 (file)
index 0000000..8792126
--- /dev/null
@@ -0,0 +1,30 @@
+---
+- project:
+    name: yangtools-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'yangtools'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - cluster-netvirt:
+          csit-list: >
+              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-all-{stream}
index 2812b50aafd289c43a1023287d2b8dd08aa3e0f9..0e5ccb848922500275dcb3312f5f2f8640d59aa8 100644 (file)
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'v1.2.x'
-    distribution_branch: 'stable/nitrogen'
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: 1271cf710cc09d
-
-- project:
-    name: yangtools-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: 1271cf710cc09d
-
 - project:
     name: yangtools-sonar
     jobs:
index e3344fc74b1fc3e40cf8f4f7e713047373d9b177..54119a6668c212276639e556ce36ba54c0960f2b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e3344fc74b1fc3e40cf8f4f7e713047373d9b177
+Subproject commit 54119a6668c212276639e556ce36ba54c0960f2b
diff --git a/packer/provision/examples/apache-e-w.yaml b/packer/provision/examples/apache-e-w.yaml
new file mode 100644 (file)
index 0000000..bb84fa1
--- /dev/null
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    name: apacheservice
+    role: service
+  name: apacheservice
+spec:
+  ports:
+    - port: 8800
+      targetPort: 80
+      protocol: TCP
+      name: tcp
+  selector:
+    name: webserver
diff --git a/packer/provision/examples/apache-n-s.yaml b/packer/provision/examples/apache-n-s.yaml
new file mode 100644 (file)
index 0000000..7b774e4
--- /dev/null
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    name: apacheexternal
+    role: service
+  name: apacheexternal
+spec:
+  ports:
+    - port: 8800
+      targetPort: 80
+      protocol: TCP
+      name: tcp
+  selector:
+    name: webserver
+  type: NodePort
diff --git a/packer/provision/examples/apache-pod.yaml b/packer/provision/examples/apache-pod.yaml
new file mode 100644 (file)
index 0000000..cb97d13
--- /dev/null
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: apachetwin
+  labels:
+    name: webserver
+spec:
+  containers:
+  - name: apachetwin
+    image: fedora/apache
diff --git a/packer/provision/examples/busybox.yaml b/packer/provision/examples/busybox.yaml
new file mode 100644 (file)
index 0000000..babb765
--- /dev/null
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: busybox
+  namespace: default
+spec:
+  containers:
+  - image: busybox
+    command:
+      - sleep
+      - "3600"
+    imagePullPolicy: IfNotPresent
+    name: busybox
+  restartPolicy: Always
diff --git a/packer/provision/examples/nginx-pod.yaml b/packer/provision/examples/nginx-pod.yaml
new file mode 100644 (file)
index 0000000..d72959e
--- /dev/null
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: nginxtwin
+  labels:
+    name: webserver
+spec:
+  containers:
+  - name: nginxtwin
+    image: nginx
diff --git a/packer/provision/kubernetes.yaml b/packer/provision/kubernetes.yaml
new file mode 100644 (file)
index 0000000..ecf9e5f
--- /dev/null
@@ -0,0 +1,36 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  vars:
+    openvswitch_version: 2.8.2
+    openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
+    k8s_version: 1.9.4
+
+  pre_tasks:
+    - include_role: name=lfit.system-update
+
+  roles:
+    - lfit.docker-install
+    - fkautz.bridge-utils-install
+    - fkautz.golang-install
+    - fkautz.kubernetes-install
+    - fkautz.openvswitch-install
+
+- hosts: all
+  tasks:
+    - name: Make example directory
+      file:
+        path: /opt/k8s-examples
+        state: directory
+      become: true
+    - name: Copy example files to example directory
+      synchronize:
+        src: ../provision/examples/
+        dest: /opt/k8s-examples/
+      become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true
index 0e9fd5f889be88216632248f7520c156a5b7b6f0..00fa332a78ade462f4e9c5ed2783ed5c704ec680 100644 (file)
@@ -16,7 +16,7 @@
     - include_role: name=lfit.system-update
 
   roles:
-    - mono-install
+    - lfit.mono-install
 
   tasks:
     - name: Install Cassandra Server
index 88509d60ce90d0d1f50e2cdf40b31efd133c76c2..9ab7610d861587ec561a91f833d49aec0067d49c 100644 (file)
@@ -6,7 +6,7 @@
   become_method: sudo
 
   pre_tasks:
-    - include_role: name=system-update
+    - include_role: name=lfit.system-update
 
   tasks:
     - name: Install robot dependencies
diff --git a/packer/provision/roles/coe/requirements.yaml b/packer/provision/roles/coe/requirements.yaml
new file mode 100644 (file)
index 0000000..c4e1b21
--- /dev/null
@@ -0,0 +1,5 @@
+---
+- src: fkautz.bridge-utils-install
+- src: fkautz.openvswitch-install
+- src: fkautz.kubernetes-install
+- src: fkautz.golang-install
diff --git a/packer/provision/templates/odlovs-cni.conf.j2 b/packer/provision/templates/odlovs-cni.conf.j2
new file mode 100644 (file)
index 0000000..3782908
--- /dev/null
@@ -0,0 +1,22 @@
+{
+    "cniVersion": "0.3.0",
+    "name": "odl-cni",
+    "type": "odlovs-cni",
+    "mgrPort": {{ manager_port }},
+    "mgrActive": true,
+    "manager": "{{ manager_ip }}",
+    "ovsBridge": "br-int",
+    "ctlrPort": {{ controller_port }},
+    "ctlrActive": true,
+    "controller": "{{ controller_ip }}",
+    "externalIntf": "{{ external_interface }}",
+    "externalIp": "{{ external_ip }}",
+    "ipam": {
+        "type": "host-local",
+        "subnet": "{{ subnet }}",
+        "routes": [{
+            "dst": "0.0.0.0/0"
+        }],
+        "gateway": "{{ gateway }}"
+    }
+}
diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json
new file mode 100644 (file)
index 0000000..bce854d
--- /dev/null
@@ -0,0 +1,64 @@
+{
+  "variables": {
+    "ansible_roles_path": "roles/coe",
+    "base_image": null,
+    "distro": null,
+    "cloud_auth_url": null,
+    "cloud_user": null,
+    "cloud_pass": null,
+    "cloud_network": null,
+    "cloud_tenant": null,
+    "cloud_user_data": null,
+    "ssh_user": null,
+    "ssh_proxy_host": ""
+  },
+  "builders": [
+    {
+      "name": "vexxhost",
+      "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `base_image`}}",
+      "type": "openstack",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "domain_name": "Default",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
+      "networks": [
+        "{{user `cloud_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "ssh_username": "{{user `ssh_user`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "flavor": "v1-standard-1",
+      "metadata": {
+        "ci_managed": "yes"
+      }
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "common-packer/provision/install-python.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    },
+    {
+      "type": "shell-local",
+      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}} provision/roles/coe/requirements.yaml"
+    },
+    {
+      "type": "ansible",
+      "playbook_file": "provision/kubernetes.yaml",
+      "ansible_env_vars": [
+        "ANSIBLE_NOCOWS=1",
+        "ANSIBLE_PIPELINING=True",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
+        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+        "ANSIBLE_STDOUT_CALLBACK=debug"
+      ]
+    }
+  ]
+}
index 142d492e3c2884d5ca8791815617b5d9c5466f59..c79db5556cff1b95e57b0f1c9fbbb0de0fd1bef3 100644 (file)
@@ -1,5 +1,6 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -50,7 +51,7 @@
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
         "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ]
index 33aa9f6547ebc637d11ea1c3e84a29afc941cfc8..33a85ef03e7664398b2be4c75eb2aa2afa3de801 100644 (file)
@@ -1,5 +1,6 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -50,7 +51,7 @@
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
         "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ]
index 882d9598d785a4274e089448c7bed35dfedb4c5d..ffee4da39744a2ba416135dfb6de61f0f18bae3c 100644 (file)
@@ -1,5 +1,5 @@
 {
-  "base_image": "LF - Ubuntu 14.04 LTS (2017-12-01)",
+  "base_image": "Ubuntu 14.04.5 LTS (2017-12-05) - LF upload",
   "distro": "Ubuntu 14.04",
   "ssh_user": "ubuntu",
   "cloud_user_data": "provision/null_data.sh"
diff --git a/tox.ini b/tox.ini
index 1f08557af6439aa72a091dd8f1435cf641dc5b2e..ad3eb318862cd1cc2fe2b1778348254eac2b07cd 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = coala,docs,pep8,robot
+envlist = coala,docs,pep8,prefix,robot
 skipsdist = true
 
 [testenv:coala]