Merge "Add a prefix variable to defaults as blank"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Wed, 24 Jan 2018 14:57:36 +0000 (14:57 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 24 Jan 2018 14:57:36 +0000 (14:57 +0000)
91 files changed:
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/update-validate-autorelease-projects.sh
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe-csit-openstack.yaml [deleted file]
jjb/coe/coe.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-deploy-offline.sh
jjb/integration/distribution/distribution-deploy-verify.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-install-robotframework.sh
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odl-openstack-check-image-protection.sh [moved from jjb/opendaylight-infra-check-image-protection.sh with 91% similarity]
jjb/odl-openstack-cleanup-old-images.sh [moved from jjb/opendaylight-infra-cleanup-old-images.sh with 59% similarity]
jjb/odl-openstack-cleanup-orphaned-nodes.sh [moved from jjb/opendaylight-infra-cleanup-orphaned-nodes.sh with 91% similarity]
jjb/odl-openstack-cleanup-stale-nodes.sh [moved from jjb/opendaylight-infra-cleanup-stale-nodes.sh with 72% similarity]
jjb/odl-openstack-cleanup-stale-stacks.sh [moved from jjb/opendaylight-infra-cleanup-stale-stacks.sh with 96% similarity]
jjb/odl-openstack-install.sh [new file with mode: 0644]
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovil/ovil.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/packaging.yaml
jjb/packaging/test-rpm-deps.sh
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools.yaml
openstack-hot/generic-server.yaml

index 72a41e37f818401d7c202b9c73b9e2a86ca5e543..e6816390ec3e77384a6656ffb362df5fa6143588 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'aaa'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'aaa'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'aaa'
index a85a816a2733c28a139b0f70177ef6fb510aeace..4527fd8e82a46a8e34f6c76e145911827a669e64 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'alto'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'alto'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'alto'
index d6cb887f65c49ae78d676958a4b65ab34755b249..7a9dad82bd555df5753aaff8492340c7e464c295 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'atrium'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'atrium'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'atrium'
index 172dc106563606613f2284474a36eddc13c6c839..e8d9cae84d79ca9df2a1cade8b7b30806c1e12fa 100644 (file)
       - shell: !include-raw:
           - generate-release-notes.sh
 
+- builder:
+    name: autorelease-update-validate-projects
+    builders:
+      - shell: !include-raw-escape: update-validate-autorelease-projects.sh
+
 - publisher:
     # Search console log for failures and email status to the release mailing list.
     name: opendaylight-infra-notify-status
index 588d9053cde5b5706adcddb2eeb48e2af952d05e..710ee05f64d5f06e16b4a788da9e9654900af343 100644 (file)
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     builders:
-      - shell: !include-raw-escape:
-          - update-validate-autorelease-projects.sh
+      - autorelease-update-validate-projects
       - opendaylight-infra-push-gerrit-patch:
           project: 'releng/builder'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
+      # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
+      - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom
       - maven-target:
           maven-version: mvn33
           pom: pom.xml
index 7fea2910e7cfda0aabb796482601531c6cfd2d95..327fb1abfd45925cb390f4c7a85b7c7a2d066c20 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 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
@@ -14,9 +14,10 @@ BRANCH="stable/${STREAM}"
 
 # The current development release will not have a stable branch defined so if
 # branch does not exist assume master
-wget -nv -O /tmp/ar-branches.json https://git.opendaylight.org/gerrit/projects/releng%2Fautorelease/branches/
-if ! grep "$BRANCH" /tmp/ar-branches.json; then
-    BRANCH=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"
index 6787f0d31dadddd24b560eb8dc72467a10c5f63e..da8da068b937e397a337f8161d561bb3ec7c7e52 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'bgpcep'
@@ -38,8 +38,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bgpcep'
@@ -72,8 +72,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bgpcep'
index 42d3c5c5626e798b06631fbfe22d3e8a23b3e8dc..4cbf059274e28b3495d170af1bd669e6be8ba839 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'bier'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bier'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bier'
index 7549ec42ece9da893f8d0c8f54ea1fd155af6e18..eb31447c670b1ca62a3f5b9f00af3d9de7363c24 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'capwap'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'capwap'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'capwap'
index 7b4460c0154c3c098ea85556c50f3b17f79a9d64..ffc3baa5cd8ad4983250d6c5d41210b36f879ae9 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'cardinal'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'cardinal'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'cardinal'
index 75760159823740c25c85945b2484860c2a19587a..bd045cbf8c55a84962180a7b4474e5868d95349e 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'centinel'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'centinel'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'centinel'
diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml
deleted file mode 100644 (file)
index abef3f7..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: coe-csit-openstack-integration
-    jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'coe'
-
-    topology:
-      - 1node:
-          openstack_system_count: 3
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system_count: 4
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    testplan: '{project}-{topology}-openstack.txt'
-
-    functionality: 'kubernetes'
-
-    stream:
-      - oxygen:
-          branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: '{openstack_system_image_ocata}'
-
-    create-initial-networks: 'True'
-
-    enable-openstack-plugins: 'networking-odl,kuryr-kubernetes,neutron-lbaas'
-
-    enable-openstack-services: >
-        legacy_etcd,docker,q-lbaasv2,kubernetes-api,
-        kubernetes-controller-manager,kubernetes-scheduler,kubelet,kuryr-kubernetes
-
-    disable-openstack-services: 'etcd3'
-
-    lbaas-service-provider: >
-        'LOADBALANCERV2:opendaylight:networking_odl.lbaas.driver_v2.OpenDaylightLbaasDriverV2:default'
index 0d49e9b7f378a80fd2384fe4449b7ab46bb6148e..bda82a85650d2838fb5792f38106569005c47381 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
@@ -55,7 +55,7 @@
     name: coe-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
index 327799ab2137ce68c02ab6a23ac2a7509a5fc2e8..78631d214483fa96dcb6bc78a0f827e95912b9ba 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'controller'
@@ -32,7 +32,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'controller'
@@ -58,7 +58,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'controller'
index e392ba515ab8148785e4d9c921401ef7f4751c05..ae09f245f37c302bc9b671ee58ef95fc3154f17c 100644 (file)
@@ -3,7 +3,7 @@
     name: coretutorials-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'coretutorials'
@@ -29,7 +29,7 @@
     name: coretutorials-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'coretutorials'
@@ -55,7 +55,7 @@
     name: coretutorials-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'coretutorials'
@@ -90,4 +90,3 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-timeout: 120
-
index 5c13c798bcae7337ce1d402384bff315871ec71f..96ad5278112ede7a88938e7cd14d7c5f13836d9e 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
index c2249a2894651b1f2a5c7e585c84a378982a765b..de560eea33235465d9ff932912ee0401e9e7d013 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'didm'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'didm'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'didm'
index 76a63f8d7434f0079e57d07a4d29d5dcc70b647f..e6ab39ea958f252bd7f08926f074028b235c7baf 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'dlux'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'dlux'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'dlux'
index 88c1c4b2abf004610b05986858f01297efee9263..0b479d155aa46de9129f3895dee5c511f3b16238 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
index f889912ee04b09af05ed6dfb6d5ce5f5a10e3346..df4f24a342ad23696368115c88cb080152ee1029 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'eman'
@@ -32,8 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'eman'
@@ -60,8 +60,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'eman'
index e1bfa4d312db1f75a1b802655522be35578de88a..af7804f42dde5da812191bbcffa6b5567c155ebf 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'faas'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'faas'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'faas'
index 3482598c52021ac08d9985bbc20a5891472e0e2c..b4180e1b32ee93012aef3dfab9a5cd582fc1a4b7 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
@@ -31,8 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
@@ -58,8 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
index 5e21d81bb2e0a83a018c203c81809744f3282619..a11bd16a71d4b15245a6709c7a227a893f6a3f16 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'genius'
@@ -37,7 +37,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'genius'
@@ -68,7 +68,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'genius'
index c1873360fa7455fdb690c6235923d7eb68e30ec6..a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c1873360fa7455fdb690c6235923d7eb68e30ec6
+Subproject commit a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e
index bf28b0175e40a848bab9941bcd477a567e416dd5..dcf6c8ccc73d56e50ac831308f084c95a24c3d0d 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'groupbasedpolicy'
@@ -36,7 +36,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'groupbasedpolicy'
@@ -67,7 +67,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'groupbasedpolicy'
index d6459caa00af6a0053e524702a4fdce06e303f1d..157660f36491897981b938f7c899925b4f0d7bdf 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'honeycomb/vbd'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'honeycomb/vbd'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'honeycomb/vbd'
index 5b26154e4f9fb213dcb090fc03d39abc9c24ca72..77fe7e4b34a7da9ddc35aacf5b0ccba4672fa4f9 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'infrautils'
@@ -31,7 +31,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'infrautils'
@@ -57,7 +57,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'infrautils'
index 720331ad194975050a743ff7d929d4f8e538f7c5..2a333dea772f553e762e41d85cdced555f814f81 100644 (file)
@@ -20,10 +20,13 @@ unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-# Add test feature repo if Karaf 4.
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Add actual boot features.
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
index 570f0617c3d948068e7363782afd49efb86e653f..e7920b5346b066c5d16ad8e8696a73ac72f4ccad 100644 (file)
@@ -15,10 +15,13 @@ unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-# Add test feature repo if Karaf 4.
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Feature is instaled later.
 cat "${FEATURESCONF}"
 
index a29a575993fe65c6f5e9952bbadb77dcb6cc4cbc..c81ac6db6734fd7472c28236fe801a4ead40a633 100644 (file)
@@ -14,11 +14,14 @@ echo "Extracting the new controller..."
 unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
-FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-# Add test feature repo if Karaf 4.
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}"
+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}"
index 89dd8e9aa1c239a4d40ee1a4872c50a3b4de6139..5b1db13ec908f13a2ccd58676d2918d611fe6c38 100644 (file)
@@ -71,7 +71,13 @@ cat ${MAVENCONF}
 
 echo "Configuring the startup features..."
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
 cat ${FEATURESCONF}
 
 echo "Configuring the log..."
index b56e4958afe3367712d7a923356757add7d19ee3..c6beeed410da498e9cccb2a5dc1db1b0ee6ab7fd 100644 (file)
@@ -64,10 +64,8 @@ if [[ "$USEFEATURESBOOT" == "True" ]]; then
     sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
 fi
 
-FEATURE_INDEX_STRING="features-integration-index"
 FEATURE_TEST_STRING="features-integration-test"
 if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_INDEX_STRING="features-index"
     FEATURE_TEST_STRING="features-test"
 fi
 
index 8fa57c7f36df81cf6b1525c048b653441e988b5b..4076e47de796da36c7005e63b83ef7cf694a70b9 100644 (file)
@@ -7,6 +7,7 @@ source ${ROBOT_VENV}/bin/activate
 PYTHON="${ROBOT_VENV}/bin/python"
 SSH="ssh -t -t"
 ADMIN_PASSWORD="admin"
+OPENSTACK_MASTER_CLIENTS_VERSION="pike"
 
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
 echo "showing recent changes that made it in to the distribution used by this job"
@@ -98,6 +99,38 @@ function create_etc_hosts() {
     cat ${WORKSPACE}/hosts_file
 } # create_etc_hosts()
 
+#function to install Openstack Clients for Testing
+#This will pull the latest versions compatiable with the
+# openstack release
+function install_openstack_clients_in_robot_vm() {
+    packages=("python-novaclient" "python-neutronclient" "python-openstackclient")
+    for plugin_name in ${ENABLE_OS_PLUGINS}; do
+        if [ "$plugin_name" == "networking-sfc" ]; then
+            packages+=("networking-sfc")
+        fi
+    done
+    openstack_version=$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)
+    #If the job tests "master", we will use the clients from previous released stable version to avoid failures
+    if [ "${openstack_version}" == "master" ]; then
+       openstack_version=${OPENSTACK_MASTER_CLIENTS_VERSION}
+    fi
+    for package in ${packages[*]}; do
+       echo "Get the current support version of the package ${package}"
+       wget https://raw.githubusercontent.com/openstack/requirements/stable/${openstack_version}/upper-constraints.txt -O /tmp/constraints.txt 2>/dev/null
+       echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt"
+       $PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt
+       echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt"
+       $PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt
+    done
+
+    if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+        #networking-l2gw is not officially available in any release yet. Gettting the latest stable version.
+        $PYTHON -m pip install networking-l2gw
+    fi
+}
+
+
+
 # convert commas in csv strings to spaces (ssv)
 function csv2ssv() {
     local csv=$1
@@ -158,7 +191,7 @@ NEUTRON_CREATE_INITIAL_NETWORKS=${CREATE_INITIAL_NETWORKS}
 
 ODL_MODE=manual
 ODL_MGR_IP=${MGRIP}
-ODL_PORT=8080
+ODL_PORT=${ODL_PORT}
 ODL_PORT_BINDING_CONTROLLER=${ODL_ML2_PORT_BINDING}
 ODL_OVS_MANAGERS=${ODL_OVS_MANAGERS}
 
@@ -252,10 +285,6 @@ minimize_polling=True
 physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400
 path_mtu = 1458
 
-# workaround for port-status not working due to https://bugs.opendaylight.org/show_bug.cgi?id=9092
-[ml2_odl]
-odl_features=nothing
-
 [[post-config|/etc/neutron/dhcp_agent.ini]]
 [DEFAULT]
 force_metadata = True
@@ -302,7 +331,7 @@ Q_ML2_TENANT_NETWORK_TYPE=${TENANT_NETWORK_TYPE}
 
 ODL_MODE=manual
 ODL_MGR_IP=${MGRIP}
-ODL_PORT=8080
+ODL_PORT=${ODL_PORT}
 ODL_PORT_BINDING_CONTROLLER=${ODL_ML2_PORT_BINDING}
 ODL_OVS_MANAGERS=${ODL_OVS_MANAGERS}
 
@@ -484,6 +513,8 @@ EOF
     # archives build step will essentially be a noop.
     mkdir -p ${WORKSPACE}/archives
 
+    mv /tmp/changes.txt ${WORKSPACE}/archives
+
     sleep 5
     # FIXME: Do not create .tar and gzip before copying.
     for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
@@ -752,6 +783,7 @@ else
 fi
 
 RECLONE=False
+ODL_PORT=8181
 
 # Always compare the lists below against the devstack upstream ENABLED_SERVICES in
 # https://github.com/openstack-dev/devstack/blob/master/stackrc#L52
@@ -1181,6 +1213,9 @@ else
     SUITES=${newsuites}
 fi
 
+#install all client versions required for this job testing
+install_openstack_clients_in_robot_vm
+
 # TODO: run openrc on control node and then scrape the vars from it
 # Environment Variables Needed to execute Openstack Client for NetVirt Jobs
 cat > /tmp/os_netvirt_client_rc << EOF
@@ -1198,6 +1233,17 @@ EOF
 
 source /tmp/os_netvirt_client_rc
 
+echo "Get all versions before executing pybot"
+echo "openstack --version"
+which openstack
+openstack --version
+echo "nova --version"
+which nova
+nova --version
+echo "neutron --version"
+which neutron
+neutron --version
+
 echo "Starting Robot test suites ${SUITES} ..."
 # please add pybot -v arguments on a single line and alphabetized
 suite_num=0
index d43f2d32b0e0c7dc81f2a15c64e7e9a178b6bc3d..48d5f84f317847e950771dd7de1e9838ad75cf24 100644 (file)
@@ -55,19 +55,6 @@ pip install --upgrade jmespath
 # Module for backup-restore support library
 pip install --upgrade jsonpatch
 
-# Module OpenstackClient is needed for Netvirt CSIT jobs
-# Module networking-l2gw is required for using l2gw commands with neutron client
-# Module python-neutronclient is needed for certain tests run with Openstack Newton
-#  that does not work with Openstack Client
-# Module pyhon-novaclient is installed as a dependency of openstackclient, but the
-#  latest version (v10.0.0) has some problem with "server add floating ip" that is
-#  not there with v9.0.0, so pinning it to that for now
-pip install python-openstackclient
-pip install networking-l2gw==11.0.0
-pip install python-neutronclient==6.1.0
-pip install networking-sfc
-pip install --upgrade python-novaclient==9.0.0
-
 # Print installed versions.
 pip install --upgrade pipdeptree
 pipdeptree
index 3138be8365f0a4008826d608dd7522f30bae757f..c2c135ab62735e5858a2e3ffeb331880229e6ad1 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'iotdm'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'iotdm'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'iotdm'
index 8be6bef2321ba6d0fd40f8fb402375cd7a37d334..48cb51f350bfbebd0924e95a8b9872eb1ea91411 100644 (file)
@@ -3,7 +3,7 @@
     name: jsonrpc-fluorine
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -28,7 +28,7 @@
     name: jsonrpc-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -53,7 +53,7 @@
     name: jsonrpc-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -78,7 +78,7 @@
     name: jsonrpc-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
index 24535bbee3949055957bb7a0d95874bdd1e65bc2..f203d89595c71d0d66c102419fe58cad0e222e52 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'l2switch'
@@ -35,7 +35,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'l2switch'
@@ -66,7 +66,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'l2switch'
index 432afc945844daa8b2d8034d42e6c331b6516cad..72c8ca70bf451829a1792bb49decbf754aa65a03 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'lacp'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'lacp'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'lacp'
index 0cfe21a30497e942fc27eefbd09c52fb45d5604f..582621eeca1d1209d84b9b5fa1673bbfbab1fe71 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'lispflowmapping'
@@ -35,8 +35,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'lispflowmapping'
@@ -66,8 +66,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'lispflowmapping'
index b45f6641b4440d00b23814081d6c0eac7ecabae8..79e498ce1cbdfdbed60c5d9960480f61917722c4 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'mdsal'
@@ -32,8 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'mdsal'
@@ -59,8 +59,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'mdsal'
index 60c15f857ece337e00744a2b497bf1b4e32baefc..5c6f81e309ca3975d3a75881cdd1b079b4aaac7a 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'messaging4transport'
@@ -31,8 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'messaging4transport'
@@ -58,8 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'messaging4transport'
index 166100f5df8ff0b5d359940b2148ccd8012e3cfc..0232969673e10dfa7a017d1429eeee561a0c1211 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'natapp'
@@ -31,8 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'natapp'
@@ -58,8 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'natapp'
index 8a9c37ae770713d55c07256cee8dc245961898b7..0b37f358eb655b91b30a79b1323b63ca00ea6f31 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'nemo'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'nemo'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'nemo'
index 575d9c0252915dc72f161c651e35e29a8f800600..806cd5ee7ec880ddcfbd9106ee89a3f734bf785e 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netconf'
@@ -31,7 +31,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netconf'
@@ -57,7 +57,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netconf'
index 1ee7e512d4410572fe7c8f0ff47038316d93a5aa..318b15c508a821d628ff48df3ed650a429931876 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netide'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netide'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netide'
index 061d222d80ebec45494f792412f8c56fa4ad67cc..846501688c4bcbe947a96b765cbd2b7803039be5 100644 (file)
@@ -4,9 +4,9 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-tox-verify
+      - odl-maven-jobs
 
     stream:
       - oxygen:
index b079366079c65892433693659fca38c69f474e25..3f3de316aeb5e33e23946ae2411fe65dda34206f 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'neutron'
@@ -32,8 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'neutron'
@@ -60,8 +60,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'neutron'
index 4f413844ae66515868dbc778c1b438a0c8ba0fd9..36c1d21e9fe2fa84b043052d120f0015ca00be81 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'next'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'next'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'next'
index 12cd1473be53d44ee4e605453de32efeffb3b6e4..0af5510cd60367752d30d7f0b128eaf3f251f169 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'nic'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'nic'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'nic'
index ae0c75ad2a5148bb957f871c461da371ea88df23..9865f61af49e341334171b1d3d040362fe61bdc3 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ocpplugin'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ocpplugin'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ocpplugin'
similarity index 91%
rename from jjb/opendaylight-infra-check-image-protection.sh
rename to jjb/odl-openstack-check-image-protection.sh
index df660c96a9996cfb612d27d30c5e3e0dd8e8cb82..980e70e15f798f28feaea8c65f41d8845897dfe7 100644 (file)
@@ -8,7 +8,6 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-
 # Checks the image "protected" value and set "True" marker
 #
 # The script is involked by 'builder-verify-image-protection', searches
 # setting. If the image protect setting is not "True", sets the
 # image protect setting to "True" to prevent the image from getting purged
 # by the cleanup old images job.
+echo "---> Check image protection"
 
-virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
-pip install --upgrade python-openstackclient
-pip install --upgrade pipdeptree
-pipdeptree
 
 declare -a images
 readarray -t images <<< "$(grep -r _system_image: --include \*.yaml \
similarity index 59%
rename from jjb/opendaylight-infra-cleanup-old-images.sh
rename to jjb/odl-openstack-cleanup-old-images.sh
index 6483788bc2b9a8df507a3ec27a576b71a0470684..db639d1a4dca5e3b7e13b209dd7a1bd4895c592f 100644 (file)
@@ -1,13 +1,16 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 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
 ##############################################################################
+# Removes openstack images older than 30 days in the cloud
+echo "---> Cleanup old images"
 
-lftools openstack --os-cloud vex \
-    image cleanup --days=30
+# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
+source "/tmp/v/lftools/bin/activate"
+lftools openstack --os-cloud vex image cleanup --days=30
similarity index 91%
rename from jjb/opendaylight-infra-cleanup-orphaned-nodes.sh
rename to jjb/odl-openstack-cleanup-orphaned-nodes.sh
index 1a832fe092782c4f3dd0d7f32c8cc0ba57e96d29..953dadc81cded07e11715ce8beb1f77d54e9fa56 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 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
 ##############################################################################
 echo "---> Cleanup orphaned servers"
 
-virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
-pip install --upgrade python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
 
 minion_in_jenkins() {
     # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
similarity index 72%
rename from jjb/opendaylight-infra-cleanup-stale-nodes.sh
rename to jjb/odl-openstack-cleanup-stale-nodes.sh
index 2ec19ee8e3736aea19636874b675fcba91203e65..ddd104180613badd389c4da532de706874a6da05 100644 (file)
@@ -1,13 +1,14 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 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
 ##############################################################################
+echo "---> Cleanup stale nodes"
 
 # 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
@@ -15,7 +16,7 @@
 # 24H timeout in place for all jobs therefore all jobs are expected to complete
 # within the timeout.
 
-lftools openstack --os-cloud vex \
-    server list --days=1
-lftools openstack --os-cloud vex \
-    server cleanup --days=1
+# 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
similarity index 96%
rename from jjb/opendaylight-infra-cleanup-stale-stacks.sh
rename to jjb/odl-openstack-cleanup-stale-stacks.sh
index 6f00ac81b3ad063da702322a82a86cc67b1db59c..16559c9feb8c5a3079a0415a579808b071899f1a 100644 (file)
 # Cleanup stale stacks in the cloud
 # Requires the variable JENKINS_URLS declared in the job as a space separated
 # list of Jenkins instances to check for active builds.
+echo "---> Cleanup stale stacks"
 
-virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
-pip install --upgrade python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
 
 stack_in_jenkins() {
     # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
diff --git a/jjb/odl-openstack-install.sh b/jjb/odl-openstack-install.sh
new file mode 100644 (file)
index 0000000..adf7d92
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017, 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
+##############################################################################
+# Installs the openstack cli to /tmp/v/openstack
+echo "---> Install openstack cli into /tmp/v/openstack"
+
+virtualenv "/tmp/v/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
+pip install --upgrade pip
+pip install --upgrade python-openstackclient python-heatclient
+pip install --upgrade pipdeptree
+pipdeptree
index a1e295cfce930f66d56f30c891ba913a907edecc..ab9c75ce8fa2a4bfa666cbf4b7d8614ce992c145 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
+- project:
+    name: odlparent-3.1.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 3.1.x
+    branch: 3.1.x
+    distribution_branch: master
+
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: mvn33
+    mvn-settings: odlparent-settings
+    mvn-goals: clean install
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: >
+        **/*.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-3.0.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 3.0.x
+    branch: 3.0.x
+    distribution_branch: master
+
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: mvn33
+    mvn-settings: odlparent-settings
+    mvn-goals: clean install
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: >
+        **/*.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-2.0.x
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     stream: carbon
index ab6c67a89b40ab759e512f3bc5cbd19e5bc0ad88..7677ec6762530cb9abab13e68763cec4d9fe48f8 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'of-config'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'of-config'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'of-config'
index 1f892da2846febce78094d72240097ae54230da6..66bfcae955ae94def68574b7a918a826500f8ae1 100644 (file)
@@ -3,7 +3,7 @@
     name: circuitsw-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ofextensions/circuitsw'
@@ -28,7 +28,7 @@
     name: circuitsw-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ofextensions/circuitsw'
@@ -53,7 +53,7 @@
     name: circuitsw-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ofextensions/circuitsw'
index 5d7df78f32c85c2b2a72a1f12366e428c3220aea..c2a080e1d8072cd51b7bad095a4bd3ad2bb2d5e6 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowjava'
@@ -31,8 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowjava'
index e82bc6b662bcee7c040df2d6c36f174e71fac9df..fcb6ef944e3745d8116e74491be55eb6b22121e6 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'openflowplugin'
@@ -36,8 +36,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowplugin'
@@ -67,8 +67,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowplugin'
index ba3a55032da8a2cded3c19edb282c9e97c0bc7dd..2e5d81414dfaba3474c0e028eb2ce54f13ad0568 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: ovil
     jobs:
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: ovil
index 476b606f29249fe8c01ac25fb04e3e6a5a48e31c..a87a43b988d7f070f42fdac32520fe331cb48867 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ovsdb'
@@ -31,8 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ovsdb'
@@ -58,8 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ovsdb'
index 1b77e5f939f8113323069bf4ed1e1e1bc0bd4d53..985d6b25e0f08a26c310b15b6662fc21374d1d46 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'p4plugin'
index 5012648af14e3bbd8f383377db19c2fd7c8efb47..664380505825896c1537d22a25cde0bbcc647ff4 100644 (file)
@@ -12,7 +12,9 @@
       - 'packaging-test-rpm-master'
       - 'packaging-test-rpm-upgrade-master'
       - 'packaging-test-deb-master'
-      - gerrit-tox-verify
+      - gerrit-tox-verify:
+          branch: master
+          stream: master
 
     project: 'integration/packaging'
 
index 6def490d0721d740f4215ee6ab3ca72979f3b0b5..460bdaeed14f7d78e72aeacfa5871cf0816057d2 100644 (file)
@@ -8,8 +8,12 @@ set -ex -o pipefail
 
 # Verify exactly 1 RPM is in the path we expect
 set -- /home/$USER/rpmbuild/RPMS/noarch/*.rpm
-# shellcheck disable=SC1054
-[ $# -eq 1 ] || {{ echo "Expected 1 RPM, found $#"; exit 1; }}
+if [ $# -eq 1 ]; then
+    echo "Found one RPM in build out dir, as expected"
+else
+    echo "Expected 1 RPM, found $#"
+    echo 1
+fi
 
 # If path is globbed (/path/to/*.rpm), expand it
 path=$(sudo find / -wholename /home/$USER/rpmbuild/RPMS/noarch/*.rpm)
index cbea081f881d4babcef6b342c493739e28795a95..afdf9373d5461740474a1bffac1923d8551076f5 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'packetcable'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'packetcable'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'packetcable'
index 0c0db87cfd5979b7c4deda80c5ef9052b835ff30..d89c48f5b92f4ace7b69b46fda089d38c3f0a05b 100644 (file)
@@ -3,7 +3,7 @@
     name: persistence-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'persistence'
@@ -30,7 +30,7 @@
     name: persistence-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'persistence'
@@ -57,7 +57,7 @@
     name: persistence-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'persistence'
index f6508f4090ab6623cbf1c9c8f0f89ec53b526d9c..bf8f32c41708b829556e14915f0b9c4521593d57 100644 (file)
@@ -6,13 +6,8 @@
           build-node: centos7-builder-2c-2g
       - builder-check-poms
       - builder-copy-sandbox-logs
+      - builder-openstack-cron
       - gerrit-tox-verify
-      # OpenStack Related
-      - 'builder-verify-image-protection'
-      - 'builder-cleanup-old-images'
-      - 'builder-delete-orphaned-nodes'
-      - 'builder-delete-stale-nodes'
-      - 'builder-delete-stale-stacks'
       # Automation for docs and jobs
       - 'builder-update-image-list'
 
@@ -26,6 +21,9 @@
     archive-artifacts: '**/*.log'
     build-timeout: 30
     jjb-version: 2.0.0
+    jenkins-urls: >
+      https://jenkins.opendaylight.org/releng
+      https://jenkins.opendaylight.org/sandbox
 
 - project:
     name: packer-jobs
@@ -48,7 +46,7 @@
       - devstack-pre-pip-newton:
           build-timeout: 75
       - devstack-pre-pip-ocata:
-          build-timeout: 60
+          build-timeout: 75
       - devstack-pre-pip-pike:
           build-timeout: 75
       - gbp
 
 
 - job-template:
-    name: 'builder-verify-image-protection'
-    project-type: freestyle
-    node: centos7-builder-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git-scm:
-          branch: '{branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-      # Listed after to override openstack-infra-wrappers clouds.yaml definition
-      - config-file-provider:
-          files:
-            - file-id: clouds-yaml
-              target: '$HOME/.config/openstack/clouds.yaml'
-
-    triggers:
-      - timed: '@daily'
-
-    builders:
-      - shell: !include-raw-escape:
-          - opendaylight-infra-check-image-protection.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: 'builder-cleanup-old-images'
+    name: builder-openstack-cron
     project-type: freestyle
-    node: centos7-builder-2c-1g
+    node: '{build-node}'
 
     properties:
-      - opendaylight-infra-properties:
+      - lf-infra-properties:
           build-days-to-keep: 7
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          lftools-version: '{lftools-version}'
+      - string:
+          name: OS_CLOUD
+          default: '{os-cloud}'
+          description: Artifacts to archive to the logs server.
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+      - string:
+          name: JENKINS_URLS
+          default: '{jenkins-urls}'
+          description: 'Space separated list of Jenkins URLs to check for active builds'
 
     scm:
       - git-scm:
           branch: '{branch}'
 
     wrappers:
-      - opendaylight-infra-wrappers:
+      - lf-infra-wrappers:
           build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Cleanup images on a weekly schedule
-      - timed: '@weekly'
-
-    builders:
-      - shell: !include-raw-escape:
-          - global-jjb/shell/lftools-install.sh
-          - opendaylight-infra-cleanup-old-images.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: builder-delete-orphaned-nodes
-    project-type: freestyle
-    node: centos7-builder-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - string:
-          name: JENKINS_URLS
-          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up servers every 30 mins in case we have orphaned servers
       - timed: '0,30 * * * *'
 
     builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-orphaned-nodes.sh
+      - odl-openstack-install
+      - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh
+      # Servers
+      - odl-openstack-cleanup-stale-stacks
+      - odl-openstack-cleanup-stale-nodes
+      - odl-openstack-cleanup-orphaned-nodes
+      # Images
+      - odl-openstack-check-image-protection
+      - odl-openstack-cleanup-old-images
 
     publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
       - lf-infra-publish
 
-
-- job-template:
-    name: 'builder-delete-stale-nodes'
-    project-type: freestyle
-    node: centos7-builder-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape:
-          - global-jjb/shell/lftools-install.sh
-          - opendaylight-infra-cleanup-stale-nodes.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: 'builder-delete-stale-stacks'
-    project-type: freestyle
-    node: centos7-builder-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - string:
-          name: JENKINS_URLS
-          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up stacks every 30 mins in case we have orphaned stacks
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
index 1a69611b45a805154832ed23c8440ddf53a3677d..016c65afb5a0ce9934e3f9cdbe42ec197ae80f35 100644 (file)
           send-to:
             - recipients
 
+
+- builder:
+    # Installs the openstack cli into a virtualenv at /tmp/v/openstack
+    name: odl-openstack-install
+    builders:
+      - shell: !include-raw: odl-openstack-install.sh
+
+- builder:
+    name: odl-openstack-check-image-protection
+    builders:
+      - shell: !include-raw: odl-openstack-check-image-protection.sh
+
+- builder:
+    name: odl-openstack-cleanup-old-images
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-old-images.sh
+
+- builder:
+    name: odl-openstack-cleanup-orphaned-nodes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-orphaned-nodes.sh
+
+- builder:
+    name: odl-openstack-cleanup-stale-nodes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-nodes.sh
+
+- builder:
+    name: odl-openstack-cleanup-stale-stacks
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh
+
 - builder:
     # Deploys a maven site to Nexus using lftools nexus-zip command
     name: opendaylight-infra-deploy-maven-site
index f64aa99f3329622874585309262f15ca8336cb03..d697e548facaddf53fbe58f9d1859669181a7b09 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- job-group:
+    name: odl-maven-jobs
+
+    jobs:
+      - gerrit-maven-clm
+
+      - gerrit-maven-merge:
+          post_build_trigger:
+            - project:
+                - 'distribution-merge-{stream}'
+              condition: SUCCESS
+              trigger-with-no-params: true
+
+      - gerrit-maven-release
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
index c551d402b57dbb70c5f0bc5c04e7729585140e8b..1e32c5d215fb6df24902daf122591b8518a2d3cd 100644 (file)
@@ -3,7 +3,7 @@
     name: reservation-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'reservation'
@@ -28,7 +28,7 @@
     name: reservation-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'reservation'
@@ -53,7 +53,7 @@
     name: reservation-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'reservation'
index 704e1c78975a37342f7a0d4688076be6dbd1a7ac..90d2d5aa51c2cd2e39b9d2a686b0e36259de03d6 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sdninterfaceapp'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sdninterfaceapp'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sdninterfaceapp'
index 3da3c1efa30e53db7f133a00f5c2a5727bb8f0f7..972f346a217eaf762da8cbfe1547e1ac909e8c18 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sfc'
@@ -32,7 +32,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sfc'
@@ -59,7 +59,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sfc'
index 1b17aa4b3e4e7df8737c71c9be463cbbb3d76891..6958d317b28040012d3063ffbca832260d4c4941 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snbi'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snbi'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snbi'
index 6cc6f8a1c00989c83b41b2d0c9621f872f5e2612..c73acb1be656456653b288aca1227a94e4ff1a8d 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snmp'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snmp'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snmp'
index f435a1c6f9754b00c77a61b8b22a5cd94f928ff8..b291290359abd6e26aac06e780626fe7a66d367d 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snmp4sdn'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snmp4sdn'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snmp4sdn'
index c7df7401770328362493b1139b10757f1810b1de..a74ba2d59564fac992e307bb4d457b70e6d38e45 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sxp'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sxp'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sxp'
index b38ae2e4db4a13d0a167fd88dda090f9a184d629..88514e606c22d9a6384fb66046498621e3b29cd3 100644 (file)
@@ -3,7 +3,7 @@
     name: systemmetrics-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
@@ -28,7 +28,7 @@
     name: systemmetrics-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
@@ -53,7 +53,7 @@
     name: systemmetrics-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
index 47974a4955fc394574806d61c15c636106ac09d7..6c78c55e2cf5545a7790ae751e1377705ef9234f 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'topoprocessing'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'topoprocessing'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'topoprocessing'
index bddccb90f1b54b8361830caea2452853c9fb70fc..a905cf964ee932339d8480ccad55846251af2173 100644 (file)
@@ -3,7 +3,7 @@
     name: transportpce-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
@@ -28,7 +28,7 @@
     name: transportpce-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
@@ -53,7 +53,7 @@
     name: transportpce-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
index a0594e289ce56b84ee79454f5cb660af5cfe926b..d1cae2d6a15af955fb5850b3d35b9ab4163e6e4c 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'tsdr'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'tsdr'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'tsdr'
index 3375a869ba70b5ae8197044b14543c5f9cba99cf..41de1a0dde1892ba3cab46fb1ee0f727d836c812 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ttp'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ttp'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ttp'
index 8613b63ac81bc81ae91a016af117d6802302dfcc..10f6028891e456a350418770ae510b82226914ca 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'unimgr'
@@ -31,7 +31,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'unimgr'
@@ -58,7 +58,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'unimgr'
index 7ab9c71b68f833a67cee6952d54f70e542db6fe8..86b4017fef51d6c38652123f26ac34f79140b756 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'usc'
@@ -31,8 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'usc'
@@ -58,8 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'usc'
index 43c14a22d0b179210425b6277adc203956d9faaa..1efca00c4429260e513b98ab9d730806e337b9c7 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'usecplugin'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'usecplugin'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'usecplugin'
index 69abc18b28be5b47a379f482e395d3cfee61e6a3..844a26552d370151614af41b90583e00f60f2f45 100644 (file)
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'vtn'
@@ -35,8 +35,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'vtn'
@@ -66,8 +66,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'vtn'
index 952f813c43ec21a06cbe272f1455fd0c9727f127..fc38e865bbb090e646dace59d4cee31627ca7982 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'yang-push'
@@ -30,7 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yang-push'
@@ -56,7 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yang-push'
index fbc83d82460b01c843e335a65f4dd90f2606ca2b..cd0617c9ca574738702cb2858f979ed0cb9e58cd 100644 (file)
@@ -3,7 +3,7 @@
     name: yangide-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'yangide'
@@ -28,7 +28,7 @@
     name: yangide-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yangide'
@@ -53,7 +53,7 @@
     name: yangide-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yangide'
index 910746e5ec161e8fe396624afff7886ba263d884..2a67a52d72978a538cf4252317d9ccf72ee2645d 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: yangtools
     project-name: yangtools
@@ -38,8 +38,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yangtools'
@@ -74,8 +74,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yangtools'
index 81b102cb7100d69f242864eb601a3d2359578561..f4cbb5cddf416214c37a02a1405aaae91a0b238b 100644 (file)
@@ -33,6 +33,12 @@ parameters:
         description: VM Image to spin up
 
 resources:
+    port:
+        type: "OS::Neutron::Port"
+        properties:
+            allowed_address_pairs:
+                - ip_address: 10.250.0.0/24
+            network: odlci
     volume:
         type: "OS::Cinder::Volume"
         properties:
@@ -58,7 +64,7 @@ resources:
                         "GROUP": {get_param: group}
                         "INDEX": {get_param: index}
             networks:
-                - network: odlci
+                - port: {get_resource: port}
             key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash