Merge "Update Ansible playbooks to new names"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Fri, 26 Jan 2018 05:00:29 +0000 (05:00 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 26 Jan 2018 05:00:29 +0000 (05:00 +0000)
140 files changed:
check_prefix.sh [new file with mode: 0755]
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/alto/alto-csit-setup.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/update-validate-autorelease-projects.sh
jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap-csit-ac.yaml
jjb/centinel/centinel-csit-basic.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-periodic-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/didm/didm-csit-discovery.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-templates.yaml
jjb/iotdm/iotdm-csit-basic.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/natapp/natapp-csit-basic.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/netconf/netconf-cluster-stress.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/nic/nic-csit-basic.yaml
jjb/ocpplugin/ocpplugin-csit-basic.yaml
jjb/ocpplugin/ocpplugin-csit-scalability.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-csit-basic.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/p4plugin/p4plugin-csit-basic.yaml
jjb/packaging/build-rpm.sh
jjb/packaging/install-rpm.sh
jjb/packaging/packaging-macros.yaml [new file with mode: 0644]
jjb/packaging/packaging.yaml
jjb/packaging/test-rpm-deps.sh
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/unimgr/unimgr-csit-basic.yaml
jjb/unimgr/unimgr-csit-legato.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/vtn/vtn-csit-3node-manager.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml
jjb/vtn/vtn-patch-test.yaml
jjb/yangtools/yangtools-csit-system.yaml
tox.ini

diff --git a/check_prefix.sh b/check_prefix.sh
new file mode 100755 (executable)
index 0000000..87a8427
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# Ensures that the prefix MUST be set to blank
+#
+# The production prefix MUST always be a blank string.
+
+if grep 'prefix:' jjb/releng-defaults.yaml | grep -v "''"; then
+    echo "ERROR: A non-blank prefix is defined in jjb/releng-defaults.yaml"
+    echo "The prefix MUST be set to blank '' in production!"
+    exit 1
+fi
index 8b5bec7c4750b5b20524b6e521f80de0a86ce689..f4a0125c572f9dba0192af9aaeb0daf6be41cbe0 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: aaa-csit-authn
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'
index 9d699a59d09ffae021ebe6980c04419b11f75912..5f898174fb622677be960b459b7967cae9384882 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: aaa-csit-keystone
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'
index c9f009f143ca9dd6adf8a3856e285e6a8127f44c..7898be6599cdc85ac21db78a0ca0e24287b4aec3 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: aaa-csit-tls
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'aaa'
index b826a5e39021bd60d235668d67217e58d974ba1b..48a261785e6919b0da0ad39a09ff0992bf602789 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: aaa-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'aaa'
index 03d08d4404ac37ed191dd09b73ce064f6fc4c5ff..172f7506b37af3e19340f8b80094ba3f09d00698 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: alto-csit-setup
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'alto'
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 a9b0a373feba04013c82ff6ca58986bfd7d861b3..6ba9f0ed5474b439c5a4446574dff43aa3498759 100644 (file)
@@ -4,7 +4,7 @@
     jobs:
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}':
-          build-node: centos7-autorelease-8c-16g
+          build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 3dfe884835470c2a48da3a18dcbc9745cbbf665f..bf56baa918d62a799969bb47936a9d48a54daea0 100644 (file)
@@ -7,7 +7,7 @@
     # Defaults #
     ############
 
-    build-node: centos7-autorelease-8c-16g
+    build-node: '{build-node}'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
           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}'
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 6c186784e8147541e61e612821421707cb034ce3..2f5cbf60ba85c630e4d9defe136d668aa9bbfe4e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-gate-bgp-ingest-mixed
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'bgpcep'
index 92a150ae999ac707c933edcc9c2759bfc8d850ef..dc8bd41a11521d94cf4c54a99f19995d4de0559f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
index a7e10c9a700ffa60afc17044848113d7d5101997..f835ad75778a19ba174eae39de615a9d0e7481cb 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
index 2ba4c45cacf67076f2dfad516eda5a542678dec5..3f5f7270fa8087d994683174402ccd42dbe2d195 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-ha
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'bgpcep'
index a6ea709fe5933adab1fb944a9fe11f830c285e31..3d7a48cba3faa9a1e8180136d58c8177ba28c14d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'
index d3ff23c59c9e294de64d1f2c0b74550854dd4a26..43a1ef1881f92e401b6605acf28cc0485a917528 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'bgpcep'
index 8df34f773616ea175eda8446b65c8f8fb2cf723e..c8566b3bfe4a5d7d1aa5d29f3aaafc813aa5cc90 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-gate-throughpcep
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'bgpcep'
index eca4d8bbea733f4208632f68a083591e12b7abc2..5ea5cc3dcde318993b62cf858a04f246c5133280 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
index 8c667baa3f2c7a7c742431e57fcd0a6068392c94..384845689b88996a8c17ea80b261e19bc9091dc2 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bgpcep'
index 1670dcd91b2abb3aedaf23c65d300ee1dfc4b49a..3c1f84b94a3f4176e2a2ea85fa01c93cf1ce5e10 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'bgpcep'
index b59c343d9bcb73046523e288b7ee0143650e3085..94459efaf77f70085b961d59f0b706921af3f30c 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: bier-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bier'
index 4cbf059274e28b3495d170af1bd669e6be8ba839..98796735d83cc1811c401239df8219a19f4cd89c 100644 (file)
@@ -10,6 +10,7 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-timeout: 90
     jdks:
       - openjdk8
     maven:
index 8d1038ce8b633107c74a02d05b37d808da73d7d9..6a5975d5da77bda50aefd0dda80c66baa4b8668a 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: capwap-csit-ac
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'capwap'
index 6d783e50808593f7c84292a121538e54123afd22..9e5489b6f0b7b7d0ef400c389bdfb0fd922626c0 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: centinel-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'centinel'
index f6f3e2af740074ca9c024bade8515a35744eaa16..32595905dce3b75971044d7ec8eff05e40f40c50 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-akka1
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
index 612250df583bf3e2ecfd178b727be84cfb20b41d..1e46d21c7d12fd162e15548ca79e4d5274f23747 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: controller-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
 
     # The project name
     project: 'controller'
index 353fadb4806ed5e1ef2f7d113704fd74d40da619..93735f1526993f3fdc9b0bf6fd6bcc1985469b46 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-cluster-singleton-chasing-the-leader-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
index 5e1baa3bd257090d81da8a27d74feff000a2147a..7ff4b538b9dad7bfd7d1c96d27602a40a819705d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-cluster-singleton-partition-and-heal-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
index 226d14b99f01a9c9b8b19bfe42015cb27526022b..be7345a975d9d8fbd11c66d5b0ef8ad6ad8bc10e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-data-broker-explicit-leader-movement-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
index c251b410c220bfaa7637ad8ca6e195cfb01b179e..62e5e42b6e9713c6e95027120772b25d407d6450 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-notification-broker-no-loss-longevity
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
index f6e79b740fc6157876a470065096a94d7b8efdc6..891294cc83829a92862ed44e5b3254f2472e25ad 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-rpc-broker-partition-and-heal-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
index 798248543380fa1cb13fa001e4988eae2ca4e1c1..8bd1f5a32deb1b8fb4f1ad3bf883b10d62d2c5c5 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-rpc-broker-precedence-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
index eba3e225860e1ae99277b0bd34209f85b5a7166a..f308a1632ec982b5da0a0277a70b0f65da719be0 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-periodic-dsbenchmark-cluster
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'controller'
index bc7901bb24d49b70dd214739910372aeef349e58..65c593e3f74a68e2dbe6fb65c9ef2b6e066f12d3 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-periodic-dsbenchmark
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'controller'
index a30f5562cfc981d986b7f5f2497a0843255375c3..9b68e7d05f3977663c8eb29de0928bc766caeae6 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-rest-cars-perf
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
index 8eaebd644cb90ad265a7a46fab593646469d891f..efd98b37b1ace6c3686e208cd38e4c91631fe9da 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-rest-clust-cars-perf
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
index 6da14a22a9738220a4ffb1243dceb4d0e391dd9e..9bcd46fdcda9cb18b28528d4d414f219a2cbf293 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: daexim-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'daexim'
index a62726383b0ae172417ba9d19fb08b95a5ce2aa0..d90ccbb85e06b20b685079e986232f479cff64cf 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: daexim-csit-clustering-basic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'daexim'
index 4f9e5c3cbd34eb7c935745a62e774ba10ad62267..93c30b9236ed04909e3cf005e9e2f043d3202541 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: didm-csit-discovery
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'didm'
index cbd02da9b522048114f1f4e804f367ec7c707ca0..c1c82c6fea421b4f94bf8dd0dc871f6bda8f0e7f 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: dluxapps-csit-yangman
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'dluxapps'
index 123c1dacb8af8f531501a4f814d0826e8f93c963..a78a197476880a80160c9ad4f7ccd01458898c16 100644 (file)
@@ -2,10 +2,10 @@
 - project:
     name: genius-csit-genius
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-3node
+      - inttest-csit-verify-1node
+      - inttest-csit-verify-3node
 
 
     # The project name
index 0bd622eb465c490a7703425921e94ccbf60cdd8c..50f22777a9443f6f9589a053042da81eb0bc586f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: genius-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'genius'
index e258a3bf7297c54c111cd739cc7a5f161e1840f1..208341cb8a4c72aa5e1101721db66fcca9c67329 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     # The project name
     project: 'groupbasedpolicy'
index 70a637e85c6c9d7f83b599136697bdfb127f954a..73e46e8af9890e7c03f24964c350938d09ba71db 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-3node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'groupbasedpolicy'
index 891ff9a3ab731244c4af5dac1dd18e50ef4054aa..8e5af5eac909f5b537123851bc7266a0e6660da5 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-6node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
 
     # The project name
index af92ac1f9081cd3f41fccfe64c665c234608443d..90800ffea1a5f17e215e9b92fca0ddc72ed45811 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
 
     # The project name
index e722b1a5951e81d1f4ce91ea5fa3b532185c6384..9116b0307e2ecba04d5b5f948d0acb4702c299e2 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-sxp
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
     # The project name
     project: 'groupbasedpolicy'
 
index 2a819d4f1b53cfee05c0ee71e3ed5f196d170ebd..69eda5471b15bdf6ac3625153aab8efaca1926fa 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: infrautils-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     project: 'infrautils'
 
index f9dded57b8ac8fe09bcc175668a30440f7f43db1..54d9b5ccba9a50a2dc51b5b609c20b98e358bf36 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: distribution-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'distribution'
index 17c41fc665c0bb6ee32fb040ad9f817ca07fd4e9..d413310a92be2adef584261d91668d2d73b2aca2 100644 (file)
@@ -191,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}
 
@@ -285,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
@@ -335,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}
 
@@ -787,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
@@ -897,7 +894,7 @@ done
 
 for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     CONTROLIP=OPENSTACK_CONTROL_NODE_${i}_IP
-    echo "Configure the stack of the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
+    echo "Configure the stack of the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${!CONTROLIP}"
     scp ${WORKSPACE}/disable_firewall.sh ${!CONTROLIP}:/tmp
     ${SSH} ${!CONTROLIP} "sudo bash /tmp/disable_firewall.sh"
     create_etc_hosts ${!CONTROLIP}
@@ -947,7 +944,7 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     SITE_INDEX=$((((i - 1) / NUM_COMPUTES_PER_SITE) + 1)) # We need the site index to infer the control node IP for this compute
     COMPUTEIP=OPENSTACK_COMPUTE_NODE_${i}_IP
     CONTROLIP=OPENSTACK_CONTROL_NODE_${SITE_INDEX}_IP
-    echo "Configure the stack of the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
+    echo "Configure the stack of the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${!COMPUTEIP}"
     scp ${WORKSPACE}/disable_firewall.sh "${!COMPUTEIP}:/tmp"
     ${SSH} "${!COMPUTEIP}" "sudo bash /tmp/disable_firewall.sh"
     create_etc_hosts ${!COMPUTEIP} ${!CONTROLIP}
index a17507327ca66bbdbf6e62d83516bc031805bef8..0c412626acab712b0a942618f0927b30ee2e6713 100644 (file)
@@ -32,7 +32,8 @@
 # New templates
 
 - job-template:
-    name: '{project}-csit-verify-1node-{functionality}'
+    name: '{prefix}{project}-csit-verify-1node-{functionality}'
+    id: inttest-csit-verify-1node
     disabled: false
 
     project-type: freestyle
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node
     # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node-periodic
     disabled: false
 
     project-type: freestyle
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-verify-3node-{functionality}'
+    name: '{prefix}{project}-csit-verify-3node-{functionality}'
+    id: inttest-csit-verify-3node
     disabled: false
 
     project-type: freestyle
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node
     disabled: false
 
     project-type: freestyle
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-docker
     disabled: false
 
     project-type: freestyle
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-periodic
     disabled: false
 
     project-type: freestyle
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack
     disabled: false
 
     project-type: freestyle
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-openstack
     disabled: false
 
     project-type: freestyle
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
-    name: '{project}-patch-test-{feature}-{stream}'
+    name: '{prefix}{project}-patch-test-{feature}-{stream}'
+    id: inttest-patch-test
 
     project-type: freestyle
     node: centos7-builder-2c-8g
index 2903451c301c374b786d8965dc9be10c7d227d38..6c53fd8029fd1c894b813f62d13aa9d79e7d8f6b 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: iotdm-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'iotdm'
index 28e7f4faea8f6bfd0e8794c9c6d15cbf863adcd6..5612eab04da57355a85b8f5e5637c380eae1fc5f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: jsonrpc-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'jsonrpc'
index f5901407518277cfac240d0e24447fd3002d08f6..6ef4b908c9849be599f3c28ed640bf873ad012d6 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-csit-host-scalability-daily
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'l2switch'
index f05ac233d92029d4e5122d5a6c136dfb656edf58..3c1929909e6f224adbc2eeeeee6b147fae143c82 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-csit-scalability
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'l2switch'
index a5366538c8cb5bb861241cb311abee65a1471de2..8a07d07f7d1bb3973050d6eb33f0206530a2028d 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: l2switch-csit-switch
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'l2switch'
index bee9bf7a379df57f8da75b0957888bf675795860..70beefc48c22f0ce220e987935cf36bd50f799db 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'l2switch'
index d9f199a92d6f62405f695267ab9848b6d2fad97d..de7b79f6e6377163b6e032f33f3174bd3d874783 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: lacp-csit-lacp
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'lacp'
index 01e71c93d49c6cf1bf288a6bf5ee2191a2a62b3f..c94f79b3e9fab177ee9e8e54f652fe56a7df57b8 100644 (file)
@@ -36,7 +36,7 @@
     project-name: lf-infra-docs
     project: releng/docs
     project-pattern: releng/docs
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     rtd-project: lf-releng-docs
     stream: any
     branch: '*'
 - project:
     name: lf-infra-docs-conf
     jobs:
+      - '{project-name}-rtd-jobs'
       - gerrit-tox-verify
 
     project-name: lf-infra-docs-conf
     project: releng/docs-conf
     project-pattern: releng/docs-conf
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
+    rtd-project: lfdocs-conf
     stream: any
     branch: '*'
 
index d0ffdf7b97118d9bb271d1f493ec305097f328ce..d00618879781f6fe392583e33c1c6a960a33be96 100644 (file)
@@ -2,9 +2,9 @@
 - project:
     name: lispflowmapping-csit-msmr
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-3node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'lispflowmapping'
index bcacff0e53dba4e84bf1b32d7a06281ed3d59b91..5f3b6cdb97b486a25ffd735fa80afbd170f8d8dd 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: lispflowmapping-csit-performance
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'lispflowmapping'
@@ -25,7 +25,7 @@
           scope: 'only'
 
     # Job instance type
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-highcpu-8'
 
     # Features to install
     install-features: 'odl-lispflowmapping-msmr'
index 0d130e14f4c1d472f40b764b669ff35038ffd339..9cfbaaff2b05fc5f884c81dfd9e45b83c7dae1b2 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-bindingv1
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'mdsal'
index 45eadc26dfc7a6f72059a7068cb5893af66c1984..d59e37040ee448d79372662fafc7fa5c93d35884 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: messaging4transport-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'messaging4transport'
index c497cb8e7f0850e5ef71e8349c2602863e15d380..da7bfc6bc92b0b088f47e2b246c7f442465e438a 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: natapp-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'natapp'
index 5fd1f995020f47f0f2685ddbd3bb8c4491be9ffd..f2c8cbd75aba1a0de322ecb591bda5339843c662 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: nemo-csit-engine
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'nemo'
index 65ab143da28dff59367f8f4970d8c26c49079882..b4a1caa7754977ee934e1a371ff556d6a5a97042 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-cluster-stress
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'
index de4492d771f2037401d5af3bb0276ff637911790..1b0645bbb93def92693f3337919b57e0926898ab 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering-scale
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'netconf'
index 51c272d145ef9dcb504b406afd6412024acd94e0..8131b7613f4405ae1662511e2959de581904547b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'
index 546f21d02c611abac496bf83f5a28367a891f30a..8f407370d1fc6f11f4882b0f0eb2968bdbb35e08 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-callhome
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'netconf'
index 74fcde32aba979042bc8b7b7a57e50e9d8f5c593..bd4263fe90b8640053de570a0837ee6d3274855b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netconf'
index a0dee25978e73e228f405a1e19d4302aae0a319d..e18b10083b6aa6d5be378dbddbea5e40675af406 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-scale
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'netconf'
index ca5a56149c8928109752f50f604ec7d66bedf17b..1fe61a7531b64a9ee0cd134100a165de8f983040 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: netconf-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'netconf'
index 6b228d3d6692954ece5d0c54b635ca40382b24ba..9e1756f66d89f7a2afc381dc86105cc37c5993ce 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: netide-csit-basic
     jobs:
-      - '{project}-csit-verify-1node-{functionality}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-verify-1node
+      - inttest-csit-1node
 
     # The project name
     project: 'netide'
index 8e3a4ac18c06d4b4cedd3c457961b334d95d0ae2..9793e3b2dbcf94381f365a3e76eb7061bac09ca3 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-oxygen
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
     stream: 'oxygen'
@@ -62,7 +62,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-nitrogen
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
     stream: 'nitrogen'
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-carbon
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
 
index 74eb730a2fcca9ed0bebe4888209c1de4936d563..f666c6abb598a098c1814da602fdb04f692a8a80 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-openstack-integration-oxygen
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'oxygen'
@@ -60,7 +60,7 @@
 - project:
     name: netvirt-csit-openstack-integration-nitrogen
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'nitrogen'
 - project:
     name: netvirt-csit-openstack-integration-carbon
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     stream: 'carbon'
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     project: 'netvirt'
     security-group-mode: 'stateful'
index e4b323e677a3ae41ac8b4641646b0bd550b40b80..e06bfba5440f347a193839e2fdbff46af576bf33 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'
index e82909d6bbf559c56357549eed3cc9027f23de7a..828a0caf7b84325eddf79d413e1336ed3cf074cf 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: nic-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'nic'
index 50d924e573037a6dbef520494ef029208bcc4db1..8cc76c6e8e0df05ae603f55de9abdedb013503eb 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ocpplugin-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'ocpplugin'
index 125e70e72ca5dcea42d789a3af745105ab9b0525..2287da9f48710300faf5e3dc7691a788a8973a60 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ocpplugin-csit-scalability
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     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 b9fc80aa5879a20fe81f707677fb50d7c8f777c7..3a13df042ee2efe81be98b453cfce0059efa7926 100644 (file)
     branch: master
     distribution_branch: master
 
+    jdks:
+      - openjdk8
+    maven:
+      - mvn35:
+          mvn-version: mvn35
+    mvn-settings: odlparent-settings
+    mvn-goals: clean install
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn35
+
+    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
+    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:
         **/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:
index c8ba5c7a26e7cc1b525abc195c4c15027cc8c2a8..1f2b7dce761d799150b7e26f249c48c1d119c4e0 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: of-config-csit-basic
     jobs:
-      - '{project}-csit-verify-1node-{functionality}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-verify-1node
+      - inttest-csit-1node
 
     # The project name
     project: 'of-config'
index e098a9845e2788c6961d5cfc74c672bc30731ee3..be9eb62d82da3e3b0c9508fbb2b6a4ace45e2c0a 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-cbench
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index 4b09a8a0da89da3ed71aaf4f2e2a0405e677c7e8..387126dc3ea2be39296c64f385830a5c02d70b80 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering-bulkomatic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'
index 3c8aa03537f84cc360b032ae3905ba90671d877e..a6bd1362ba678aaf0f37e6d8bc386765be4cbde4 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering-perf-bulkomatic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'
index b14b2d07ad51c78bb55e6be8227fc6f96e8175be..ec0df076cf3d58c91e7eb2ed7c666cb0b3aab90b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'
index ffbfa0fc0864500aa9ca55e91668d9e4a51efbf3..8130af298d2aca46e36f6ae51a5c483cc817f933 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index 4179e504454712cb6daf939953fcb0e6f33902b6..e94a8efcc7e5eec1e2fbdcafa93912f4dd7e5510 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-longevity
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index 1c913d8444ff1c91cceade3a6c881d8c05ace5c2..416592a8d75d6ef2050e3bd6440d459d3d267d16 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-perf-bulkomatic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index b1eb7dada72f187b249af15357fb5df2bf945c77..006c4406cddfd294df2ad82e491542c7901aec80 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-perf-stats-collection
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index d9f0d34a64109efc582695a5e67a095b1fc23184..898c7476b9bbb6829ad9c819de68833b080cbc24 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: openflowplugin-csit-sanity
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'openflowplugin'
index 8f2ed52f4819729c72cf7f421c72e931c8152ea2..2e49e9d08d8492a9bfc9ea1d056bb5c76ac63bc4 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale-link
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index e25dde647bb5f92d1e0183fd9a58335236baf456..f1162b8ccddd896d21aa07a60deb097e1bf83b25 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale-switch
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index dc36c678b3e70c4ef806b901b2a939c1a8ef0927..0e5a7e20fbb0cddeb9e2a156427685153bea4206 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
index 184a2ae1272c04fa3746a2ec759294b22d58ba81..bbf752fb894aba4a8b092a732e6511e8c3f119cf 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'openflowplugin'
index 2fc767152867562d957f17084a4c6136fc195f9d..4f485070352aa045f2cb89e31f3d532ce7a55800 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ovsdb-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
     # The project name
     project: 'ovsdb'
 
index ed3744c930e2468003492137ae0602162fb4639a..29eea50d3e89eecf8a27babedac6f9aa205883a7 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: ovsdb-csit-southbound
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
     # The project name
     project: 'ovsdb'
 
index ae1f2b693faa44d7b633d0a78805c55e7907d2e2..108fe5c431c2754f8a5dc0d7a7e19e85df777557 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: ovsdb-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'ovsdb'
index a9215e6b2e9e67b3685355af9299c549e1c3295a..e9f6d10c328e61053894c4d2a7a6489671214c7b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: p4plugin-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'p4plugin'
index 9218d5a5fba25473e9554206c554ddfe5524354f..7613e521916e3843a471217ba52e5a48c59be033 100644 (file)
@@ -20,10 +20,10 @@ $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 # If URL is to zip, check if there's a tar.gz available to avoid repackaging.
 if [[ $DOWNLOAD_URL = *.zip ]]; then
   # shellcheck disable=SC2154
-  candidate_tarball_url="${{DOWNLOAD_URL//zip/tar.gz}}"
+  candidate_tarball_url="${DOWNLOAD_URL//zip/tar.gz}"
   # shellcheck disable=SC2154
   url_status=$(curl --silent --head --location --output /dev/null --write-out \
-    '%{{http_code}}' "$candidate_tarball_url")
+    '%{http_code}' "$candidate_tarball_url")
   if [[ $url_status = 2* ]]; then
     DOWNLOAD_URL="$candidate_tarball_url"
   fi
index 2ccc50078f18452dfe42bc5aabf50aa3d3c1d9a7..2816c4a7865ba11949c1de41aca7c33938eca5ca 100644 (file)
@@ -19,7 +19,7 @@ elif [[ $URL == *.rpm ]]; then
   sudo yum install -y "$URL"
 elif [[ $URL == *.repo ]]; then
   # shellcheck disable=SC2154
-  repo_file="${{URL##*/}}"
+  repo_file="${URL##*/}"
   sudo curl --silent -o /etc/yum.repos.d/"$repo_file" "$URL"
   sudo yum install -y opendaylight
 else
diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml
new file mode 100644 (file)
index 0000000..57830ea
--- /dev/null
@@ -0,0 +1,22 @@
+# Integration/Packaging macros
+---
+- builder:
+    name: install-test-uninstall-rpm
+    builders:
+      - inject:
+          properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
+      # Use *-escape to make double brace expansion work. JJB strangeness.
+      - shell: !include-raw: test-rpm-deps.sh
+      - shell: !include-raw-escape: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      # Install deps needed interactive Karaf shell tests
+      - shell: |
+          # Install expect to interact with Karaf shell
+          # Install nmap to check status of ODL's SSH port
+          sudo yum install -y expect nmap
+      - shell: !include-raw: test-karaf.expect
+      - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
+      - shell: |
+          # Remove old host key so future installs don't fail to SSH
+          rm /home/jenkins/.ssh/known_hosts
index 664380505825896c1537d22a25cde0bbcc647ff4..ea80567dbce8ecaecacb5fef2f028598e028e2c3 100644 (file)
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: build-rpm.sh
-      - shell: !include-raw: test-rpm-deps.sh
-      - inject:
-          properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
-      - shell: !include-raw: install-rpm.sh
-      - shell: !include-raw: start-odl.sh
-      - shell: |
-          # Install expect to interact with Karaf shell
-          sudo yum install -y expect
-          # Install nmap to check status of ODL's SSH port
-          sudo yum install -y nmap
-      - shell: !include-raw: test-karaf.expect
-      - shell: !include-raw: stop-odl.sh
-      - shell: !include-raw: uninstall-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
       - inject:
           properties-content: 'STREAM={stream}'
       - shell: !include-raw: build-rpm-snap.sh
-      - shell: !include-raw: test-rpm-deps.sh
+      - install-test-uninstall-rpm
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
 
       # Test Oxygen pre-release autorelease tarball
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
 
       # Test Oxygen multipatch zip (no parallel tarball available)
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
 
       # Test latest Oxygen snapshot
       - inject:
           build-timeout: '{build-timeout}'
 
     builders:
-      # TODO: Install/test each RPM. Will require builder script changes.
       # Test Carbon SR2 tarball
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Carbon multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20180115.181738-1.zip'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Carbon snapshot
       - inject:
           properties-content: 'STREAM=carbon'
       - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
       # Test Nitrogen tarball
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Nitrogen SR1 tarball
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Nitrogen multipatch zip (no parallel tarball available)
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20180115.183312-2.zip'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test latest Nitrogen snapshot
       - inject:
           properties-content: 'STREAM=nitrogen'
       - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
       # Test Oxygen pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
-      - shell: !include-raw: build-rpm.sh
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
+      # FIXME: Something is wrong with current Oxygen multipatch builds
       # NB: This will need to be updated as old builds expire
-      - inject:
-          # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180111.030942-90.zip'
-      - shell: !include-raw: build-rpm.sh
+      # - inject:
+      # yamllint disable-line rule:line-length
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180111.030942-90.zip'
+      # - shell: !include-raw: build-rpm.sh
+      # - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
       - inject:
           properties-content: 'STREAM=oxygen'
       - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
     triggers:
       - timed: '@daily'
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw-escape: install-rpm.sh
       - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
-          sudo yum install -y expect
           # Install nmap to check status of ODL's SSH port
-          sudo yum install -y nmap
+          sudo yum install -y expect nmap
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw: uninstall-rpm.sh
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw-escape: install-rpm.sh
       - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
index 6def490d0721d740f4215ee6ab3ca72979f3b0b5..2bb0db6dbda972cc7368a4dfee44ae40dd9e008d 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)
@@ -41,16 +45,16 @@ fi
 # shellcheck disable=SC2034
 mapfile -t actual_deps < <( rpm -qp /home/$USER/rpmbuild/RPMS/noarch/*.rpm --requires )
 # shellcheck disable=SC2154 disable=SC2145
-printf 'Dependency found: %s\n' "${{actual_deps[@]}}"
+printf 'Dependency found: %s\n' "${actual_deps[@]}"
 
 # shellcheck disable=SC2154,SC2145,SC2034,SC2207
-diff_deps=(`echo "${{expected_deps[@]}}" "${{actual_deps[@]}}" | tr ' ' '\n' | sort | uniq -u`)
+diff_deps=(`echo "${expected_deps[@]}" "${actual_deps[@]}" | tr ' ' '\n' | sort | uniq -u`)
 # shellcheck disable=SC2154 disable=SC2145 disable=SC2068 disable=SC2170 disable=SC1083
-if [ ${{#diff_deps[*]}} -eq 0 ]; then
+if [ ${#diff_deps[*]} -eq 0 ]; then
     echo "RPM requirements are as expected"
 else
     echo "RPM requirements don't match the expected requirements"
     # shellcheck disable=SC2154 disable=SC2145
-    printf 'Dependency mismatch: %s\n' ${{diff_deps[@]}}
+    printf 'Dependency mismatch: %s\n' ${diff_deps[@]}
     exit 1
 fi
index 671609f2d6b1dbb694c1e6979bfa976082a1e1a1..5d642d1ee371f1fa717255dbc9bffdb402224100 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: packetcable-csit-pcmm
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'packetcable'
index 48e947e807b096f90092d63a1fafd6f595445955..080ace60f9fdf9a4612295190a69c757673838c5 100644 (file)
@@ -3,6 +3,7 @@
 
 - defaults:
     name: global
+    prefix: ''  # A prefix for job names sandbox for example: user-
 
     karaf-version: karaf4
     build-days-to-keep: 30
index f54557e262e5554515b2f0b9d0badff7f50ec633..73c5ab5c33c20def31be10407108a00129447e99 100644 (file)
@@ -4,15 +4,11 @@
     jobs:
       - '{project-name}-ci-jobs':
           build-node: centos7-builder-2c-2g
+          build-timeout: 60
       - 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 +22,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
 
 
 - job-template:
-    name: 'builder-verify-image-protection'
+    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}'
-
-    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'
-    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}'
+          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 93cdee812a503403776415e530d60f4b9704b783..834ff2b8120b56380a73853a12db7466f10bd252 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: sdninterfaceapp-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'sdninterfaceapp'
index d9841368ef34b8b85b4109430015195330b333cf..bfbc9066dd3899ea30f27e3217da994b23c58b07 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sfc-csit-full-deploy
     jobs:
-      - '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-docker
 
     # The project name
     project: 'sfc'
index 0798c705a9c15c544d903c725ef03585f08164ee..5f15d879beec0fd701dca5361fe94cb5a7a63092 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sfc-csit-rest-basic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
 
     # The project name
index df1ae61b57e7fa808f577cb88f03499ed4e0e253..dc9cf856a5d5c7f02a5780f1a9cbc721f810706d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sfc-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'sfc'
index 48fefa83528437050ed949a6a7a539ac7a6dfd5d..5c91055cb92fea93b632ac069958545e52958eee 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
index 94490090882879afc5450584e9da9b6899e896b0..9474a4097e6fa26fe946aa5260941fe2dbdd5a1d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-routing
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'sxp'
index 9357903a145cdf19fceec993e04ed226fd675674..0b5e3adac4b30b5c662eceb8c005ab239532c368 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-clustering
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'sxp'
index 930c1073fbd07c74194494b05508783de1144f51..410c409b6dd78b861a5cae85c989abfaab2686ae 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-filtering
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
index 50fc054c590eedfbe7d45d5ac656235bcbd561c4..7b909d0ef846f6be6928ddeba78595c1d44b9885 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-performance
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'sxp'
index cd76ffac8efd5152c1006aeacf1879f222c2fbdc..16e672552d4680af8a265c2bf739e56b6b2d7a37 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-topology
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
index d80673510af9ffdb7b4678299e7e57cc09dda353..5ebd9e0d8bbf4c9a030a63dbf9269f4f3e7ca393 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: topoprocessing-csit-topology-operations
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'topoprocessing'
index 75e222127667fc109ace53e26315b9d3f9b009d0..5a712c6656c46deba8cbb36cab8e78acbfe103f5 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-cassandra
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
index 4041decbb13072fce7ac424aca097af261943c58..c67e3101ac02dc54b38483d31ed6bcc85833b816 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-elasticsearch
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
index d7fb207fbabfe1b33a80d6b3b430316bc9945121..37840bb3b78b9d337e3126ac9b00d0f3ade356e8 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-hbase
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
index c997550d6392aa8378b18d77a1503df727315c01..6d4e1cbcd93795863720ae77e180e00b8357b5bd 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: tsdr-csit-hsqldb
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'
index 4f43a183c69c81641f3f9ad13c13c9e6b1b1fef2..91835fbbbd51050c0e69dae86f184aae4b868d72 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: unimgr-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'
index 98d214277489f02c796026815f2703e45d01cdf2..b575e274f7f5561a172eb1614e28c2ccd19ac03f 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: unimgr-csit-legato
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'
index b1a4980273e1f8048d1f13af29346bb91e5196f0..1e85d7bd504009b60f8d3e4c9be691048540a2f7 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: usc-csit-channel
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usc'
index 44a3c092c5bde0832a9efae835b74d792ca0251d..0c409bc8021411747eedaee699a1a9d5319459f4 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: usc-csit-tcp
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usc'
index 95dc05321efa36f41a6ab20c6d9f004d3509c5b0..38041492553a6d6ee0229b5a5a1cc1917035db6b 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: usecplugin-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usecplugin'
index 637243f86ca93ca297575b881699032033062e93..9c3efd1403c7763aaa83e52c73fbe1a5585d1f69 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-3node-manager
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
 
     # The project name
     project: 'vtn'
index 30769a3dcc265cc741fde316a4a507a6ed111861..92bdeab82d39a58ff8e1812a8d542a65227bc3ef 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-vtn-coordinator
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'
index a19adf3dde7848a9563d49ff0342c2a8a1e87193..e9efdf10f64478c7a694a2dfa1022200c7fba86f 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: vtn-csit-manager
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'
index adf0e0af09d558f24d62ebaf2e9a5e7d4b9cb482..ef610d940f4435f5fd2fa8c26c5f451cde69866e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: vtn-manager-csit-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     # The project name
     project: 'vtn'
index 6e378e4a5eab445b43f146cf1dc2f310e515aa06..f1719f93bc8fb315412339133c211a5657773a9e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: vtn-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'vtn'
index 333bae4a1afc2fa1780497371f2595bfcc64e80a..c2d51a1c7726edac2466c349703823fbb8e1e795 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: yangtools-csit-system
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
 
     # The project name
     project: 'yangtools'
diff --git a/tox.ini b/tox.ini
index dc8e734f47bfac3651b4dfc69ace74a25bde7dc1..1429352c31009a9eaae7fb8f93b98685d19800db 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,9 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs
 deps = flake8
 commands = flake8 scripts/
 
+[testenv:prefix]
+commands = ./check_prefix.sh
+
 [testenv:robot]
 commands = ./check_robot.sh