X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-sdc-helm-validator.yaml;h=bdc5df411d5b7f4a5dd232d6317bf8ecb79d9599;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=7bbf0307b21cb9a693c183b03ce0791ee16e95c3;hpb=f1a0754379362f8edbb63509e9c76df5a03ff0c9;p=ci-management.git

diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml
index 7bbf0307b..bdc5df411 100644
--- a/jjb/sdc/sdc-sdc-helm-validator.yaml
+++ b/jjb/sdc/sdc-sdc-helm-validator.yaml
@@ -5,43 +5,36 @@
     views:
       - project-view
 
-- project:
-    name: sdc-sdc-helm-validator-info
-    project: sdc/sdc-helm-validator
-    project-name: sdc-sdc-helm-validator
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
 - project:
     name: sdc-sdc-helm-validator
-    project-name: 'sdc-sdc-helm-validator'
+    project-name: "sdc-sdc-helm-validator"
     java-version: openjdk11
     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-docker-8c-8g
+          sbom-generator: true
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-          mvn-goals: 'clean deploy'
+          mvn-goals: "clean deploy"
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-goals: 'clean install docker:build docker:push'
-          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: 'sdc/sdc-helm-validator'
-    mvn-settings: 'sdc-sdc-helm-validator-settings'
+          mvn-goals: "clean install docker:build docker:push"
+          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/sdc-helm-validator"
+    mvn-settings: "sdc-sdc-helm-validator-settings"
     stream:
-      - 'master':
-            branch: 'master'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu2004-docker-8c-8g
-
+      - "master":
+          branch: "master"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: sdc-sdc-helm-validator-sonar
@@ -49,31 +42,27 @@
     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-docker-8c-8g
-    project: 'sdc/sdc-helm-validator'
-    project-name: 'sdc-sdc-helm-validator'
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-helm-validator-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: ubuntu1804-docker-8c-8g
+    project: "sdc/sdc-helm-validator"
+    project-name: "sdc-sdc-helm-validator"
+    branch: "master"
+    mvn-settings: "sdc-sdc-helm-validator-settings"
+    mvn-params: "-Dsonar.branch={branch}"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: sdc-sdc-helm-validator-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'sdc/sdc-helm-validator'
-    project-name: 'sdc-sdc-helm-validator'
+    nexus-iq-namespace: "onap-"
+    project: "sdc/sdc-helm-validator"
+    project-name: "sdc-sdc-helm-validator"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
-    mvn-settings: 'sdc-sdc-helm-validator-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "sdc-sdc-helm-validator-settings"