Merge "Switch the csit-1node-periodic to use job prefix"

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-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/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/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 9399df8c0310523802adb92068a71f729171a061..80f2abea3ef07eea8a1abd91179982675dce4ceb 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -241,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

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/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/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/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/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'