X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-clamp.yaml;h=9758bbaead022fc0fe27210afc676a86a74dd662;hb=b727b9540f52904c0fb11e7d3b733fd3ff600cf6;hp=ec44e68bafb04e6623f5a02afb2f2b8f93971370;hpb=193d61489a92f3d66978c84b1d752b41a95472bc;p=ci-management.git

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index ec44e68ba..9758bbaea 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -1,38 +1,84 @@
 ---
 - project:
     name: policy-clamp
-    project-name: 'policy-clamp'
+    project-name: "policy-clamp"
     jobs:
       - gerrit-maven-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
+          sbom-generator: true
           maven-versions-plugin: true
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-      - '{project-name}-{stream}-verify-java':
-          mvn-params: '-P docker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -P docker"
+      - "{project-name}-{stream}-verify-java":
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-16g
-      - '{project-name}-{stream}-merge-java':
+      - "{project-name}-{stream}-merge-java":
           build-node: ubuntu1804-docker-8c-16g
-          mvn-params: '-P docker'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+          mvn-params: "-P docker"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-    project: 'policy/clamp'
+    project: "policy/clamp"
     stream:
-        - 'master':
-              branch: 'master'
-        - 'tosca-poc':
-              branch: 'tosca-poc'
-    mvn-settings: 'policy-clamp-settings'
+      - "master":
+          branch: "master"
+      - "java-17":
+          branch: "java-17"
+    mvn-settings: "policy-clamp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: policy-clamp-java11
+    project-name: "policy-clamp"
+    jobs:
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sbom-generator: true
+          maven-versions-plugin: true
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -P docker"
+      - "{project-name}-{stream}-verify-java":
+          mvn-params: "-P docker"
+          build-node: ubuntu1804-docker-8c-16g
+      - "{project-name}-{stream}-merge-java":
+          build-node: ubuntu1804-docker-8c-16g
+          mvn-params: "-P docker"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/clamp"
+    stream:
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+      - "london":
+          branch: "london"
+    mvn-settings: "policy-clamp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -40,37 +86,29 @@
     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'
+    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-8g
-    project: 'policy/clamp'
-    project-name: 'policy-clamp'
-    branch: 'master'
-    mvn-settings: 'policy-clamp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    java-version: openjdk11
+    project: "policy/clamp"
+    project-name: "policy-clamp"
+    branch: "master"
+    mvn-settings: "policy-clamp-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk17
 
 - project:
     name: policy-clamp-clm
     jobs:
       - gerrit-maven-clm:
-    nexus-iq-namespace: 'onap-'
-    project: 'policy/clamp'
-    project-name: 'policy-clamp'
-    branch: 'master'
-    mvn-settings: 'policy-clamp-settings'
+    nexus-iq-namespace: "onap-"
+    project: "policy/clamp"
+    project-name: "policy-clamp"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-clamp-settings"
     build-node: ubuntu1804-docker-8c-8g
-    java-version: openjdk11
-
-- project:
-    name: policy-clamp-info
-    project-name: policy-clamp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: policy/clamp
-    branch: master
+    java-version: openjdk17