X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Faai%2Faai-resources.yaml;h=9f86ab7b81aa74340193155909f11fb180a38ccd;hb=refs%2Fchanges%2F71%2F130971%2F1;hp=f19dc211be6fbb19979f66e4b809f32fcaed53dc;hpb=483db677c8137ba4a48b5d67117f09322c8333f0;p=ci-management.git

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index f19dc211b..2632d2c27 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -9,45 +9,91 @@
     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'
+      - '{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'
-      - 'casablanca':
-          branch: 'casablanca'
+      - '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: 'casablanca'
+    branch: 'master'
     mvn-settings: 'aai-resources-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-resources-clm
     jobs:
       - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'casablanca'
+    stream:
+        - '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