Merge "Add merge/verify/release/clm for PM Mapper."

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/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/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'