X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fusecaseui%2Fusecase-ui-nlp.yaml;h=5942089f396d3d9190b715be0606f90946ba53f8;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=07914878687ef2b49fba2d26092ae17f7e74775a;hpb=19f07ea4d635f43f49aac2fae55864244cfefbf7;p=ci-management.git

diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
index 079148786..5942089f3 100644
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -1,68 +1,61 @@
 ---
-
 - project:
     name: usecase-ui-nlp
-    project-name: 'usecase-ui-nlp'
-    project: 'usecase-ui/nlp'
+    project-name: "usecase-ui-nlp"
+    project: "usecase-ui/nlp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'usecase-ui-nlp-settings'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+      - "montreal":
+          branch: "montreal"
+    mvn-settings: "usecase-ui-nlp-settings"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - "{project-name}-{stream}-docker-java-daily":
+          mvn-params: "-Dmaven.test.skip=true"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: usecase-ui-nlp-sonar
     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: ubuntu2004-builder-4c-4g
-    project: 'usecase-ui/nlp'
-    project-name: 'usecase-ui-nlp'
-    branch: 'master'
-    mvn-settings: 'usecase-ui-nlp-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}"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "usecase-ui/nlp"
+    project-name: "usecase-ui-nlp"
+    branch: "master"
+    mvn-settings: "usecase-ui-nlp-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: usecase-ui-nlp-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: usecase-ui/nlp
-    project-name: 'usecase-ui-nlp'
-    build-node: ubuntu2004-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'usecase-ui-nlp-settings'
-
-- project:
-    name: usecase-ui-nlp-info
-    project-name: usecase-ui-nlp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    nexus-iq-namespace: "onap-"
     project: usecase-ui/nlp
-    branch: master
+    project-name: "usecase-ui-nlp"
+    build-node: ubuntu1804-builder-4c-4g
+    branch: "master"
+    mvn-settings: "usecase-ui-nlp-settings"
 
 - project:
     name: usecase-ui-nlp-project-view