Merge "temporary disable arm64 docker for multicloud"

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
new file mode 100644 (file)
index 0000000..5b7d179
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904
+LABELS=ubuntu1604-docker-8c-8g
+HARDWARE_ID=v1-standard-4

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index f85ad5f..208a9b3 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -75,20 +75,20 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: queue-docker-4c-4g
-
-- project:
-    name: ccsdk-apps-arm64-docker
-    project-name: 'ccsdk-apps-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-arm64-4c-2g
+#
+#- project:
+#    name: ccsdk-apps-arm64-docker
+#    project-name: 'ccsdk-apps-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'ccsdk/apps'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'ccsdk-apps-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    docker-pom: 'pom.xml'
+#    mvn-profile: docker
+#    build-node: ubuntu1604-docker-arm64-4c-2g

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 174f41f..af9ae32 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -38,23 +38,23 @@
     mvn-profile: docker
     build-node: queue-docker-4c-4g
 
-- project:
-    name: ccsdk-distribution-arm64-docker
-    project-name: 'ccsdk-distribution-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'ccsdk/distribution'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'ccsdk-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: docker
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: ccsdk-distribution-arm64-docker
+#    project-name: 'ccsdk-distribution-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'ccsdk/distribution'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'ccsdk-distribution-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    docker-pom: 'pom.xml'
+#    mvn-profile: docker
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: ccsdk-distribution-clm
     jobs:

diff --git a/jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml
new file mode 100644 (file)
index 0000000..38216d1
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml
@@ -0,0 +1,13 @@
+- project:
+    name: dcae-bulkpm-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-pmmapper'
+    stream: 'master'
+    functionality:
+      - 'pmmapper':
+          trigger_jobs:
+            - '{project-name}-{stream}-docker-java-shell-daily'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index aa5d49b..1fba9ab 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: false
+          disabled: true
           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 d81fb7e..d4e80b9 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: false
+          disabled: true
 
     project: 'policy/common'
     stream:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 6c529c8..c2ad0f7 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: false
+          disabled: true
           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 7661e50..ba8a08f 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: false
+          disabled: true
 
     project: 'policy/drools-applications'
     stream:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 5e34e77..3677837 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: false
+          disabled: true
           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 a525538..70d9c3a 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: false
+          disabled: true
           build-node: ubuntu1604-docker-8c-8g
     project: 'policy/engine'
     stream:

diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 3560a5f..c372f8a 100644 (file)
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -5,6 +5,7 @@
     project-name: 'sdc-sdc-docker-base'
     jobs:
       - '{project-name}-{stream}-sdc-merge-java':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'default'
     project: 'sdc/sdc-docker-base'
@@ -24,6 +25,7 @@
     project-name: 'sdc-sdc-docker-base-arm64'
     jobs:
       - '{project-name}-{stream}-sdc-merge-java':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'default'
     project: 'sdc/sdc-docker-base'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index cfdaad2..f3d3f68 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -30,6 +30,7 @@
       - '{project-name}-{stream}-verify-java':
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - '{project-name}-{stream}-sdc-merge-java':
+          build-node: 'ubuntu1604-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index bfb97df..8eae934 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -61,23 +61,23 @@
     files: '**'
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
-
-- project:
-    name: sdnc-apps-docker-arm64
-    project-name: 'sdnc-apps-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/apps'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdnc-apps-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
+#
+#- project:
+#    name: sdnc-apps-docker-arm64
+#    project-name: 'sdnc-apps-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'sdnc/apps'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdnc-apps-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
     name: sdnc-apps-clm

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 5bc6631..58d73fc 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -36,23 +36,23 @@
     files: '**'
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
-
-- project:
-    name: sdnc-oam-docker-arm64
-    project-name: 'sdnc-oam-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-    project: 'sdnc/oam'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdnc-oam-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
+#
+#- project:
+#    name: sdnc-oam-docker-arm64
+#    project-name: 'sdnc-oam-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#          mvn-params: '-Dmaven.test.skip=true'
+#    project: 'sdnc/oam'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'sdnc-oam-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
 
 - project:
     name: sdnc-oam-clm

diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 04d6536..c4643e5 100644 (file)
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -15,16 +15,16 @@
           trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
     robot-options: ''
 
-- project:
-    name: vid-csit-arm64
-    jobs:
-      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
-      - '{project-name}-arm64-{stream}-csit-{functionality}'
-    project-name: 'vid'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'healthCheck':
-          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-    robot-options: ''
+#- project:
+#    name: vid-csit-arm64
+#    jobs:
+#      - '{project-name}-arm64-{stream}-verify-csit-{functionality}'
+#      - '{project-name}-arm64-{stream}-csit-{functionality}'
+#    project-name: 'vid'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    functionality:
+#      - 'healthCheck':
+#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
+#    robot-options: ''

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 54a680e..b10a717 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -42,22 +42,22 @@
     archive-artifacts: ''
     build-node: queue-docker-4c-4g
 
-- project:
-    name: vid-docker-arm64
-    project-name: 'vid-arm64'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-    project: 'vid'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vid-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-arm64-4c-2g
-
+#- project:
+#    name: vid-docker-arm64
+#    project-name: 'vid-arm64'
+#    jobs:
+#      - 'docker-version-java-daily':
+#          docker-pom: 'pom.xml'
+#          mvn-profile: 'docker'
+#    project: 'vid'
+#    stream:
+#      - 'master':
+#          branch: 'master'
+#    mvn-settings: 'vid-settings'
+#    files: '**'
+#    archive-artifacts: ''
+#    build-node: ubuntu1604-docker-arm64-4c-2g
+#
 - project:
     name: vid-sonar
     jobs:

diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml
new file mode 100644 (file)
index 0000000..b97fd46
--- /dev/null
+++ b/jjb/vnfrqts/build-and-upload.yaml
@@ -0,0 +1,50 @@
+---
+- job-template:
+    # Job template for running a script to build an artifact and
+    # upload it to nexus as RAW artifacts.
+    #
+
+    name: '{project-name}-{stream}-build-and-upload'
+
+    project-type: freestyle
+    concurrent: true
+    node: '{build-node}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - git:
+          credentials-id: '{jenkins-ssh-credential}'
+          url: '$GIT_BASE'
+          refspec: ''
+          choosing-strategy: 'default'
+          branches:
+            - 'refs/heads/{branch}'
+          skip-tag: true
+          wipe-workspace: true
+          submodule:
+            recursive: '{submodule-recursive}'
+            timeout: '24'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: 'H H * * *'
+
+    builders:
+      - shell: '{script}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'

diff --git a/jjb/vnfrqts/build-needs.sh b/jjb/vnfrqts/build-needs.sh
new file mode 100644 (file)
index 0000000..85de18b
--- /dev/null
+++ b/jjb/vnfrqts/build-needs.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+virtualenv $WORKSPACE/venv-tox
+source $WORKSPACE/venv-tox/bin/activate
+pip install --upgrade pip
+pip install -r etc/requirements.txt
+ls
+tox -e docs
\ No newline at end of file

diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml
index e62095f..9d1a483 100644 (file)
--- a/jjb/vnfrqts/vnfrqts-requirements.yaml
+++ b/jjb/vnfrqts/vnfrqts-requirements.yaml
@@ -7,3 +7,15 @@
     project-name: 'vnfrqts-requirements'
     branch: 'master'
     mvn-settings: 'vnfrqts-requirements-settings'
+
+- project:
+    name: vnfrqts-requirements-upload-json
+    project: 'vnfrqts/requirements'
+    project-name: 'vnfrqts-requirements'
+    stream:
+      - 'master':
+          branch: 'master'
+    jobs:
+      - '{project-name}-{stream}-build-and-upload':
+          script:
+              !include-raw-escape: 'build-needs.sh'

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

diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 94861bd..71fc710 100644 (file)
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -32,3 +32,15 @@
     mvn-settings: 'vvp-validation-scripts-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vvp-validation-scripts-tracability-matrix
+    project: 'vvp/validation-scripts'
+    project-name: 'vvp-validation-scripts'
+    stream:
+      - 'master':
+          branch: 'master'
+    jobs:
+      - '{project-name}-{stream}-build-and-upload':
+          script:
+              !include-raw-escape: 'build-csv.sh'