X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcps%2Fcps-cps-temporal.yaml;h=c966d1219b62e8a5dbeec203d03e2b964d8781a1;hb=0e0e91ebdc7ae191816cef6c4676bb4cc696adcf;hp=d7b4ebcac8643f0f53cefae6ea4876205528fad8;hpb=d4a01af45ba4a1bff354dbc6dd7a777792987fcc;p=ci-management.git

diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index d7b4ebcac..c966d1219 100644
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -5,14 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: cps-cps-temporal-info
-    project: cps/cps-temporal
-    project-name: cps-cps-temporal
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
 - project:
     name: cps-cps-temporal
     java-version: openjdk11
@@ -20,8 +12,8 @@
     maven-version: mvn36
     project-name: cps-cps-temporal
     project: cps/cps-temporal
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     jobs:
       - gerrit-maven-docker-verify:
           container-public-registry: nexus3.onap.org:10001
@@ -29,23 +21,26 @@
           container-public-registry: nexus3.onap.org:10001
           container-snapshot-registry: nexus3.onap.org:10003
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: -Pdocker
           container-public-registry: nexus3.onap.org:10001
           container-staging-registry: nexus3.onap.org:10003
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
     stream:
-      - 'master':
+      - "master":
           branch: master
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
+      - "jakarta":
+          branch: "jakarta"
+          cron: ""
+      - "kohn":
+          branch: "kohn"
+          cron: ""
     mvn-settings: cps-cps-temporal-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-cps-temporal-clm
@@ -59,7 +54,7 @@
     project-name: cps-cps-temporal
     branch: master
     mvn-settings: cps-cps-temporal-settings
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-cps-temporal-sonar
@@ -69,29 +64,34 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: centos7-docker-8c-8g
-    project: cps/cps-temporal
-    project-name: cps-cps-temporal
-    branch: master
-    mvn-settings: cps-cps-temporal-settings
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
+    build-node: centos8-docker-8c-8g
+    project: "cps/cps-temporal"
+    project-name: "cps-cps-temporal"
+    branch: "master"
+    mvn-settings: "cps-cps-temporal-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: cps-cps-temporal-whitesource
-    project-name: cps-cps-temporal
-    jobs:
-      - gerrit-whitesource-scan
+    name: cps-cps-temporal-sonar-verify
     java-version: openjdk11
-    mvn-version: mvn36
-    mvn-settings: cps-cps-temporal-settings
-    wss-product-name: cps-cps-temporal
-    mvn-clean-install: true
-    project: cps/cps-temporal
-    branch: master
-    build-node: centos7-docker-8c-8g
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonarcloud-qualitygate-wait: true
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "cps/cps-temporal"
+    project-name: "cps-cps-temporal"
+    branch: "master"
+    mvn-settings: "cps-cps-temporal-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"