Merge "CI: Rm sonar jobs for unmaintained project"

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
new file mode 100644 (file)
index 0000000..66c1aeb
--- /dev/null
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: cps-ncmp-dmi-plugin-project-view
+    project-name: cps-ncmp-dmi-plugin
+    views:
+      - project-view
+
+- project:
+    name: cps-ncmp-dmi-plugin-info
+    project: cps/ncmp-dmi-plugin
+    project-name: cps-ncmp-dmi-plugin
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index f82be7b..4fbd716 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -1,24 +1,7 @@
 ---
 - project:
     name: dcaegen2-analytics-tca-gen2
-    # job template iterators
-    project-name: 'dcaegen2-analytics-tca-gen2'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
     # apply to all jobs
-    project: 'dcaegen2/analytics/tca-gen2'
-    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
       - '{project-name}-{stream}-merge-java':
@@ -34,6 +17,26 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+    project: 'dcaegen2/analytics/tca-gen2'
+    # job template iterators
+    project-name: 'dcaegen2-analytics-tca-gen2'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
+    mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
+    mvn-version: 'mvn35'
+    maven-version: 'mvn35'
+    files: '**'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ''
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: dcaegen2-analytics-tca-gen2-sonar
     java-version: openjdk11
@@ -52,6 +55,8 @@
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn35'
+    maven-version: 'mvn35'
 
 - project:
     name: dcaegen2-analytics-tca-gen2-clm
@@ -64,6 +69,8 @@
     project-name: 'dcaegen2-analytics-tca-gen2'
     branch: 'master'
     mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
+    mvn-version: 'mvn35'
+    maven-version: 'mvn35'
 
 - project:
     name: dcaegen2-analytics-tca-gen2-info

diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
similarity index 77%
rename from jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
rename to jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
index d260fe8..f7bbf5a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml
@@ -1,18 +1,18 @@
 ---
 - project:
-      name: dcaegen2-services-pmmapper-csit
+      name: dcaegen2-services-pm-mapper-csit
       jobs:
           - '{project-name}-review-verification-maven-{stream}':
                   mvn-goals: clean install docker:build
           - '{project-name}-merge-verification-maven-{stream}':
                   mvn-goals: clean install docker:build
-      project-name: 'dcaegen2-services-pmmapper'
+      project-name: 'dcaegen2-services-pm-mapper'
       recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com'
       # project name in gerrit
       project: 'dcaegen2/services/pm-mapper'
       stream:
           - 'master':
                 branch: 'master'
-      mvn-settings: 'dcaegen2-services-pmmapper-settings'
+      mvn-settings: 'dcaegen2-services-pm-mapper-settings'
       robot-options: ''
       branch: 'master'