Fix csit jobs for osdf and has

Syncing the csit jenkin jobs with the correct folder.
Removing dublin jobs from cmso and replacing it with elalto
Fixing sonar, clm jobs

Change-Id: I97d18ed3f07b7137841926a0a68cc26c55237b8b
Signed-off-by: vrvarma <vv8305@att.com>
Issue-ID: OPTFRA-673

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 56a07c8..b099e82 100644 (file)
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -31,8 +31,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-cmso-settings'
     subproject:
       - 'cmso':
@@ -71,8 +71,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'optf-cmso-settings'
 
 - project:

diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index b1eeba6..583703c 100644 (file)
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     functionality:
-      - 'testsuites':
+      - 'has':
           trigger_jobs:
             - '{project-name}-{stream}-conductor-docker-java-version-shell-daily'
     robot-options: ''

diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index de079c3..9951184 100644 (file)
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     functionality:
-      - 'testsuites':
+      - 'osdf':
           trigger_jobs:
             - '{project-name}-{stream}-osdf-docker-java-version-shell-daily'
     robot-options: ''

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 4e600f3..ec149ad 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -79,7 +79,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'optf/osdf'
     project-name: 'optf-osdf'
     branch: 'master'
@@ -93,7 +93,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: optf/osdf
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project-name: 'optf-osdf'
     stream:
       - 'master':