X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-sdc-workflow-designer.yaml;h=aaf24b6da6ca7804c9131496bf454debb76236f6;hb=2f25a5853974c7f70361708c91a3df193a730326;hp=9bc31df3c6c676713eb8baba645d6423aad6243e;hpb=fb7a792032752f7e61dd330c6f5ac2032c964bfe;p=ci-management.git

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 9bc31df3c..aaf24b6da 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -4,93 +4,75 @@
     project-name: sdc-sdc-workflow
     views:
       - project-view
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer
-    project-name: 'sdc-sdc-workflow-designer'
+    project-name: "sdc-sdc-workflow-designer"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          sbom-generator: true
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          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
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    java-version: openjdk11
 
-    project: 'sdc/sdc-workflow-designer'
+    project: "sdc/sdc-workflow-designer"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'sdc-sdc-workflow-designer-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+      - "montreal":
+          branch: "montreal"
+    mvn-settings: "sdc-sdc-workflow-designer-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
+    maven-version: "mvn36"
 
-#- project:
-#    name: sdc-sdc-workflow-designer-arm64
-#    project-name: 'sdc-sdc-workflow-designer-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'sdc/sdc-workflow-designer'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-sdc-workflow-designer-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
 - project:
     name: sdc-sdc-workflow-designer-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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'sdc/sdc-workflow-designer'
-    project-name: 'sdc-sdc-workflow-designer'
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-workflow-designer-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    project: "sdc/sdc-workflow-designer"
+    project-name: "sdc-sdc-workflow-designer"
+    branch: "master"
+    mvn-settings: "sdc-sdc-workflow-designer-settings"
+    mvn-params: "-Djacoco.skip=false -Dsonar.branch={branch}"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: sdc/sdc-workflow-designer
-    project-name: 'sdc-sdc-workflow-designer'
+    project-name: "sdc-sdc-workflow-designer"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-workflow-designer-settings'
-
-- project:
-    name: sdc-sdc-workflow-designer-info
-    project-name: sdc-sdc-workflow-designer
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdc/sdc-workflow-designer
-    branch: master
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "sdc-sdc-workflow-designer-settings"
+    java-version: openjdk11