Merge "Add arm64 docker build for appc"

diff --git a/global-jjb b/global-jjb
index 64043e6..1f1f893 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 64043e62f1c8ff53ff064cb832f2b68df4f08c43
+Subproject commit 1f1f893e77014a6b08d61e88614ff928b2c17587

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
new file mode 100644 (file)
index 0000000..5464086
--- /dev/null
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: aai-graphgraph
+    project-name: aai-graphgraph
+    views:
+      - project-view
+
+- project:
+    name: aai-graphgraph-master
+    project-name: 'aai-graphgraph'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    project: 'aai/graphgraph'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-graphgraph-settings'
+    files: '**'
+    archive-artifacts: ''

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

diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index 1fdcfd4..ea7319c 100644 (file)
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -1,4 +1,10 @@
 ---
+- project:
+    name: aai-validation-project-view
+    project-name: aai-validation
+    views:
+      - project-view
+
 - project:
     name: aai-validation
     project-name: 'aai-validation'

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 8eace01..f1efc61 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -11,8 +11,6 @@
     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
@@ -46,8 +44,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'ccsdk-cds-settings'
     build-node: ubuntu1604-builder-4c-4g
 
@@ -61,8 +57,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'ccsdk-cds-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 4ad5840..5c90a17 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -17,4 +17,4 @@
     branch: 'master'
     build-timeout: '60'
     build-node: 'centos7-builder-2c-1g'
-    jjb-version: 2.2.1
+    jjb-version: 2.9.1

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
new file mode 100644 (file)
index 0000000..dea056a
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -0,0 +1,46 @@
+---
+- project:
+    name: dcaegen2-services-datafile
+    # job template iterators
+    project-name: 'dcaegen2-services-pm-mapper'
+    stream:
+      - 'master':
+          branch: 'master'
+    # apply to all jobs
+    project: 'dcaegen2/services/pm-mapper'
+    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
+    jobs:
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-verify-java':
+        mvn-goals: 'clean install'
+      - '{project-name}-{stream}-merge-java':
+        mvn-goals: 'clean deploy'
+
+- project:
+    name: dcaegen2-services-pm-mapper-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/services/pm-mapper'
+    project-name: 'dcaegen2-services-pm-mapper'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-services-pm-mapper-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/services/pm-mapper
+    build-node: ubuntu1604-docker-8c-8g
+    project-name: 'dcaegen2-services-pm-mapper'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-pm-mapper-settings'

diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml
index b111a7c..3a54b42 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter-csit.yaml
+++ b/jjb/dmaap/dmaap-datarouter-csit.yaml
@@ -14,4 +14,7 @@
       - 'dr-suite':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
+      - 'ssl-dr-suite':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
     robot-options: ''

diff --git a/jjb/doc/doc-post-rtd.sh b/jjb/doc/doc-post-rtd.sh
index 5c8d8c5..78b8d0b 100644 (file)
--- a/jjb/doc/doc-post-rtd.sh
+++ b/jjb/doc/doc-post-rtd.sh
@@ -6,4 +6,7 @@ else
 fi
 
 # shellcheck disable=SC1083
-curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/{rtdproject}
+curl -X POST \
+    -d "branches=$RTD_BUILD_VERSION" \
+    -d "token=$DOCS_RTD_TOKEN"  \
+    https://readthedocs.org/api/v2/webhook/{rtdproject}

diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index 77cea69..234a767 100644 (file)
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -134,6 +134,10 @@
     wrappers:
       - infra-wrappers:
           build-timeout: '{build-timeout}'
+      - credentials-binding:
+          - text:
+             credential-id: docs-token
+             variable: DOCS_RTD_TOKEN
 
     triggers:
       - gerrit:

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 6986dff..8515d73 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -14,7 +14,7 @@
       - '{project-name}-{stream}-merge-rtd'
 
     project: 'doc'
-    rtdproject: 'onap'
+    rtdproject: 'onap/58810/'
     mvn-settings: 'doc-settings'
     stream:
       - master:

diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index cd4fadb..bdd1541 100644 (file)
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -16,6 +16,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'externalapi/nbi'
     stream:
       - 'master':
@@ -35,6 +36,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
     project: 'externalapi/nbi'
     stream:
       - 'master':
@@ -42,7 +44,6 @@
     mvn-settings: 'externalapi-nbi-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
     name: externalapi-nbi-clm

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index f352030..2951d35 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1154,7 +1154,7 @@
     name: '{project-name}-{stream}-docker-version-java-daily'
     id: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
     properties:
       - infra-properties:

diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
index 12acf34..7fbbe61 100644 (file)
--- a/jjb/lab/lab.yaml
+++ b/jjb/lab/lab.yaml
@@ -4,15 +4,9 @@
     jobs:
       - 'lab-{job-name}'
     job-name:
-      - "windriver-heat-daily":
-          job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Daily tenant"
       - "windriver-oom-daily":
           job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Daily tenant"
-      - "windriver-heat-staging-daily":
-          job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Staging-Daily tenant"
       - "windriver-oom-staging-daily":
           job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Staging-Daily tenant"
-      - "tlab-heat-daily":
-          job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant"
       - "tlab-oom-daily":
           job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant"

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 685c69a..dcbd07a 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -16,6 +16,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'logging-analytics'
     stream:
       - 'master':

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 3f2eeed..a86a178 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -27,6 +27,25 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: msb-apigateway-arm64
+    project-name: 'msb-apigateway-arm64'
+    jobs:
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-apigateway-docker-image.sh'
+
+    project: 'msb/apigateway'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'msb-apigateway-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-arm64-4c-2g
+
 - project:
     name: msb-apigateway-sonar
     jobs:

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 80de322..5397648 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -21,6 +21,24 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: msb-discovery-arm64
+    project-name: 'msb-discovery-arm64'
+    jobs:
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-discovery-docker-image.sh'
+          build-node: ubuntu1604-docker-arm64-4c-2g
+    project: 'msb/discovery'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'msb-discovery-settings'
+    files: '**'
+    archive-artifacts: ''
+
 - project:
     name: msb-discovery-sonar
     jobs:

diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index 025a91f..26842cb 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 ./newton/docker/*.*
 chmod 755 ./ocata/docker/*.*
 chmod 755 ./windriver/docker/*.*
 chmod 755 ./pike/docker/*.*
+chmod 755 ./starlingx/docker/*.*
 
 ./newton/docker/build_image.sh
 ./ocata/docker/build_image.sh
 ./windriver/docker/build_image.sh
 ./pike/docker/build_image.sh
+./starlingx/docker/build_image.sh

diff --git a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
new file mode 100644 (file)
index 0000000..364bf01
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml
@@ -0,0 +1,12 @@
+---
+- project:
+    name: multicloud-openstack-starlingx-csit
+    jobs:
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'multicloud-starlingx'
+    stream: 'master'
+    functionality:
+      - 'functionality1':
+          trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index f995c99..1dbac83 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -38,6 +38,14 @@
           path: 'pike'
           pattern: 'share/**'
           pom: 'pike/pom.xml'
+      - 'starlingx':
+          path: 'starlingx'
+          pattern: 'starlingx/**'
+          pom: 'starlingx/pom.xml'
+      - 'starlingx_share':
+          path: 'starlingx'
+          pattern: 'share/**'
+          pom: 'starlingx/pom.xml'
       - 'windriver':
           path: 'windriver'
           pattern: 'windriver/**'
@@ -131,6 +139,20 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: multicloud-openstack-starlingx-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-starlingx'
+    branch: 'master'
+    mvn-params: '-f starlingx/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: multicloud-openstack-clm
     jobs:

diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index fc3ae6e..a861892 100644 (file)
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -10,6 +10,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: docker
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'music/prom'
     stream:
       - 'master':

diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index d6130ca..6987996 100644 (file)
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -16,6 +16,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: docker
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
     project: 'music'
     stream:
       - 'master':

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index e15e568..f9b2385 100644 (file)
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -62,5 +62,9 @@
     project: optf/cmso
     project-name: 'optf-cmso'
     build-node: ubuntu1604-docker-8c-8g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'optf-cmso-settings'

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 4550d1c..d5fa496 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -75,5 +75,9 @@
     nexus-iq-namespace: 'onap-'
     project: optf/has
     project-name: 'optf-has'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'optf-has-settings'

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 36b1697..762b078 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -74,5 +74,9 @@
     nexus-iq-namespace: 'onap-'
     project: optf/osdf
     project-name: 'optf-osdf'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'optf-osdf-settings'

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 1fba9ab..aa5d49b 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -48,7 +48,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/apex-pdp'
     stream:

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index d4e80b9..d81fb7e 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -24,7 +24,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+          disabled: false
 
     project: 'policy/common'
     stream:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index c2ad0f7..6c529c8 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -37,7 +37,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index ba8a08f..7661e50 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -24,7 +24,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+          disabled: false
 
     project: 'policy/drools-applications'
     stream:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 3677837..5e34e77 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -42,7 +42,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/drools-pdp'
     stream:

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 70d9c3a..a525538 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -42,7 +42,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/engine'
     stream:

diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index 2fa450a..5c4385b 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -13,6 +13,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+         build-node: 'ubuntu1604-docker-8c-8g'
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          mvn-params: '-DskipTests=true'
@@ -35,12 +36,12 @@
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          mvn-params: '-DskipTests=true'
+         build-node: 'ubuntu1604-docker-arm64-4c-2g'
     project: 'sdc/dcae-d/ci'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'sdc-dcae-d-ci-settings'
-    build-node: ubuntu1604-docker-arm64-4c-2g
     files: '**'
     archive-artifacts: ''
     build-timeout: 60

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index de7b41d..3630b4d 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -7,6 +7,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'
@@ -26,6 +27,7 @@
     project-name: 'sdc-dcae-d-dt-be-main-arm64'
     jobs:
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'

diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 010b0c5..6338c8c 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -8,6 +8,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'server,docker'
           mvn-params: '-DskipTests=true'
@@ -28,6 +29,7 @@
     build-node: ubuntu1604-docker-arm64-4c-2g
     jobs:
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'server,docker'
           mvn-params: '-DskipTests=true'

diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index 85cfbe5..9cc5de7 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -8,6 +8,7 @@
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'
@@ -25,9 +26,9 @@
 - project:
     name: sdc-dcae-d-fe-arm64
     project-name: 'sdc-dcae-d-fe-arm64'
-    build-node: ubuntu1604-docker-arm64-4c-2g
     jobs:
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a13e729..7fe7985 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -36,6 +36,7 @@
       - '{project-name}-{stream}-release-version-java-daily':
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
@@ -56,10 +57,12 @@
     project-name: 'sdc-arm64'
     jobs:
       - '{project-name}-{stream}-sdc-merge-java':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-arm64-4c-2g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
@@ -70,7 +73,6 @@
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
     maven-version: 'mvn35'
 
 - project:

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index a3b389a..4d3e169 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -13,6 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-docker-version-java-daily':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
@@ -48,5 +49,9 @@
     project: so
     project-name: 'so'
     build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'so-settings'

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 030d8c5..bc1aef2 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -14,18 +14,19 @@
             !include-raw-escape: 'testsuite-docker.sh'
 
     project: 'testsuite'
+
     extra-project1: 'testsuite/python-testing-utils'
     extra-branch1: 'master'
-    extra-refspec1: 'refs/heads/{branch}'
+    extra-refspec1: 'refs/heads/master'
     checkout-dir1: 'testsuite/eteutils'
 
     extra-project2: 'testsuite/heatbridge'
     extra-branch2: 'master'
-    extra-refspec2: 'refs/heads/{branch}'
+    extra-refspec2: 'refs/heads/master'
     checkout-dir2: 'testsuite/heatbridge'
 
     extra-project3: 'demo'
-    extra-branch3: 'master'
+    extra-branch3: '{branch}'
     extra-refspec3: 'refs/heads/{branch}'
     checkout-dir3: 'demo'
 

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
index fd74015..ba91dff 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-gvnfm-vnflcm-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnflcm'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index ad45161..f403792 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -31,28 +31,6 @@
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
 
-- project:
-    name: vfc-gvnfm-vnflcm-java-arm64
-    project-name: 'vfc-gvnfm-vnflcm-arm64'
-    project: 'vfc/gvnfm/vnflcm'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
-    subproject:
-      - 'lcm':
-          pom: 'lcm/pom.xml'
-          pattern: 'lcm/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-gvnfm-vnflcm-lcm-sonar
     jobs:

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
index d92aa0f..d157489 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-gvnfm-vnfmgr-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfmgr'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-gvnfm-vnfmgr-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 8ae9cbb..502dc41 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -25,28 +25,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vfc-gvnfm-vnfmgr-java-arm64
-    project-name: 'vfc-gvnfm-vnfmgr-arm64'
-    project: 'vfc/gvnfm/vnfmgr'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
-    subproject:
-      - 'mgr':
-          pom: 'mgr/pom.xml'
-          pattern: 'mgr/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-gvnfm-vnfmgr-mgr-sonar
     jobs:

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
index 040331b..3b76a2a 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-gvnfm-vnfres-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfres'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-gvnfm-vnfres-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 124c64c..8d444be 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -26,24 +26,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vfc-gvnfm-vnfres-java-arm64
-    project-name: 'vfc-gvnfm-vnfres-arm64'
-    project: 'vfc/gvnfm/vnfres'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfres-settings'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-gvnfm-vnfres-res-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
index d30007d..9affcfc 100644 (file)
--- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml
@@ -11,16 +11,3 @@
           trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
-
-- project:
-    name: vfc-nfvo-catalog-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-catalog'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-catalog-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index aec6e3d..b88633e 100644 (file)
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -27,24 +27,6 @@
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
 
-- project:
-    name: vfc-nfvo-catalog-arm64
-    project-name: 'vfc-nfvo-catalog-arm64'
-    project: 'vfc/nfvo/catalog'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-catalog-settings'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-nfvo-catalog-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 7f69128..9e8570d 100644 (file)
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -19,18 +19,3 @@
             !include-raw-escape: 'build-nfvo-db-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
 
-- project:
-    name: vfc-nfvo-db-arm64
-    project: 'vfc/nfvo/db'
-    project-name: 'vfc-nfvo-db-arm64'
-    mvn-settings: 'vfc-nfvo-db-settings'
-    stream:
-      - 'master':
-          branch: 'master'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-db-docker-image.sh'

diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
index fbcd28d..10accee 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-driver-ems-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-ems'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-driver-ems-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 4460bb6..6b9abf7 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -26,28 +26,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vfc-nfvo-driver-ems-java-arm64
-    project-name: 'vfc-nfvo-driver-ems-arm64'
-    project: 'vfc/nfvo/driver/ems'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-ems-settings'
-    subproject:
-      - 'drv-ems-boco':
-          pom: 'ems/pom.xml'
-          pattern: 'ems/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-driver-ems-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-nfvo-driver-ems-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
index 2ea2e82..6d089c7 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-driver-sfc-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-sfc'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-driver-sfc-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index d753772..00fc285 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -25,28 +25,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vfc-nfvo-driver-sfc-arm64
-    project-name: 'vfc-nfvo-driver-sfc-arm64'
-    project: 'vfc/nfvo/driver/sfc'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-sfc-settings'
-    subproject:
-      - 'driver-sfc-zte':
-          pom: 'zte/sfc-driver/pom.xml'
-          pattern: 'zte/sfc-driver/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-nfvo-driver-sfc-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
index c0e096d..93fb9ef 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-driver-vnfm-gvnfm-csit-arm64
-    jobs:
-      - '{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':
-          trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 904481a..a4e53e5 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -26,28 +26,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vfc-nfvo-driver-vnfm-gvnfm-java-arm64
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm-arm64'
-    project: 'vfc/nfvo/driver/vnfm/gvnfm'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
-    subproject:
-      - 'gvnfmadapter':
-          pom: 'gvnfmadapter/pom.xml'
-          pattern: 'gvnfmadapter/**'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
index 1c0c00e..9be81e0 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-driver-vnfm-svnfm-csit-arm64
-    jobs:
-      - '{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':
-          trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
index 0728777..6807afa 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml
@@ -19,20 +19,3 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vfc-nfvo-driver-vnfm-svnfm-docker-arm64
-    project-name: 'vfc-nfvo-driver-vnfm-svnfm-arm64'
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index f0569b7..abcf1ed 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -59,46 +59,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
 
-- project:
-    name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker-arm64
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
-    project-name: 'vfc-nfvo-driver-svnfm-nokiav2-arm64'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    subproject:
-      - 'docker-vnfm-nokiav2':
-          pom: 'nokiav2/pom.xml'
-          pattern: 'nokiav2/**'
-    jobs:
-      - '{project-name}-{subproject}-{stream}-verify-docker-cascade-trigger':
-          docker_build_args: '--file Dockerfile.verify --build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots'
-          docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
-          docker_root: '$WORKSPACE/nokiav2/deployment'
-          parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-verify-java'
-      - '{project-name}-{subproject}-{stream}-merge-docker-cascade-trigger':
-          docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots'
-          docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
-          docker_root: '$WORKSPACE/nokiav2/deployment'
-          parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-merge-java'
-      - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger':
-          docker_build_args: '--build-arg MODE= --build-arg REPO=staging'
-          docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
-          docker_root: '$WORKSPACE/nokiav2/deployment'
-          docker_registry: '$DOCKER_REGISTRY:10003'
-          parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-release-version-java-daily'
-#Since the release is moved manually from the staging repo to the release repo this job can not
-#be triggered in a cascade way
-      - '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar':
-          docker_build_args: '--build-arg MODE= --build-arg REPO=releases'
-          docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
-          docker_root: '$WORKSPACE/nokiav2/deployment'
-          docker_registry: '$DOCKER_REGISTRY:10003'
-    files: 'nokiav2/**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
     project: 'vfc/nfvo/driver/vnfm/svnfm'

diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
index 4b05bf4..7aeb1b5 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-lcm-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-lcm'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-lcm-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index dd492f6..f209bbf 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -21,24 +21,6 @@
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
 
-- project:
-    name: vfc-nfvo-lcm-java-arm64
-    project-name: 'vfc-nfvo-lcm-arm64'
-    project: 'vfc/nfvo/lcm'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-lcm-settings'
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-nfvo-lcm-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
index c06ead1..9611a96 100644 (file)
--- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-multivimproxy-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-multivimproxy'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-multivimproxy-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index 827ff77..b848b1f 100644 (file)
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -19,22 +19,6 @@
             !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
 
-- project:
-    name: vfc-nfvo-multivimproxy-arm64
-    project: 'vfc/nfvo/multivimproxy'
-    project-name: 'vfc-nfvo-multivimproxy-arm64'
-    mvn-settings: 'vfc-nfvo-multivimproxy-settings'
-    stream:
-      - 'master':
-          branch: 'master'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
-
 - project:
     name: vfc-nfvo-multivimproxy-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
index 254cff5..304ac8e 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
@@ -12,15 +12,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-resmanagement-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-resmanagement'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-resmanagement-arm64-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 78788d3..4d54d0e 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -19,22 +19,6 @@
             !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
 
-- project:
-    name: vfc-nfvo-resmanagement-arm64
-    project: 'vfc/nfvo/resmanagement'
-    project-name: 'vfc-nfvo-resmanagement-arm64'
-    mvn-settings: 'vfc-nfvo-resmanagement-settings'
-    stream:
-      - 'master':
-          branch: 'master'
-    build-node: ubuntu1604-docker-arm64-4c-2g
-    jobs:
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
-
 - project:
     name: vfc-nfvo-resmanagement-sonar
     jobs:

diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
index 656849c..591ad82 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml
@@ -14,17 +14,3 @@
     robot-options: ''
     branch: 'master'
 
-- project:
-    name: vfc-nfvo-wfengine-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-wfengine'
-    stream: 'master'
-    functionality:
-      - 'sanity-check'
-    trigger_jobs:
-      - 'vfc-nfvo-wfengine-arm64-master-engine-activiti-extension-docker-java-version-shell-daily'
-      - 'vfc-nfvo-wfengine-arm64-master-engine-mgr-service-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index d726f33..0e9bcf8 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -28,32 +28,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vfc-nfvo-wfengine-arm64
-    project-name: 'vfc-nfvo-wfengine-arm64'
-    project: 'vfc/nfvo/wfengine'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-wfengine-settings'
-    subproject:
-      - 'engine-mgr-service':
-          pom: 'wfenginemgrservice/pom.xml'
-          pattern: 'wfenginemgrservice/**'
-          script:
-            !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh'
-      - 'engine-activiti-extension':
-          pom: 'activiti-extension/pom.xml'
-          pattern: 'activiti-extension/**'
-          script:
-            !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
-          mvn-goals: 'clean'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
 - project:
     name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
     jobs:

diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index 62ebe6e..a845ee1 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -50,6 +50,7 @@
           docker-pom: 'docker/pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: 'ubuntu1604-docker-8c-8g'
 
 - project:
     name: vnfsdk-ice-docker-arm64

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 7e1e567..c1d2c6c 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -15,6 +15,7 @@
           docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+          build-node: ubuntu1604-docker-8c-8g
     project: 'vnfsdk/refrepo'
     stream:
       - 'master':

diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 1918ff3..94861bd 100644 (file)
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -12,16 +12,20 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-validation-scripts-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    docker-pom: 'pom.xml'
+    mvn-profile: 'default'
 
 - project:
     name: vvp-validation-scripts-sonar
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
     branch: 'master'