From 61c430b5507862fb5ac54e4eedb2900c75385fe5 Mon Sep 17 00:00:00 2001
From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Thu, 28 Mar 2019 14:19:30 +0000
Subject: 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
---
 jjb/ccsdk/dashboard.yaml                           |  2 +-
 jjb/dcaegen2/dcaegen2-csit.yaml                    | 30 ----------------------
 .../dcaegen2-services-bbs-eventprocessor-csit.yaml |  2 +-
 jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml            | 28 ++++++++++++++++++++
 4 files changed, 30 insertions(+), 32 deletions(-)
 delete mode 100644 jjb/dcaegen2/dcaegen2-csit.yaml
 create mode 100644 jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index e5ecc104e..a0df5079c 100644
--- 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-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
deleted file mode 100644
index db0b4f680..000000000
--- a/jjb/dcaegen2/dcaegen2-csit.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-- project:
-    name: dcaegen2-testsuites-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'testsuites'
-    trigger_jobs:
-      - 'dcaegen2-master-merge-java'
-      - 'dcaegen2-collectors-ves-master-merge-java'
-    robot-options: ''
-- project:
-    name: dcaegen2-prh-testsuites-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcaegen2'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'prh-testsuites'
-    trigger_jobs:
-      - 'dcaegen2-{stream}-merge-java'
-      - '{project-name}-{stream}-merge-java'
-    robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml
index c9a59ee40..559370c57 100644
--- 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-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
new file mode 100644
index 000000000..2d11c7fbd
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml
@@ -0,0 +1,28 @@
+- project:
+    name: dcaegen2-collectors-ves-testsuites-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'testsuites'
+    trigger_jobs:
+      - 'dcaegen2-collectors-ves-master-merge-java'
+    robot-options: ''
+- project:
+    name: dcaegen2-prh-testsuites-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2'
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'prh-testsuites'
+    trigger_jobs:
+      - 'dcaegen2-services-prh-master-merge-java'
+    robot-options: ''
-- 
cgit 1.2.3-korg