X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foom-platform-cert-service%2Foom-platform-cert-service.yaml;h=2c79c95c2ad2de33ac623cb523c74e496849172e;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=5bcd5f327e2c2a1db69c1695daff60279e2a5cab;hpb=ce45d7b892d0d7df5d2e1f7b9e6a3f823819ed47;p=ci-management.git

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 5bcd5f327..2c79c95c2 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -6,75 +6,70 @@
       - project-view
 
 - project:
-    name: oom-platform-cert-service-info
-    project: oom/platform/cert-service
-    project-name: oom-platform-cert-service
-    build-node: centos7-builder-2c-1g
+    name: oom-platform-cert-service
+    project-name: "oom-platform-cert-service"
+    stream:
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+      - "london":
+          branch: "london"
+          java-version: openjdk11
+    project: "oom/platform/cert-service"
+    mvn-settings: "oom-platform-cert-service-settings"
+    files: "**"
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - gerrit-info-yaml-verify
-
-- project:
-      name: oom-platform-cert-service
-      project-name: 'oom-platform-cert-service'
-      stream:
-          -   'master':
-                  branch: 'master'
-                  java-version: openjdk11
-      project: 'oom/platform/cert-service'
-      mvn-settings: 'oom-platform-cert-service-settings'
-      files: '**'
-      maven-deploy-properties: |
-          deployAtEnd=true
-      archive-artifacts: ''
-      build-node: ubuntu1804-docker-8c-8g
-      jobs:
-          - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install'
-          - '{project-name}-{stream}-merge-java':
-                mvn-goals: 'clean deploy'
-          -  '{project-name}-gerrit-release-jobs':
-                 build-node: centos7-docker-8c-8g
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos7-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-goals: 'clean deploy -P docker'
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+      - "{project-name}-{stream}-verify-java":
+          mvn-goals: "clean install"
+      - "{project-name}-{stream}-merge-java":
+          mvn-goals: "clean deploy"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: "clean deploy -P docker"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
 
 - project:
-      name: oom-platform-cert-service-sonar
-      subproject: 'oom-platform-cert-service'
-      path: 'certService'
-      java-version: openjdk11
-      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: ubuntu1804-docker-8c-8g
-      project: 'oom/platform/cert-service'
-      project-name: 'oom-platform-cert-service'
-      branch: 'master'
-      mvn-settings: 'oom-platform-cert-service-settings'
-      mvn-pom: 'certService/pom.xml'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: oom-platform-cert-service-sonar
+    subproject: "oom-platform-cert-service"
+    path: "certService"
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    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: "oom/platform/cert-service"
+    project-name: "oom-platform-cert-service"
+    branch: "master"
+    mvn-settings: "oom-platform-cert-service-settings"
+    mvn-pom: "certService/pom.xml"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: oom-platform-cert-service-clm
-      java-version: openjdk11
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: 'onap-'
-      project: oom/platform/cert-service
-      project-name: 'oom-platform-cert-service'
-      branch: 'master'
-      build-node: ubuntu1804-docker-8c-8g
-      mvn-settings: 'oom-platform-cert-service-settings'
+    name: oom-platform-cert-service-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: oom/platform/cert-service
+    project-name: "oom-platform-cert-service"
+    branch: "master"
+    build-node: ubuntu1804-docker-8c-8g
+    mvn-settings: "oom-platform-cert-service-settings"