X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-platform-ves-openapi-manager.yaml;h=3a959ce49d9701c0ab94e0f9b9ee71b057e83309;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=77a9468fa10a5614245889b994d42975e1e57975;hpb=ff4e6555875fb4010e02caaaefd0107c6eb9acd5;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 77a9468fa..3a959ce49 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -1,69 +1,76 @@
 ---
 - project:
-      name: dcaegen2-platform-ves-openapi-manager
-      project-name: 'dcaegen2-platform-ves-openapi-manager'
-      java-version: openjdk11
-      jobs:
-          - '{project-name}-{stream}-verify-java'
-          - '{project-name}-{stream}-merge-java'
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos7-docker-8c-8g
-                maven-versions-plugin: true
-          - 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-goals: 'clean package docker:build docker:push'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-8c-8g
+    name: dcaegen2-platform-ves-openapi-manager
+    project-name: "dcaegen2-platform-ves-openapi-manager"
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - 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-goals: "clean package docker:build docker:push"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: 'dcaegen2/platform/ves-openapi-manager'
-      stream:
-          - 'master':
-              branch: 'master'
-          - 'honolulu':
-              branch: 'honolulu'
-      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
-      # due to a strange macro / variable translation problem this needs
-      # to be passed as a string block to properly get the properties
-      # correctly defined in the job
-      maven-deploy-properties: |
-          deployAtEnd=true
-      files: '**'
-      archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+    project: "dcaegen2/platform/ves-openapi-manager"
+    stream:
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
-      name: dcaegen2-platform-ves-openapi-sonar
-      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: 'dcaegen2/platform/ves-openapi-manager'
-      project-name: 'dcaegen2-platform-ves-openapi-manager'
-      branch: 'master'
-      mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: dcaegen2-platform-ves-openapi-sonar
+    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: "dcaegen2/platform/ves-openapi-manager"
+    project-name: "dcaegen2-platform-ves-openapi-manager"
+    branch: "master"
+    mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
+- project:
+    name: dcaegen2-platform-ves-openapi-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: dcaegen2/platform/ves-openapi-manager
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: "dcaegen2-platform-ves-openapi-manager"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-platform-ves-openapi-manager-settings"
 
 - project:
     name: dcaegen2-platform-ves-openapi-manager-project-view
     project-name: dcaegen2-platform-ves-openapi-manager
     views:
       - project-view
-
-- project:
-    name: dcaegen2-platform-ves-openapi-manager-info
-    project: dcaegen2/platform/ves-openapi-manager
-    project-name: dcaegen2-platform-ves-openapi-manager
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify