X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-resources.yaml;h=2632d2c27809618d5e54d1e3abc3c643cbd2e992;hb=ed955cca682f4b9ea7eb72a6dc46c70ef6726406;hp=96234eb7e2d63d809acff2dd329b643dc7a530b8;hpb=c0ad7406de27aa3dc3fbc1c5c8fd7d15cd73dc7e;p=ci-management.git

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 96234eb7e..2632d2c27 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -9,32 +9,48 @@
     name: aai-resources
     project-name: 'aai-resources'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'aai-resources/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          mvn-params: '-DskipTests'
+          sign-artifacts: true
+          build-node: centos8-builder-4c-4g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          build-node: ubuntu1804-docker-8c-8g
+          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: 'aai/resources'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk8
 
 - project:
     name: aai-resources-sonar
     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: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/resources'
     project-name: 'aai-resources'
     branch: 'master'
@@ -42,6 +58,7 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-resources-clm
@@ -51,15 +68,32 @@
     project: 'aai/resources'
     project-name: 'aai-resources'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-resources-info
     project-name: aai-resources
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
     project: aai/resources
     branch: master
+    java-version: openjdk8
+
+- project:
+    name: 'aai-resources-whitesource'
+    project-name: 'aai-resources'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-resources-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/resources'
+    branch: master