X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc.yaml;h=665edff78c1a0fb93a077198969b76bbd85efb55;hb=2f25a5853974c7f70361708c91a3df193a730326;hp=0fa71bef18ff4fb471f607d7364059647e94ad8d;hpb=2d0e40b49c7bf799c9a13d033f8aa15b5a86bde8;p=ci-management.git

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 0fa71bef1..665edff78 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -25,97 +25,89 @@
 
 - project:
     name: sdc
-    project-name: 'sdc'
+    project-name: "sdc"
     jobs:
-      - '{project-name}-{stream}-verify-java':
-          # this build is unit test only (Verify 1/2)
-          mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
-          build-node: 'ubuntu1804-docker-8c-8g'
-      - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-8c-16g'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+      - "{project-name}-{stream}-{area}-verify-shell":
+          # This is to ensure all script are Python 3 compatible
+          area: python
+          build-timeout: 9
+          script: !include-raw-escape: "python3-verify.sh"
+      - "{project-name}-{stream}-verify-java":
+          # this build is unit test only (Verify 1/3)
+          mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+          build-node: "ubuntu1804-docker-8c-8g"
+      - "{project-name}-{stream}-sdc-merge-java":
+          build-node: "ubuntu1804-docker-8c-16g"
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          # yamllint disable-line rule:line-length
+          mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator"
           # running everything (unit tests and integration tests in a single job for merge, as we don't need // run
           # for merge, but still saving integration tests results and report.
           archive-artifacts: >
-              **/*.log
-              **/hs_err_*.log
-              **/target/**/feature.xml
-              **/target/failsafe-reports/failsafe-summary.xml
-              integration-tests/target/ExtentReport/API/*.html
-              integration-tests/target/ExtentReport/UI/*.html
-              integration-tests/target/ExtentReport/UI/screenshots/*.png
+            **/*.log
+            **/hs_err_*.log
+            **/target/**/feature.xml
+            **/target/failsafe-reports/failsafe-summary.xml
+            integration-tests/target/ExtentReport/API/*.html
+            integration-tests/target/ExtentReport/UI/*.html
+            integration-tests/target/ExtentReport/UI/screenshots/*.png
       - gerrit-maven-stage:
           build-timeout: 90
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          sbom-generator: true
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
+          mvn-version: "mvn36"
+          mvn-params: "-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
-          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 -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+          mvn-version: "mvn36"
+          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
 
-    project: 'sdc'
+    project: "sdc"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
+      - "london":
+          branch: "london"
           java-version: openjdk11
-#     - 'frankfurt':
-#         branch: 'frankfurt'
-#         java-version: openjdk8
-    mvn-settings: 'sdc-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "montreal":
+          branch: "montreal"
+          java-version: openjdk11
+    mvn-settings: "sdc-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
-    maven-version: 'mvn36'
+    maven-version: "mvn36"
 
-#- project:
-#    name: sdc-arm64
-#    project-name: 'sdc-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
-#    project: 'sdc'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    maven-version: 'mvn35'
-#
 - project:
     name: sdc-sonar
     jobs:
       - gerrit-maven-sonar:
           build-timeout: 120
     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'
+    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-docker-8c-16g
-    project: 'sdc'
-    project-name: 'sdc'
-    branch: 'master'
-    mvn-settings: 'sdc-settings'
+    project: "sdc"
+    project-name: "sdc"
+    branch: "master"
+    mvn-settings: "sdc-settings"
     java-version: openjdk11
-    mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
+    mvn-version: "mvn36"
 
 - project:
     name: sdc-clm
@@ -123,36 +115,14 @@
       - gerrit-maven-clm:
           build-timeout: 120
           submodule-timeout: 30
-          mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
-    nexus-iq-namespace: 'onap-'
-    project: sdc
-    project-name: 'sdc'
-    build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
-    mvn-settings: 'sdc-settings'
-    java-version: openjdk11
-
-- project:
-    name: sdc-info
-    project-name: sdc
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+          mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
+    nexus-iq-namespace: "onap-"
     project: sdc
-    branch: master
-
-- project:
-    name: 'sdc-whitesource'
-    project-name: 'sdc'
+    project-name: "sdc"
     build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan:
-          build-timeout: 120
-          submodule-timeout: 30
-          java-opts: '-Xmx2048m'
-    mvn-settings: 'sdc-settings'
-    wss-product-name: 'sdc'
-    mvn-clean-install: true
-    project: 'sdc'
-    branch: master
+    stream:
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    mvn-settings: "sdc-settings"
     java-version: openjdk11