Merge "Do tests of RPMs built in verify-full job"

diff --git a/check_prefix.sh b/check_prefix.sh
new file mode 100755 (executable)
index 0000000..87a8427
--- /dev/null
+++ b/check_prefix.sh
@@ -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

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 8b5bec7c4750b5b20524b6e521f80de0a86ce689..b76745f61af7e4be22fd262e88782f07b71905a2 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -3,7 +3,7 @@
     name: aaa-csit-authn
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
index 9d699a59d09ffae021ebe6980c04419b11f75912..1e89f7efcbd2fb7d0784f816f25ef3b0e61dbde3 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -3,7 +3,7 @@
     name: aaa-csit-keystone
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 8c667baa3f2c7a7c742431e57fcd0a6068392c94..2263196d428f4c80b449ebf63468450d62cfcd30 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -3,7 +3,7 @@
     name: bgpcep-csit-userfeatures
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bgpcep'

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index b59c343d9bcb73046523e288b7ee0143650e3085..f4b88271cc25ad09ce1143a7eb95a0f8718dc635 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: bier-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bier'

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 4cbf059274e28b3495d170af1bd669e6be8ba839..98796735d83cc1811c401239df8219a19f4cd89c 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -10,6 +10,7 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-timeout: 90
     jdks:
       - openjdk8
     maven:

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 8d1038ce8b633107c74a02d05b37d808da73d7d9..f2a5fa11b481f66762126d1fa1fe6b2338b49c27 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -3,7 +3,7 @@
     name: capwap-csit-ac
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'capwap'

diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml
index 6d783e50808593f7c84292a121538e54123afd22..f4873fb05380c80d6b65bc44944679880e0b5f0c 100644 (file)
--- a/jjb/centinel/centinel-csit-basic.yaml
+++ b/jjb/centinel/centinel-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: centinel-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'centinel'

diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml
index 4f9e5c3cbd34eb7c935745a62e774ba10ad62267..ca5f62fa5bfaf053ddd084b63e8e07ba2cc8a7ff 100644 (file)
--- a/jjb/didm/didm-csit-discovery.yaml
+++ b/jjb/didm/didm-csit-discovery.yaml
@@ -3,7 +3,7 @@
     name: didm-csit-discovery
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'didm'

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index cbd02da9b522048114f1f4e804f367ec7c707ca0..bbcfccdf8047342b9568e38f129f214fb21d5f17 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -3,7 +3,7 @@
     name: dluxapps-csit-yangman
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'dluxapps'

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 123c1dacb8af8f531501a4f814d0826e8f93c963..30d368368018227972a002cae5528059fd0b87ca 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -4,7 +4,7 @@
     jobs:
       - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
       - '{project}-csit-verify-3node-{functionality}'
 
 

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 4076e47de796da36c7005e63b83ef7cf694a70b9..d413310a92be2adef584261d91668d2d73b2aca2 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -894,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}
@@ -944,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}

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index a17507327ca66bbdbf6e62d83516bc031805bef8..f96a41b93c1a9bf6e66840b912e271265bd009bd 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -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

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 2903451c301c374b786d8965dc9be10c7d227d38..fff52056b910cd2ca2780350a6517ea8aaa564e0 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: iotdm-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'iotdm'

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index a5366538c8cb5bb861241cb311abee65a1471de2..6472498259d9724ea00ecd3932d275dab82bc452 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -3,7 +3,7 @@
     name: l2switch-csit-switch
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'l2switch'

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index d9f199a92d6f62405f695267ab9848b6d2fad97d..399f3bfb52c3f93b2231c4e0c7c9664e0c7467a8 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -3,7 +3,7 @@
     name: lacp-csit-lacp
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'lacp'

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index d0ffdf7b97118d9bb271d1f493ec305097f328ce..ddf6bad635f61786871f43759173a889241dd905 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -4,7 +4,7 @@
     jobs:
       - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'lispflowmapping'

diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
index 45eadc26dfc7a6f72059a7068cb5893af66c1984..c10c37054fd891ce295595a3d52f88f0435cbf64 100644 (file)
--- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml
+++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: messaging4transport-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'messaging4transport'

diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml
index c497cb8e7f0850e5ef71e8349c2602863e15d380..9acd8ba8413202023ec3153b125d3811ba7a00e2 100644 (file)
--- a/jjb/natapp/natapp-csit-basic.yaml
+++ b/jjb/natapp/natapp-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: natapp-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'natapp'

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 5fd1f995020f47f0f2685ddbd3bb8c4491be9ffd..397c0fc5d806f17f1e5b00b1916035494bd6f7a9 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -3,7 +3,7 @@
     name: nemo-csit-engine
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'nemo'

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index ca5a56149c8928109752f50f604ec7d66bedf17b..99cf9394f68db7aabff873896dd3bbfb790ad34c 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -3,7 +3,7 @@
     name: netconf-csit-userfeatures
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'netconf'

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 6b228d3d6692954ece5d0c54b635ca40382b24ba..53629f8d2076900e7b8101d0087de225c4e720fa 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netide-csit-basic
     jobs:
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index e82909d6bbf559c56357549eed3cc9027f23de7a..61d28ced6df5872027e1e3fc44d2a42472ff1328 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: nic-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'nic'

diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
index 50d924e573037a6dbef520494ef029208bcc4db1..afcdd3d273912779726b3469970ade98fddb5eb0 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: ocpplugin-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'ocpplugin'

diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
index 125e70e72ca5dcea42d789a3af745105ab9b0525..427899f210fa170370a67cef67967004a5775ec5 100644 (file)
--- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
+++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml
@@ -3,7 +3,7 @@
     name: ocpplugin-csit-scalability
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'ocpplugin'

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index ab9c75ce8fa2a4bfa666cbf4b7d8614ce992c145..3a13df042ee2efe81be98b453cfce0059efa7926 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -15,12 +15,12 @@
     jdks:
       - openjdk8
     maven:
-      - mvn33:
-          mvn-version: mvn33
+      - mvn35:
+          mvn-version: mvn35
     mvn-settings: odlparent-settings
     mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'

diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml
index c8ba5c7a26e7cc1b525abc195c4c15027cc8c2a8..f126e27b6c6def3b1573f89e1a5fd0fa80909ee2 100644 (file)
--- a/jjb/of-config/of-config-csit-basic.yaml
+++ b/jjb/of-config/of-config-csit-basic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: of-config-csit-basic
     jobs:
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index d9f0d34a64109efc582695a5e67a095b1fc23184..6cd924d0f32fac1bd8d162f49f8a1271a424bbc4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -3,7 +3,7 @@
     name: openflowplugin-csit-sanity
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index ed3744c930e2468003492137ae0602162fb4639a..1bf4715cfca011b13e04ca98bc472288a02b4035 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -3,7 +3,7 @@
     name: ovsdb-csit-southbound
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
     # The project name
     project: 'ovsdb'
 

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index 671609f2d6b1dbb694c1e6979bfa976082a1e1a1..bddf9420bfc137fd11cf8d720be8eee0a070f80e 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -3,7 +3,7 @@
     name: packetcable-csit-pcmm
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'packetcable'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 48e947e807b096f90092d63a1fafd6f595445955..080ace60f9fdf9a4612295190a69c757673838c5 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index bf8f32c41708b829556e14915f0b9c4521593d57..73c5ab5c33c20def31be10407108a00129447e99 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-ci-jobs':
           build-node: centos7-builder-2c-2g
+          build-timeout: 60
       - builder-check-poms
       - builder-copy-sandbox-logs
       - builder-openstack-cron

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
index 93cdee812a503403776415e530d60f4b9704b783..dfb2393afa73eebe2166ac5bda7d9a79258a02db 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: sdninterfaceapp-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'sdninterfaceapp'

diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
index d80673510af9ffdb7b4678299e7e57cc09dda353..dc0d9b36afc7b4c00fc1cb51b62694835c1b86b0 100644 (file)
--- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
+++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
@@ -3,7 +3,7 @@
     name: topoprocessing-csit-topology-operations
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'topoprocessing'

diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 75e222127667fc109ace53e26315b9d3f9b009d0..03b7f82671504324a3a98b24cd5f82f9a611b990 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -3,7 +3,7 @@
     name: tsdr-csit-cassandra
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index 4041decbb13072fce7ac424aca097af261943c58..7e8adb1206d7f72167e3ca02c634e3da0379aea0 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -3,7 +3,7 @@
     name: tsdr-csit-elasticsearch
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index d7fb207fbabfe1b33a80d6b3b430316bc9945121..52af004b0baa40f77cc1bff99e9679e90dfe206f 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -3,7 +3,7 @@
     name: tsdr-csit-hbase
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index c997550d6392aa8378b18d77a1503df727315c01..77132b846392bba990e70573a8bdc376b8d7d41f 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -3,7 +3,7 @@
     name: tsdr-csit-hsqldb
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'tsdr'

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 4f43a183c69c81641f3f9ad13c13c9e6b1b1fef2..94ae2f04d6e1ac27a06e734bc0b3111efb6708b1 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: unimgr-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'

diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml
index 98d214277489f02c796026815f2703e45d01cdf2..a44fc030de282802f47f725a802c9df9a7a323b7 100644 (file)
--- a/jjb/unimgr/unimgr-csit-legato.yaml
+++ b/jjb/unimgr/unimgr-csit-legato.yaml
@@ -3,7 +3,7 @@
     name: unimgr-csit-legato
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'unimgr'

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index b1a4980273e1f8048d1f13af29346bb91e5196f0..7fcd1f89838938cb4f2b641e6a1e5ec0e0bcaa05 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -3,7 +3,7 @@
     name: usc-csit-channel
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usc'

diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml
index 44a3c092c5bde0832a9efae835b74d792ca0251d..275ae8b71d2fab7541658dd0d3e569584e400be5 100644 (file)
--- a/jjb/usc/usc-csit-tcp.yaml
+++ b/jjb/usc/usc-csit-tcp.yaml
@@ -3,7 +3,7 @@
     name: usc-csit-tcp
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usc'

diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml
index 95dc05321efa36f41a6ab20c6d9f004d3509c5b0..5acb844e8e2c0a89e2f898c27b5dd82384559c1e 100644 (file)
--- a/jjb/usecplugin/usecplugin-csit-basic.yaml
+++ b/jjb/usecplugin/usecplugin-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: usecplugin-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'usecplugin'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
index 30769a3dcc265cc741fde316a4a507a6ed111861..b5ec468ef80dddae8b8848ce3c5e4cf27bb98292 100644 (file)
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ b/jjb/vtn/vtn-csit-coordinator.yaml
@@ -3,7 +3,7 @@
     name: vtn-csit-vtn-coordinator
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
index a19adf3dde7848a9563d49ff0342c2a8a1e87193..9bd1277e18d36364208bccaa7542acd06841c500 100644 (file)
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -3,7 +3,7 @@
     name: vtn-csit-manager
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'vtn'

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