Merge "Switch the csit-verify-3node to use job prefix"

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

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

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index c9f009f143ca9dd6adf8a3856e285e6a8127f44c..7898be6599cdc85ac21db78a0ca0e24287b4aec3 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -2,7 +2,7 @@
 - project:
     name: aaa-csit-tls
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'aaa'

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index b826a5e39021bd60d235668d67217e58d974ba1b..48a261785e6919b0da0ad39a09ff0992bf602789 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: aaa-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'aaa'

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 03d08d4404ac37ed191dd09b73ce064f6fc4c5ff..172f7506b37af3e19340f8b80094ba3f09d00698 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -2,7 +2,7 @@
 - project:
     name: alto-csit-setup
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'alto'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index 6c186784e8147541e61e612821421707cb034ce3..2f5cbf60ba85c630e4d9defe136d668aa9bbfe4e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -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'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 92a150ae999ac707c933edcc9c2759bfc8d850ef..dc8bd41a11521d94cf4c54a99f19995d4de0559f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -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

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index a7e10c9a700ffa60afc17044848113d7d5101997..f835ad75778a19ba174eae39de615a9d0e7481cb 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -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

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
index 8df34f773616ea175eda8446b65c8f8fb2cf723e..c8566b3bfe4a5d7d1aa5d29f3aaafc813aa5cc90 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
@@ -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'

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index eca4d8bbea733f4208632f68a083591e12b7abc2..5ea5cc3dcde318993b62cf858a04f246c5133280 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -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

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

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index 1670dcd91b2abb3aedaf23c65d300ee1dfc4b49a..3c1f84b94a3f4176e2a2ea85fa01c93cf1ce5e10 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'bgpcep'

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

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

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

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index f6f3e2af740074ca9c024bade8515a35744eaa16..32595905dce3b75971044d7ec8eff05e40f40c50 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-akka1
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml
index c251b410c220bfaa7637ad8ca6e195cfb01b179e..62e5e42b6e9713c6e95027120772b25d407d6450 100644 (file)
--- a/jjb/controller/controller-csit-dnb-noloss.yaml
+++ b/jjb/controller/controller-csit-dnb-noloss.yaml
@@ -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'

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index bc7901bb24d49b70dd214739910372aeef349e58..65c593e3f74a68e2dbe6fb65c9ef2b6e066f12d3 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -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'

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index a30f5562cfc981d986b7f5f2497a0843255375c3..9b68e7d05f3977663c8eb29de0928bc766caeae6 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -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'

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

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

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

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 8f6ba167658a3672aece962c11d25462afdb130d..5e01210a39846aa87e6ad0205e20f356f6684f92 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -3,7 +3,7 @@
     name: genius-csit-genius
     jobs:
       - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
       - inttest-csit-verify-1node
       - inttest-csit-verify-3node
 

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 0bd622eb465c490a7703425921e94ccbf60cdd8c..50f22777a9443f6f9589a053042da81eb0bc586f 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: genius-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'genius'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 70a637e85c6c9d7f83b599136697bdfb127f954a..73e46e8af9890e7c03f24964c350938d09ba71db 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-3node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'groupbasedpolicy'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 891ff9a3ab731244c4af5dac1dd18e50ef4054aa..8e5af5eac909f5b537123851bc7266a0e6660da5 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-6node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
 
     # The project name

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index e722b1a5951e81d1f4ce91ea5fa3b532185c6384..9116b0307e2ecba04d5b5f948d0acb4702c299e2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-sxp
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
     # The project name
     project: 'groupbasedpolicy'
 

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index 2a819d4f1b53cfee05c0ee71e3ed5f196d170ebd..69eda5471b15bdf6ac3625153aab8efaca1926fa 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: infrautils-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     project: 'infrautils'
 

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index f9dded57b8ac8fe09bcc175668a30440f7f43db1..54d9b5ccba9a50a2dc51b5b609c20b98e358bf36 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -2,7 +2,7 @@
 - project:
     name: distribution-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'distribution'

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 f9284469eebdc75d84fdcb2ca80423d8f4266507..d651eef758b2c690fcb08508f75cc3e8c390e7ff 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -120,7 +120,8 @@
       - 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
 
@@ -240,7 +241,8 @@
       - 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
@@ -1416,7 +1418,8 @@
 # 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

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

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index 28e7f4faea8f6bfd0e8794c9c6d15cbf863adcd6..5612eab04da57355a85b8f5e5637c380eae1fc5f 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: jsonrpc-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'jsonrpc'

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index f5901407518277cfac240d0e24447fd3002d08f6..6ef4b908c9849be599f3c28ed640bf873ad012d6 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -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'

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

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

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index bee9bf7a379df57f8da75b0957888bf675795860..70beefc48c22f0ce220e987935cf36bd50f799db 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'l2switch'

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

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 01e71c93d49c6cf1bf288a6bf5ee2191a2a62b3f..c94f79b3e9fab177ee9e8e54f652fe56a7df57b8 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -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: '*'
@@ -47,12 +47,14 @@
 - 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: '*'
 

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

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index bcacff0e53dba4e84bf1b32d7a06281ed3d59b91..1bc80b3ebfe9c3f1666a6d2dc21f4ef1e61fe0cf 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -2,7 +2,7 @@
 - project:
     name: lispflowmapping-csit-performance
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'lispflowmapping'

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 0d130e14f4c1d472f40b764b669ff35038ffd339..9cfbaaff2b05fc5f884c81dfd9e45b83c7dae1b2 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -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'

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

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

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

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 546f21d02c611abac496bf83f5a28367a891f30a..8f407370d1fc6f11f4882b0f0eb2968bdbb35e08 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-callhome
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'netconf'

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index 74fcde32aba979042bc8b7b7a57e50e9d8f5c593..bd4263fe90b8640053de570a0837ee6d3274855b 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netconf'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index a0dee25978e73e228f405a1e19d4302aae0a319d..e18b10083b6aa6d5be378dbddbea5e40675af406 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -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'

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

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

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index e4b323e677a3ae41ac8b4641646b0bd550b40b80..e06bfba5440f347a193839e2fdbff46af576bf33 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'

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

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

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

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index e098a9845e2788c6961d5cfc74c672bc30731ee3..be9eb62d82da3e3b0c9508fbb2b6a4ace45e2c0a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-cbench
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index ffbfa0fc0864500aa9ca55e91668d9e4a51efbf3..8130af298d2aca46e36f6ae51a5c483cc817f933 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -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'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 4179e504454712cb6daf939953fcb0e6f33902b6..e94a8efcc7e5eec1e2fbdcafa93912f4dd7e5510 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-longevity
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 1c913d8444ff1c91cceade3a6c881d8c05ace5c2..416592a8d75d6ef2050e3bd6440d459d3d267d16 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -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'

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index b1eb7dada72f187b249af15357fb5df2bf945c77..006c4406cddfd294df2ad82e491542c7901aec80 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -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'

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 8f2ed52f4819729c72cf7f421c72e931c8152ea2..2e49e9d08d8492a9bfc9ea1d056bb5c76ac63bc4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
@@ -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'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index e25dde647bb5f92d1e0183fd9a58335236baf456..f1162b8ccddd896d21aa07a60deb097e1bf83b25 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -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'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index dc36c678b3e70c4ef806b901b2a939c1a8ef0927..0e5a7e20fbb0cddeb9e2a156427685153bea4206 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 184a2ae1272c04fa3746a2ec759294b22d58ba81..bbf752fb894aba4a8b092a732e6511e8c3f119cf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'openflowplugin'

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

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index ae1f2b693faa44d7b633d0a78805c55e7907d2e2..108fe5c431c2754f8a5dc0d7a7e19e85df777557 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ovsdb-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'ovsdb'

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

diff --git a/jjb/packaging/build-rpm.sh b/jjb/packaging/build-rpm.sh
index 9218d5a5fba25473e9554206c554ddfe5524354f..7613e521916e3843a471217ba52e5a48c59be033 100644 (file)
--- a/jjb/packaging/build-rpm.sh
+++ b/jjb/packaging/build-rpm.sh
@@ -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

diff --git a/jjb/packaging/install-rpm.sh b/jjb/packaging/install-rpm.sh
index 2ccc50078f18452dfe42bc5aabf50aa3d3c1d9a7..2816c4a7865ba11949c1de41aca7c33938eca5ca 100644 (file)
--- a/jjb/packaging/install-rpm.sh
+++ b/jjb/packaging/install-rpm.sh
@@ -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
+++ b/jjb/packaging/packaging-macros.yaml
@@ -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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 664380505825896c1537d22a25cde0bbcc647ff4..ea80567dbce8ecaecacb5fef2f028598e028e2c3 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -81,20 +81,8 @@
           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'
@@ -158,7 +146,7 @@
       - 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'
@@ -206,19 +194,19 @@
       - 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:
@@ -268,67 +256,77 @@
           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'
@@ -377,13 +375,12 @@
           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
@@ -434,7 +431,7 @@
           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

diff --git a/jjb/packaging/test-rpm-deps.sh b/jjb/packaging/test-rpm-deps.sh
index 460bdaeed14f7d78e72aeacfa5871cf0816057d2..2bb0db6dbda972cc7368a4dfee44ae40dd9e008d 100644 (file)
--- a/jjb/packaging/test-rpm-deps.sh
+++ b/jjb/packaging/test-rpm-deps.sh
@@ -45,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

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

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

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index df1ae61b57e7fa808f577cb88f03499ed4e0e253..dc9cf856a5d5c7f02a5780f1a9cbc721f810706d 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sfc-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'sfc'

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 48fefa83528437050ed949a6a7a539ac7a6dfd5d..5c91055cb92fea93b632ac069958545e52958eee 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 930c1073fbd07c74194494b05508783de1144f51..410c409b6dd78b861a5cae85c989abfaab2686ae 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-filtering
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 50fc054c590eedfbe7d45d5ac656235bcbd561c4..7b909d0ef846f6be6928ddeba78595c1d44b9885 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -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'

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index cd76ffac8efd5152c1006aeacf1879f222c2fbdc..16e672552d4680af8a265c2bf739e56b6b2d7a37 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-topology
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml
index 6e378e4a5eab445b43f146cf1dc2f310e515aa06..f1719f93bc8fb315412339133c211a5657773a9e 100644 (file)
--- a/jjb/vtn/vtn-patch-test.yaml
+++ b/jjb/vtn/vtn-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: vtn-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'vtn'

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 333bae4a1afc2fa1780497371f2595bfcc64e80a..c2d51a1c7726edac2466c349703823fbb8e1e795 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -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'