Merge "Add csit job for multi-fcaps"

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 8bfd2aa..4cb7359 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -67,3 +67,11 @@
     project-name: 'aaf-authz'
     branch: 'master'
     mvn-settings: 'aaf-authz-settings'
+
+- project:
+    name: aaf-authz-info
+    project-name: aaf-authz
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/authz
+    branch: master

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 523c67e..a605a81 100644 (file)
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -116,3 +116,11 @@
     project-name: 'aaf-cadi'
     branch: 'master'
     mvn-settings: 'aaf-cadi-settings'
+
+- project:
+    name: aaf-cadi-info
+    project-name: aaf-cadi
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/cadi
+    branch: master

diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
index 14bb22f..8733823 100644 (file)
--- a/jjb/aaf/aaf-luaplugin.yaml
+++ b/jjb/aaf/aaf-luaplugin.yaml
@@ -8,3 +8,11 @@
     project: 'aaf/luaplugin'
     branch: 'master'
     mvn-settings: 'aaf-luaplugin-settings'
+
+- project:
+    name: aaf-luaplugin-info
+    project-name: aaf-luaplugin
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/luaplugin
+    branch: master

diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index 3e0e8cd..6341892 100644 (file)
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -22,3 +22,11 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aaf-sms-info
+    project-name: aaf-sms
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/sms
+    branch: master

diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index 0782b9d..6e4ab2e 100644 (file)
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -19,3 +19,11 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aaf-sshsm-info
+    project-name: aaf-sshsm
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aaf/sshsm
+    branch: master

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 85f27f3..1f5d8cc 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -51,3 +51,11 @@
           branch: 'master'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-aai-common-info
+    project-name: aai-aai-common
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/aai-common
+    branch: master

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index d0a5c87..6245489 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -53,3 +53,11 @@
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+
+- project:
+    name: aai-babel-info
+    project-name: aai-babel
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/babel
+    branch: master

diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index b9b9dfb..fde02ce 100644 (file)
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -50,3 +50,11 @@
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 
+
+- project:
+    name: aai-cacher-info
+    project-name: aai-cacher
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/cacher
+    branch: master

diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index c647772..dbb60b9 100644 (file)
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -38,3 +38,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-chameleon-settings'
+
+- project:
+    name: aai-chameleon-info
+    project-name: aai-chameleon
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/chameleon
+    branch: master

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index b69e8e0..59d9580 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -51,3 +51,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-champ-settings'
+
+- project:
+    name: aai-champ-info
+    project-name: aai-champ
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/champ
+    branch: master

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index dd15d46..eb7f5bb 100644 (file)
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -50,3 +50,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-data-router-settings'
+
+- project:
+    name: aai-data-router-info
+    project-name: aai-data-router
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/data-router
+    branch: master

diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 1184bef..583e321 100644 (file)
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -39,3 +39,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-esr-gui-settings'
+
+- project:
+    name: aai-esr-gui-info
+    project-name: aai-esr-gui
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/esr-gui
+    branch: master

diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 5527e7b..250969c 100644 (file)
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -52,3 +52,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-esr-server-settings'
+
+- project:
+    name: aai-esr-server-info
+    project-name: aai-esr-server
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/esr-server
+    branch: master

diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 4b98a5a..3ba2992 100644 (file)
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -46,3 +46,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-event-client-settings'
+
+- project:
+    name: aai-event-client-info
+    project-name: aai-event-client
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/event-client
+    branch: master

diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index 1b47881..3f79530 100644 (file)
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -31,3 +31,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-gallifrey-settings'
+
+- project:
+    name: aai-gallifrey-info
+    project-name: aai-gallifrey
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/gallifrey
+    branch: master

diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index f8d3e71..530def2 100644 (file)
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -51,3 +51,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-gizmo-settings'
+
+- project:
+    name: aai-gizmo-info
+    project-name: aai-gizmo
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/gizmo
+    branch: master

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 0c56aa4..efab1a8 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -55,3 +55,11 @@
           branch: 'master'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-graphadmin-info
+    project-name: aai-graphadmin
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/graphadmin
+    branch: master

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 5464086..b1b4c7a 100644 (file)
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -18,3 +18,11 @@
     mvn-settings: 'aai-graphgraph-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aai-graphgraph-info
+    project-name: aai-graphgraph
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/graphgraph
+    branch: master

diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 436d6d1..53fe21c 100644 (file)
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -46,3 +46,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-logging-service-settings'
+
+- project:
+    name: aai-logging-service-info
+    project-name: aai-logging-service
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/logging-service
+    branch: master

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index c1ed8c3..a459e50 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -51,3 +51,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
+
+- project:
+    name: aai-model-loader-info
+    project-name: aai-model-loader
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/model-loader
+    branch: master

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 9f86ab7..787b453 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -55,3 +55,11 @@
           branch: 'master'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-resources-info
+    project-name: aai-resources
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/resources
+    branch: master

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 4a69a5d..bbb1574 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -46,3 +46,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
+
+- project:
+    name: aai-rest-client-info
+    project-name: aai-rest-client
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/rest-client
+    branch: master

diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 43127d1..e4d0745 100644 (file)
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -46,3 +46,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-router-core-settings'
+
+- project:
+    name: aai-router-core-info
+    project-name: aai-router-core
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/router-core
+    branch: master

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index c77e402..0203729 100644 (file)
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -53,3 +53,11 @@
           branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-schema-service-info
+    project-name: aai-schema-service
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/schema-service
+    branch: master

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index abf9bf1..fddc4da 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -13,10 +13,11 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'pom.xml'
+          pom: 'search-data-service-app/pom.xml'
           mvn-goals: 'docker:build'
           build-node: ubuntu1604-docker-8c-8g
     project: 'aai/search-data-service'
+    docker-image-name: 'onap/search-data-service'
     stream:
       - 'casablanca':
           branch: 'casablanca'
@@ -26,6 +27,23 @@
     files: '**'
     archive-artifacts: ''
 
+- project:
+    name: aai-search-data-service-searchguard
+    project-name: 'aai-search-data-service-searchguard'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'elasticsearch-sg/pom.xml'
+          mvn-goals: 'docker:build'
+          build-node: ubuntu1604-docker-8c-8g
+    project: 'aai/search-data-service'
+    docker-image-name: 'onap/elasticsearch-sg'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-search-data-service-settings'
+    files: '**'
+    archive-artifacts: ''
+
 - project:
     name: aai-search-data-service-sonar
     jobs:
@@ -50,3 +68,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-search-data-service-settings'
+
+- project:
+    name: aai-search-data-service-info
+    project-name: aai-search-data-service
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/search-data-service
+    branch: master

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 015f047..4b3bc44 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -50,3 +50,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-sparky-be-settings'
+
+- project:
+    name: aai-sparky-be-info
+    project-name: aai-sparky-be
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/sparky-be
+    branch: master

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 08106bd..596eeaf 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -16,3 +16,11 @@
     mvn-settings: 'aai-sparky-fe-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aai-sparky-fe-info
+    project-name: aai-sparky-fe
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/sparky-fe
+    branch: master

diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index 2198a7b..ca8d585 100644 (file)
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -50,3 +50,11 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-spike-settings'
+
+- project:
+    name: aai-spike-info
+    project-name: aai-spike
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/spike
+    branch: master

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index ef4217d..9927db5 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -55,3 +55,11 @@
           branch: 'master'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-traversal-info
+    project-name: aai-traversal
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/traversal
+    branch: master

diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 79a89e3..a5dd70b 100644 (file)
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -52,3 +52,11 @@
           branch: 'master'
     mvn-settings: 'aai-validation-settings'
 
+
+- project:
+    name: aai-validation-info
+    project-name: aai-validation
+    jobs:
+      - gerrit-info-yaml-verify
+    project: aai/validation
+    branch: master

diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 00923cc..c31a51d 100644 (file)
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'appc/cdt'
@@ -26,3 +27,11 @@
     branch: 'master'
     mvn-settings: 'appc-cdt-settings'
 
+
+- project:
+    name: appc-cdt-info
+    project-name: appc-cdt
+    jobs:
+      - gerrit-info-yaml-verify
+    project: appc/cdt
+    branch: master

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index aa15deb..027e181 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -6,6 +6,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-docker-image-blessing'
 
@@ -74,3 +75,11 @@
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
 #    build-node: ubuntu1604-docker-arm64-4c-2g
+
+- project:
+    name: appc-deployment-info
+    project-name: appc-deployment
+    jobs:
+      - gerrit-info-yaml-verify
+    project: appc/deployment
+    branch: master

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 80b6df2..d623f83 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -7,6 +7,7 @@
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-merge-java':
           build-node: ubuntu1604-builder-8c-8g
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily':
           build-node: ubuntu1604-builder-8c-8g
 
@@ -44,3 +45,11 @@
     project-name: 'appc'
     branch: 'master'
     mvn-settings: 'appc-settings'
+
+- project:
+    name: appc-info
+    project-name: appc
+    jobs:
+      - gerrit-info-yaml-verify
+    project: appc
+    branch: master

diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index e9dcc4b..8733f80 100644 (file)
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -11,6 +11,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'appc/parent'
@@ -19,3 +20,11 @@
           branch: 'master'
     mvn-settings: 'appc-parent-settings'
     build-node: ubuntu1604-builder-2c-1g
+
+- project:
+    name: appc-parent-info
+    project-name: appc-parent
+    jobs:
+      - gerrit-info-yaml-verify
+    project: appc/parent
+    branch: master

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 208a9b3..a5a4869 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -3,7 +3,9 @@
     name: ccsdk-project-view
     project-name: ccsdk
     views:
-      - project-view
+      - common-view
+    view-name: ccsdk
+    view-regex: '(?!.*-maven-stage-)(ccsdk-.*)$'
 
 - project:
     name: ccsdk-apps
@@ -11,6 +13,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/apps'

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index f1efc61..d563216 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/cds'

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
new file mode 100644 (file)
index 0000000..e5ecc10
--- /dev/null
+++ b/jjb/ccsdk/dashboard.yaml
@@ -0,0 +1,49 @@
+---
+- project:
+    name: ccsdk-dashboard
+    project-name: 'ccsdk-dashboard'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'ccsdk/dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-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: centos7-redis-4c-4g
+
+- project:
+    name: ccsdk-dashboard-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: centos7-redis-4c-4g
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-dashboard-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    build-node: centos7-redis-4c-4g
+

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index af9ae32..77d2da1 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'ccsdk/distribution'
     stream:

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 5a9c8ce..aa31724 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/features'

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 0cebc4d..369960c 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/parent'

diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 8610819..74d16b3 100644 (file)
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/platform/plugins'

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index b880dcc..d88fbe8 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/sli/adaptors'

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index fee7df8..389a765 100644 (file)
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/sli/core'

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 5c85642..bfc9834 100644 (file)
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/sli/northbound'

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 27f06c9..c4ef4a1 100644 (file)
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/sli/plugins'

diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index b0b011f..713eafd 100644 (file)
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'ccsdk/utils'

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 5c90a17..b31cffa 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -18,3 +18,17 @@
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
     jjb-version: 2.9.1
+
+- project:
+    name: builder-openstack
+    jobs:
+      - gerrit-openstack-cron
+
+    project: ci-management
+    project-name: ci-management
+    build-node: centos7-builder-2c-1g
+
+    jenkins-urls: >
+        https://jenkins.onap.org
+        https://jenkins.onap.org/sandbox
+    openstack-cloud: vex

diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 88ce906..ed84bae 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -19,7 +19,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1604-docker-v1-8c-8g'
     build-timeout: 180
 
 - project:

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 748dfb0..2a11e97 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -21,7 +21,7 @@
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
       - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean install dockerfile:build dockerfile:push'
+          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
           script: '/bin/true'
 
 - project:

diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index e4f69ff..8d03011 100755 (executable)
--- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -9,8 +9,10 @@ chmod 755 ./ocata/docker/*.*
 chmod 755 ./windriver/docker/*.*
 chmod 755 ./pike/docker/*.*
 chmod 755 ./starlingx/docker/*.*
+chmod 755 ./lenovo/docker/*.*
 
 ./ocata/docker/build_image.sh
 ./windriver/docker/build_image.sh
 ./pike/docker/build_image.sh
 ./starlingx/docker/build_image.sh
+./lenovo/docker/build_image.sh

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 6ec4a7d..b3fec07 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -50,6 +50,14 @@
           path: 'fcaps'
           pattern: 'fcaps/**'
           pom: 'fcaps/pom.xml'
+      - 'lenovo':
+          path: 'lenovo'
+          pattern: 'lenovo/**'
+          pom: 'lenovo/pom.xml'
+      - 'lenovo_share':
+          path: 'lenovo'
+          pattern: 'share/**'
+          pom: 'lenovo/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-verify-java'
@@ -163,3 +171,17 @@
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: multicloud-openstack-lenovo-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-lenovo'
+    branch: 'master'
+    mvn-params: '-f lenovo/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index 1fc2c4c..f854c71 100644 (file)
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -11,6 +11,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'oparent'
     stream:

diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml
deleted file mode 100644 (file)
index b9bf001..0000000
--- a/jjb/policy/policy-core.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-core
-    project-name: 'policy-core'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/core'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-core-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-core-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/core'
-    project-name: 'policy-core'
-    branch: 'master'
-    mvn-settings: 'policy-core-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-core-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/core
-    project-name: 'policy-core'
-    branch: 'master'
-    mvn-settings: 'policy-core-settings'

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
deleted file mode 100644 (file)
index dd62159..0000000
--- a/jjb/policy/policy-gui.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-gui
-    project-name: 'policy-gui'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/gui'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-gui-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-gui-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/gui'
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-gui-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/gui
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'

diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
deleted file mode 100644 (file)
index fd93a3c..0000000
--- a/jjb/policy/policy-pdp.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: policy-pdp
-    project-name: 'policy-pdp'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-
-    project: 'policy/pdp'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-pdp-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/pdp'
-    project-name: 'policy-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-pdp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: policy-pdp-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: policy/pdp
-    project-name: 'policy-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-pdp-settings'

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 8eae934..3b82a9b 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -11,6 +11,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/apps'

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 190e0c2..a2bf9a9 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -5,6 +5,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'sdnc/northbound'

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 58d73fc..4be63a2 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -6,6 +6,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage
       - '{project-name}-{stream}-release-version-java-daily'
     project: 'sdnc/oam'
     stream:

diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml
deleted file mode 100644 (file)
index b348d06..0000000
--- a/jjb/usecaseui/usecase-ui-server-csit.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: usecase-ui-server-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecase-ui-server'
-    stream: 'master'
-    functionality:
-      - 'testsuite':
-          trigger_jobs: '{project-name}-{stream}-docker-java-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml
index 1e7b8cf..33a21d6 100644 (file)
--- a/jjb/vnfrqts/build-and-upload.yaml
+++ b/jjb/vnfrqts/build-and-upload.yaml
@@ -9,6 +9,7 @@
     pre_script: ''
     post_script: ''
     artifact_name: ''
+    project_id: ''
 
     project-type: freestyle
     concurrent: true
@@ -45,6 +46,10 @@
 
     triggers:
       - timed: 'H H * * *'
+      - gerrit-trigger-release-manually:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
 
     builders:
       - lf-provide-maven-settings:
@@ -56,6 +61,7 @@
       - inject:
           properties-content: |
             ARTIFACT_NAME={artifact_name}
+            PROJECT_ID={project_id}
       - shell: '{obj:post_script}'
       - lf-provide-maven-settings-cleanup
 

diff --git a/jjb/vnfrqts/post-upload-artifact.sh b/jjb/vnfrqts/post-upload-artifact.sh
index 7719312..588e49b 100644 (file)
--- a/jjb/vnfrqts/post-upload-artifact.sh
+++ b/jjb/vnfrqts/post-upload-artifact.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
 set -e -o pipefail
-echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$JOB_BASE_NAME/$GERRIT_BRANCH/$ARTIFACT_NAME"
-curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$JOB_BASE_NAME/$GERRIT_BRANCH/$ARTIFACT_NAME"
\ No newline at end of file
+set -- $ARTIFACT_NAME
+if [ -z "$ARTIFACT_NAME" ]
+then
+    echo "ERROR NO ARTIFACTS ENTERED"
+else
+    if [ -z "$2" ]
+    then
+        cd $WORKSPACE/docs/data
+        echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
+        curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME"
+    else
+        cd $WORKSPACE/ice_validator/output
+        echo "-n --upload-file $1 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1"
+        curl -n --upload-file "$1" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1"
+        echo "-n --upload-file $2 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2"
+        curl -n --upload-file "$2" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2"
+    fi
+fi
\ No newline at end of file

diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml
index 1b3f166..7bb260e 100644 (file)
--- a/jjb/vnfrqts/vnfrqts-requirements.yaml
+++ b/jjb/vnfrqts/vnfrqts-requirements.yaml
@@ -20,5 +20,6 @@
     jobs:
       - '{project-name}-{stream}-build-and-upload':
           pre_script: !include-raw-escape: pre-build-needs.sh
-          artifact_name: docs/data/needs.json
+          artifact_name: needs.json
+          project_id: org.onap.vnfrqts.requirements
           post_script: !include-raw-escape: post-upload-artifact.sh

diff --git a/jjb/vvp/build-csv.sh b/jjb/vvp/build-csv.sh
deleted file mode 100644 (file)
index 7c37912..0000000
--- a/jjb/vvp/build-csv.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-virtualenv -p python3 $WORKSPACE/venv-tox
-source $WORKSPACE/venv-tox/bin/activate
-pip3 install --upgrade pip
-pip3 install --no-use-pep517 -r requirements.txt
-ls
-cd ice_validator/
-pytest --self-test tests/

diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh
new file mode 100644 (file)
index 0000000..b90f77b
--- /dev/null
+++ b/jjb/vvp/pre-build-csv.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+virtualenv -p python3 $WORKSPACE/venv-tox
+source $WORKSPACE/venv-tox/bin/activate
+pip3 install --upgrade pip
+pip3 install --no-use-pep517 -r requirements.txt
+ls
+wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json"
+echo "Copied newest needs."
+cd ice_validator/
+pytest --self-test tests/
\ No newline at end of file

diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 9baec85..943ea87 100644 (file)
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -44,5 +44,7 @@
           branch: 'master'
     jobs:
       - '{project-name}-{stream}-build-and-upload':
-          script:
-              !include-raw-escape: 'build-csv.sh'
+          pre_script: !include-raw-escape: pre-build-csv.sh
+          artifact_name: traceability.csv rst.csv
+          project_id: org.onap.vvp.validation-scripts
+          post_script: !include-raw-escape: ../vnfrqts/post-upload-artifact.sh