X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-model-loader.yaml;h=86505f4c598dbec2cd3aa2f742d0262ae6872c4e;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=93eef332349c5de5b54271d8fd847139fddcb829;hpb=4f90824df974a3368dec6b4f2da87199c5193564;p=ci-management.git

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 93eef3323..bfc961eb0 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -1,35 +1,99 @@
 ---
+- project:
+    name: aai-model-loader-project-view
+    project-name: aai-model-loader
+    views:
+      - project-view
+
 - project:
     name: aai-model-loader-master
     project-name: 'aai-model-loader'
     jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
-          mvn-goals: 'docker:build'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          mvn-params: '-P docker -B -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/model-loader'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
+    mvn-version: 'mvn36'
+    java-version: openjdk11
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-model-loader-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    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: ubuntu2004-builder-4c-4g
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
+
+- project:
+    name: aai-model-loader-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'aai/model-loader'
+    project-name: 'aai-model-loader'
+    stream:
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
+    mvn-settings: 'aai-model-loader-settings'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
+
+- project:
+    name: aai-model-loader-info
+    project-name: aai-model-loader
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: aai/model-loader
+    branch: master
+
+- project:
+    name: 'aai-model-loader-whitesource'
+    project-name: 'aai-model-loader'
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'aai-model-loader-settings'
+    wss-product-name: 'aai'
+    mvn-clean-install: true
+    project: 'aai/model-loader'
+    branch: master
+    java-version: openjdk11
+    mvn-version: 'mvn36'