Merge "Allow docker-version-java to specify node"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 5330020..4dddda5 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -46,6 +46,8 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 4fc62cb..fc886cf 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -47,7 +47,9 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/babel'
     project-name: 'aai-babel'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 

diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index 38e4c4b..0e90a12 100644 (file)
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -44,7 +44,9 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/cacher'
     project-name: 'aai-cacher'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 

diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index c550684..a3befbb 100644 (file)
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -34,5 +34,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/chameleon'
     project-name: 'aai-chameleon'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-chameleon-settings'

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index ea1cb46..c83335b 100644 (file)
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -47,5 +47,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/champ'
     project-name: 'aai-champ'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-champ-settings'

diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index e28922f..870f9bc 100644 (file)
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/data-router'
     project-name: 'aai-data-router'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-data-router-settings'

diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 11c1d9f..c473cda 100644 (file)
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -35,5 +35,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/esr-gui'
     project-name: 'aai-esr-gui'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-esr-gui-settings'

diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 26ab6fe..0d8c990 100644 (file)
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -48,5 +48,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/esr-server'
     project-name: 'aai-esr-server'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-esr-server-settings'

diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 0b6efb8..ad7da4c 100644 (file)
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/event-client'
     project-name: 'aai-event-client'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-event-client-settings'

diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index 2623d23..fefd7c9 100644 (file)
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -27,5 +27,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/gallifrey'
     project-name: 'aai-gallifrey'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-gallifrey-settings'

diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 6fa3d57..bb46018 100644 (file)
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -47,5 +47,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/gizmo'
     project-name: 'aai-gizmo'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-gizmo-settings'

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index f7307e8..7e608e1 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -50,6 +50,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index c9be3f5..566ae90 100644 (file)
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/logging-service'
     project-name: 'aai-logging-service'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-logging-service-settings'

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index bce3def..b9382be 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -47,5 +47,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-model-loader-settings'

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index a1d9cbc..30338af 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -50,6 +50,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 3425643..025fc7f 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-rest-client-settings'

diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 19654c9..d7e2e22 100644 (file)
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -42,5 +42,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/router-core'
     project-name: 'aai-router-core'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-router-core-settings'

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index dd4f29c..bd44eb4 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-search-data-service-settings'

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 4e43985..2a9c886 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/sparky-be'
     project-name: 'aai-sparky-be'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-sparky-be-settings'

diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index ec4f61b..5dd744b 100644 (file)
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -46,5 +46,7 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/spike'
     project-name: 'aai-spike'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-spike-settings'

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index e7f9594..83acb9e 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -50,6 +50,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/traversal'
     project-name: 'aai-traversal'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 8c6776b..1fdcfd4 100644 (file)
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -41,5 +41,8 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/validation'
     project-name: 'aai-validation'
-    branch: 'casablanca'
+    stream:
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-validation-settings'
+

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index fba98f9..25a0ce6 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -43,13 +43,3 @@
     mvn-profile: docker
     build-node: queue-docker-4c-4g
 
-- project:
-    name: appc-deployment-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'appc/deployment'
-    project-name: 'appc-deployment'
-    branch: 'master'
-    mvn-settings: 'appc-deployment-settings'
-

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 8854e31..9850532 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -49,7 +49,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-apps-settings'
     build-node: ubuntu1604-builder-4c-4g
 

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
new file mode 100644 (file)
index 0000000..8eace01
--- /dev/null
+++ b/jjb/ccsdk/cds.yaml
@@ -0,0 +1,71 @@
+---
+- project:
+    name: ccsdk-cds
+    project-name: 'ccsdk-cds'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'ccsdk/cds'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
+    mvn-settings: 'ccsdk-cds-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: ubuntu1604-builder-4c-4g
+
+- project:
+    name: ccsdk-cds-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'ccsdk/cds'
+    project-name: 'ccsdk-cds'
+    branch: 'master'
+    mvn-settings: 'ccsdk-cds-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-cds-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'ccsdk/cds'
+    project-name: 'ccsdk-cds'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
+    mvn-settings: 'ccsdk-cds-settings'
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: ccsdk-cds-docker
+    project-name: 'ccsdk-cds'
+    jobs:
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'ccsdk/cds'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
+    mvn-settings: 'ccsdk-cds-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: queue-docker-4c-4g

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 87e2739..8c44fb5 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -45,7 +45,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/distribution'
     project-name: 'ccsdk-distribution'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1604-docker-8c-8g
 

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index d988ffb..5a9c8ce 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -43,6 +43,10 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-features-settings'
     build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index a087171..0cebc4d 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -29,7 +29,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/parent'
     project-name: 'ccsdk-parent'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-parent-settings'
     build-node: ubuntu1604-builder-4c-4g
 

diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 96fb33f..8610819 100644 (file)
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -43,7 +43,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/platform/plugins'
     project-name: 'ccsdk-platform-plugins'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-platform-plugins-settings'
     build-node: centos7-redis-4c-4g
 

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index e1d47f0..b880dcc 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -43,7 +43,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/sli/adaptors'
     project-name: 'ccsdk-sli-adaptors'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     build-node: ubuntu1604-builder-4c-4g
 

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 4caa3dd..fee7df8 100644 (file)
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -43,7 +43,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/sli/core'
     project-name: 'ccsdk-sli-core'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-core-settings'
     build-node: ubuntu1604-builder-4c-4g
 

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 857b375..5c85642 100644 (file)
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -43,7 +43,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/sli/northbound'
     project-name: 'ccsdk-sli-northbound'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     build-node: ubuntu1604-builder-4c-4g
 

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index cf96591..27f06c9 100644 (file)
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -42,6 +42,10 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/sli/plugins'
     project-name: 'ccsdk-sli-plugins'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-sli-plugins-settings'
 

diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 23394b6..b0b011f 100644 (file)
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -29,6 +29,10 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/utils'
     project-name: 'ccsdk-utils'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'ccsdk-utils-settings'
 

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index fd81ece..b2cefd2 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -27,6 +27,24 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: cli-arm64
+    project-name: 'cli-arm64'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'deployment/docker/pom.xml'
+          mvn-goals: 'docker:build'
+          docker-image-name: 'onap/cli'
+
+    project: 'cli'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'cli-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+
 - project:
     name: cli-sonar
     jobs:

diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index a7c5788..bdd1541 100644 (file)
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -21,8 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'externalapi-nbi-settings'
     files: '**'
     archive-artifacts: ''
@@ -52,7 +52,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'externalapi/nbi'
     project-name: 'externalapi-nbi'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'externalapi-nbi-settings'
 
 - project:
@@ -63,7 +67,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'externalapi/nbi'
     project-name: 'externalapi-nbi'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'externalapi-nbi-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index df94683..e245103 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -53,6 +53,60 @@
           pass-if: 100.0
       - lf-infra-publish
 
+- job-template:
+    name: '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-plan:
+          test-plan: 'plans/{project-name}/{functionality}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: 'integration/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+
+    builders:
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish
+
 - job-template:
     name: '{project-name}-{stream}-verify-csit-{functionality}-testng'
     disabled: false
@@ -129,6 +183,82 @@
           name: ExtentReport
       - lf-infra-publish
 
+- job-template:
+    name: '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-plan:
+          test-plan: 'plans/{project-name}/{functionality}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - html-publisher-dir:
+          html-dir: '{html-dir}'
+      - html-publisher-files:
+          html-files: '{html-files}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: 'integration/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+
+    builders:
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - testng:
+          pattern: archives/testng-results.xml
+          escape-test-description: true
+          escape-exception-msg: true
+          show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - html-publisher:
+          allow-missing: true
+          dir: '{html-dir}'
+          files: '{html-files}'
+          keep-all: false
+          link-to-last-build: false
+          name: ExtentReport
+      - lf-infra-publish
+
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}'
     disabled: false
@@ -186,6 +316,63 @@
           pass-if: 100.0
       - lf-infra-publish
 
+- job-template:
+    name: '{project-name}-arm64-{stream}-csit-{functionality}'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-plan:
+          test-plan: 'plans/{project-name}/{functionality}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: 'integration/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish
+
 - job-template:
     name: '{project-name}-{stream}-csit-{functionality}-testng'
     disabled: false
@@ -264,3 +451,82 @@
           link-to-last-build: false
           name: ExtentReport
       - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-arm64-{stream}-csit-{functionality}-testng'
+    disabled: false
+
+    project-type: freestyle
+    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    node: '{build-node}'
+
+    properties:
+      - lf-infra-properties:
+          project: 'integration/csit'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: 'integration/csit'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-plan:
+          test-plan: 'plans/{project-name}/{functionality}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - html-publisher-dir:
+          html-dir: '{html-dir}'
+      - html-publisher-files:
+          html-files: '{html-files}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: 'integration/csit'
+          branch: '{branch}'
+          files: '**/{project-name}/**'
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-test
+
+    publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - testng:
+          pattern: archives/testng-results.xml
+          escape-test-description: true
+          escape-exception-msg: true
+          show-failed-builds: true
+          unstable-on-skipped-tests: false
+          failure-on-failed-test-config: false
+      - junit:
+          results: archives/testng-results.xml
+          health-scale-factor: 1.0
+          allow-empty-results: true
+      - html-publisher:
+          allow-missing: true
+          dir: '{html-dir}'
+          files: '{html-files}'
+          keep-all: false
+          link-to-last-build: false
+          name: ExtentReport
+      - lf-infra-publish

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index f41d0a7..cb253c6 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -35,5 +35,9 @@
     nexus-iq-namespace: 'onap-'
     project: integration
     project-name: 'integration'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'integration-settings'

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 010383d..c5b69ba 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -24,6 +24,25 @@
     build-node: ubuntu1604-builder-4c-4g
     maven-version: 'mvn35'
 
+- project:
+    name: logging-analytics-pomba-pomba-arm64-aai-context-builder
+    project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder
+    jobs:
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: logging-analytics/pomba/pomba-aai-context-builder
+    stream:
+      - 'master':
+          branch: 'master'
+
+    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+    maven-version: 'mvn35'
+
 - project:
     name: logging-analytics-pomba-pomba-aai-context-builder-sonar
     jobs:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index 25bcfd1..ad3af90 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -23,6 +23,26 @@
     build-node: ubuntu1604-builder-4c-4g
     maven-version: 'mvn35'
 
+- project:
+    name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
+    project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
+    jobs:
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: logging-analytics/pomba/pomba-network-discovery-context-builder
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
+    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+    maven-version: 'mvn35'
+
 - project:
     name: logging-analytics-pomba-pomba-network-discovery-context-builder-sonar
     jobs:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index fb97301..685b4c6 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@ -23,6 +23,24 @@
     build-node: ubuntu1604-builder-4c-4g
     maven-version: 'mvn35'
 
+- project:
+    name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
+    project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
+    jobs:
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: logging-analytics/pomba/pomba-sdc-context-builder
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+    maven-version: 'mvn35'
+
 - project:
     name: logging-analytics-pomba-pomba-sdc-context-builder-sonar
     jobs:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index a65f11d..3525bb0 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -22,6 +22,23 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
+    project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
+    jobs:
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: logging-analytics/pomba/pomba-sdnc-context-builder
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+
 - project:
     name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar
     jobs:

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 54b1eb4..dcbd07a 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -28,6 +28,25 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: logging-analytics-arm64
+    project-name: 'logging-analytics-arm64'
+    jobs:
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'logging-analytics'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
+    mvn-settings: 'logging-analytics-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+
 - project:
     name: logging-analytics-sonar
     jobs:

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 9c450ba..42c93cf 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -25,9 +25,9 @@
 - project:
     name: sdc-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}-testng'
-      - '{project-name}-{stream}-csit-{functionality}-testng'
-    project-name: 'sdc-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
+      - '{project-name}-arm64-{stream}-csit-{functionality}-testng'
+    project-name: 'sdc'
     stream:
       - 'master':
           branch: 'master'

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 63fd0f3..5aad86b 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -71,5 +71,9 @@
     project: sdnc/apps
     project-name: 'sdnc-apps'
     build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-apps-settings'

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index f725d1b..190e0c2 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -45,5 +45,9 @@
     project: sdnc/northbound
     project-name: 'sdnc-northbound'
     build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-northbound-settings'

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 8efe0f7..1dc289f 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -45,5 +45,9 @@
     project: sdnc/oam
     project-name: 'sdnc-oam'
     build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'sdnc-oam-settings'

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
index b53b053..fd74015 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-gvnfm-vnflcm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnflcm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-gvnfm-vnflcm'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
index 709a957..d92aa0f 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-gvnfm-vnfmgr-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfmgr-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-gvnfm-vnfmgr'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
index b6d179c..040331b 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-gvnfm-vnfres-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfres-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-gvnfm-vnfres'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
index 3055868..d30007d 100644 (file)
--- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-catalog-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-catalog-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-catalog'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
index 41e99f2..fbcd28d 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-ems-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-ems-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-ems'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
index 96de3d7..2ea2e82 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-sfc-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-sfc-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-sfc'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
index 517fda3..c0e096d 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
index 98702f2..1c0c00e 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-vnfm-svnfm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
index be7eb6d..4b05bf4 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-lcm-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-lcm-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-lcm'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
index 8697121..c06ead1 100644 (file)
--- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-multivimproxy-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-multivimproxy-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-multivimproxy'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
index b955426..254cff5 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
@@ -15,9 +15,9 @@
 - project:
     name: vfc-nfvo-resmanagement-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-resmanagement-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-resmanagement'
     stream: 'master'
     functionality:
       - 'sanity-check':

diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
index 4b3e95d..656849c 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
@@ -17,9 +17,9 @@
 - project:
     name: vfc-nfvo-wfengine-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-wfengine-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vfc-nfvo-wfengine'
     stream: 'master'
     functionality:
       - 'sanity-check'

diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 54a7cf0..04d6536 100644 (file)
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -18,9 +18,9 @@
 - project:
     name: vid-csit-arm64
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vid-arm64'
+      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+      - '{project-name}-arm64-{stream}-csit-{functionality}'
+    project-name: 'vid'
     stream:
       - 'master':
           branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 04a0554..9f6a406 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -32,6 +32,25 @@
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
+- project:
+    name: vnfsdk-dovetail-integration-arm64
+    project-name: 'vnfsdk-dovetail-integration-arm64'
+    project: 'vnfsdk/dovetail-integration'
+    pom: 'pom.xml'
+    python-version: python2.7
+    tox-dir: '.'
+    tox-envs: ''
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vnfsdk-dovetail-integration-settings'
+    build-node: ubuntu1604-docker-arm64-4c-2g
+    jobs:
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+
 - project:
     name: vnfsdk-dovetail-integration-tox-sonar
     jobs:

diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index 2307ac7..a845ee1 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -52,6 +52,28 @@
           mvn-params: '-Dmaven.test.skip=true'
           build-node: 'ubuntu1604-docker-8c-8g'
 
+- project:
+    name: vnfsdk-ice-docker-arm64
+    project-name: 'vnfsdk-ice-docker-arm64'
+    project: 'vnfsdk/ice'
+    pom: 'pom.xml'
+    stream:
+      - 'master':
+          branch: 'master'
+    subproject:
+      - 'docker':
+          path: 'docker'
+          pattern: 'docker/**'
+          pom: 'docker/pom.xml'
+    mvn-settings: 'vnfsdk-ice-settings'
+    build-node: ubuntu1604-docker-arm64-4c-2g
+    jobs:
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'docker/pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+
 - project:
     name: vnfsdk-ice-validation-scripts-tox-sonar
     jobs:

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 34e6e3b..c1d2c6c 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -25,6 +25,27 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: vnfsdk-refrepo-arm64
+    project-name: 'vnfsdk-refrepo-arm64'
+    jobs:
+      - '{project-name}-{stream}-aai-docker-java-daily':
+          pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
+          mvn-goals: 'docker:build'
+          docker-image-name: 'onap/vnfsdk/refrepo'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'vnfsdk/refrepo'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vnfsdk-refrepo-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+
 - project:
     name: vnfsdk-refrepo-sonar
     jobs: