Fixed typos on jjb

- Switched buildnode to docker node for dashboard
- Renamed csit for prh and ves and fixed trigger job/name

Change-Id: I0611fbc719b45f0ea7fc799a230e257c53756bc4
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1270

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index e5ecc10..a0df507 100644 (file)
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -19,7 +19,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-redis-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
     name: ccsdk-dashboard-sonar

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
index c9a59ee..559370c 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
@@ -10,5 +10,5 @@
     functionality:
       - 'bbs-testsuites':
           trigger_jobs:
-            - '{project-name}-{stream}-merge-java'
+            - 'dcaegen2-services-master-bbs-event-processor-merge-java'
     robot-options: ''

diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
similarity index 81%
rename from jjb/dcaegen2/dcaegen2-csit.yaml
rename to jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
index db0b4f6..2d11c7f 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: dcaegen2-testsuites-csit
+    name: dcaegen2-collectors-ves-testsuites-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
@@ -10,7 +10,6 @@
     functionality:
       - 'testsuites'
     trigger_jobs:
-      - 'dcaegen2-master-merge-java'
       - 'dcaegen2-collectors-ves-master-merge-java'
     robot-options: ''
 - project:
@@ -25,6 +24,5 @@
     functionality:
       - 'prh-testsuites'
     trigger_jobs:
-      - 'dcaegen2-{stream}-merge-java'
-      - '{project-name}-{stream}-merge-java'
+      - 'dcaegen2-services-prh-master-merge-java'
     robot-options: ''