11 files changed, 144 insertions, 42 deletions

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 339c3cc5b..d95ca4fc7 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -62,6 +62,8 @@
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl-nofeature-ha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+      - 'os-ovn-nofeature-ha':
+          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
@@ -69,6 +71,10 @@
       - 'os-nosdn-nofeature-noha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
+    exclude:
+      - scenario: os-ovn-nofeature-ha
+        stream: euphrates
+
     jobs:
       - '{installer}-{scenario}-{pod}-daily-{stream}'
       - '{installer}-deploy-{pod}-daily-{stream}'
@@ -171,7 +177,7 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: '-ha$'
+              regex: '.*-ha'
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
@@ -196,7 +202,7 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: '-ha$'
+              regex: '.*-ha'
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
@@ -302,6 +308,10 @@
     triggers:
       - timed: '0 1 * * 2,5,7'
 - trigger:
+    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
     name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger'
     triggers:
       - timed: '0 1 * * 1,3'
@@ -341,6 +351,10 @@
     triggers:
       - timed: ''
 - trigger:
+    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
     name: 'fuel-os-nosdn-ovs-ha-armband-virtual-master-trigger'
     triggers:
       - timed: ''
diff --git a/jjb/container4nfv/arm64/compass-deploy.sh b/jjb/container4nfv/arm64/compass-deploy.sh
index bbbf3f449..a22af09ba 100755
--- a/jjb/container4nfv/arm64/compass-deploy.sh
+++ b/jjb/container4nfv/arm64/compass-deploy.sh
@@ -5,9 +5,14 @@ cd compass4nfv
 
 export ADAPTER_OS_PATTERN='(?i)CentOS-7.*arm.*'
 export OS_VERSION="centos7"
-export KUBERNETES_VERSION="v1.7.3"
-export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml"
-export NETWORK="deploy/conf/vm_environment/network.yml"
-export VIRT_NUMBER=2 VIRT_CPUS=4 VIRT_MEM=8192 VIRT_DISK=50G
+export KUBERNETES_VERSION="v1.7.5"
+if [[ "$NODE_NAME" =~ "-virtual" ]]; then
+    export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml"
+    export NETWORK="deploy/conf/vm_environment/network.yml"
+    export VIRT_NUMBER=2 VIRT_CPUS=4 VIRT_MEM=8192 VIRT_DISK=50G
+else
+    export DHA="deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml"
+    export NETWORK="deploy/conf/hardware_environment/huawei-pod8/network.yml"
+fi
 
 ./deploy.sh
diff --git a/jjb/container4nfv/container4nfv-arm64.yml b/jjb/container4nfv/container4nfv-arm64.yml
index b69c21400..324624387 100644
--- a/jjb/container4nfv/container4nfv-arm64.yml
+++ b/jjb/container4nfv/container4nfv-arm64.yml
@@ -9,15 +9,20 @@
           disabled: false
       - 'k8-sriov-nofeature-noha':
           disabled: false
+    pod:
+      - virtual:
+          slave-label: arm-packet01
+      - baremetal:
+          slave-label: compass-baremetal-arm
     jobs:
-      - 'container4nfv-{scenario}-virtual-daily-master'
+      - 'container4nfv-{scenario}-{pod}-daily-master'
 
 
 - job-template:
-    name: 'container4nfv-{scenario}-virtual-daily-master'
+    name: 'container4nfv-{scenario}-{pod}-daily-master'
     disabled: '{obj:disabled}'
     concurrent: false
-    node: arm-packet01
+    node: '{slave-label}'
 
     scm:
       - git:
@@ -28,7 +33,7 @@
           wipe-workspace: true
 
     triggers:
-      - 'trigger-{scenario}-virtual'
+      - 'trigger-{scenario}-{pod}'
 
     wrappers:
       - timeout:
@@ -46,6 +51,7 @@
             same-node: true
             block: false
 
+
 - trigger:
     name: 'trigger-k8-multus-nofeature-noha-virtual'
     triggers:
@@ -54,3 +60,12 @@
     name: 'trigger-k8-sriov-nofeature-noha-virtual'
     triggers:
       - timed: '0 16 * * *'
+
+- trigger:
+    name: 'trigger-k8-multus-nofeature-noha-baremetal'
+    triggers:
+      - timed: '0 16 * * *'
+- trigger:
+    name: 'trigger-k8-sriov-nofeature-noha-baremetal'
+    triggers:
+      - timed: '0 20 * * *'
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index fbbb086d7..c354ca655 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -120,6 +120,15 @@
       - string:
           name: DEPLOY_SCENARIO
           default: '{scenario}'
+      - string:
+          name: INSTALLER_VERSION
+          default: ''
+      - string:
+          name: UPSTREAM_JOB_NAME
+          default: ''
+      - string:
+          name: UPSTREAM_BUILD_ID
+          default: ''
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
 
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index a214a56b8..b9120b098 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -63,6 +63,8 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-onos-nofeature-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'os-ovn-nofeature-ha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-kvm-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
@@ -101,6 +103,14 @@
         stream: master
       - scenario: os-odl_l2-bgpvpn-ha
         stream: euphrates
+      - scenario: os-ovn-nofeature-noha
+        stream: danube
+      - scenario: os-ovn-nofeature-noha
+        stream: euphrates
+      - scenario: os-ovn-nofeature-ha
+        stream: danube
+      - scenario: os-ovn-nofeature-ha
+        stream: euphrates
 
     jobs:
       - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -207,7 +217,7 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: '-ha$'
+              regex: '.*-ha'
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
@@ -232,7 +242,7 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: '-ha$'
+              regex: '.*-ha'
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
@@ -396,6 +406,10 @@
     triggers:
       - timed: ''  # '5 8 * * *'
 - trigger:
+    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
     name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''  # '5 17 * * *'
@@ -498,10 +512,6 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-euphrates-trigger'
     triggers:
       - timed: ''
@@ -537,6 +547,10 @@
     triggers:
       - timed: ''
 - trigger:
+    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
     name: 'fuel-os-nosdn-kvm-ha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
@@ -642,10 +656,6 @@
     triggers:
       - timed: ''  # '0 23 * * *'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-kvm-noha-virtual-daily-euphrates-trigger'
     triggers:
       - timed: ''  # '30 6 * * *'
@@ -681,6 +691,10 @@
     triggers:
       - timed: ''
 - trigger:
+    name: 'fuel-os-ovn-nofeature-ha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
     name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
diff --git a/jjb/global/installer-report.sh b/jjb/global/installer-report.sh
index e2fcfd6f6..6cd83f1f1 100755
--- a/jjb/global/installer-report.sh
+++ b/jjb/global/installer-report.sh
@@ -8,18 +8,39 @@
 ##############################################################################
 
 source $WORKSPACE/installer_track.sh
-echo """
-    INSTALLER: $INSTALLER
-    INSTALLER_VERSION: $INSTALLER_VERSION
-    JOB_NAME: $JOB_NAME
-    BUILD_ID: $BUILD_ID
-    SENARIO: $DEPLOY_SCENARIO
-    UPSTREAM_JOB_NAME: $UPSTREAM_JOB_NAME:
-    UPSTREAM_BUILD_ID: $UPSTREAM_BUILD_ID
-    PROVISION_RESULT: $PROVISION_RESULT
-    TIMESTAMP_START: $TIMESTAMP_START
-    TIMESTAMP_END: `date '+%Y-%m-%d %H:%M:%S.%3N'`
-    POD_NAME: $NODE_NAME
-"""
 
-# TODO call TestAPI to report installer provisoin result when API is ready
+gen_content()
+{
+    cat <<EOF
+{
+    "installer": "$INSTALLER",
+    "version": "$INSTALLER_VERSION",
+    "pod_name": "$NODE_NAME",
+    "job_name": "$JOB_NAME",
+    "build_id": "$BUILD_ID",
+    "scenario": "$DEPLOY_SCENARIO",
+    "upstream_job_name": "$UPSTREAM_JOB_NAME",
+    "upstream_build_id":"$UPSTREAM_BUILD_ID",
+    "criteria": "$PROVISION_RESULT",
+    "start_date": "$TIMESTAMP_START",
+    "stop_date": "$TIMESTAMP_END",
+    "details":""
+}
+EOF
+}
+
+echo "Installer: $INSTALLER provision result: $PROVISION_RESULT"
+echo $(gen_content)
+
+set -o xtrace
+curl -H "Content-Type: application/json" -X POST -v -d "$(gen_content)" \
+    $TESTAPI_URL/deployresults || true
+
+# INFO
+# postbuildscript plugin shall always return the original job running status,
+# for the result returned from postbuildscript affects the CI pipeline.
+if [ "$PROVISION_RESULT" == "PASS" ]; then
+    exit 0
+else
+    exit 1
+fi
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 3433cee5f..8f032345e 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -39,6 +39,10 @@
           name: GERRIT_REFSPEC
           default: 'refs/heads/{branch}'
           description: "Default refspec needed for manually triggering."
+      - string:
+          name: TESTAPI_URL
+          default: 'http://testresults.opnfv.org/test/api/v1'
+          description: "Default TestAPI URL, currently using v1"
 
 - property:
     name: logrotate-default
@@ -960,16 +964,18 @@
           script-only-if-succeeded: true
           builders:
             - shell: |
-                echo "export PROVISION_RESULT=SUCCEED" >> $WORKSPACE/installer_track.sh
-                echo "export INSTALLER={installer}" >> $WORKSPACE/installer_track.sh
+                echo "export PROVISION_RESULT=PASS" >> $WORKSPACE/installer_track.sh
+                echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh
+                echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' > $WORKSPACE/installer_track.sh
             - shell:
-                !include-raw-escape: installer-report.sh
+                !include-raw: installer-report.sh
       - postbuildscript:
           script-only-if-succeeded: false
           script-only-if-failed: true
           builders:
             - shell: |
                 echo "export PROVISION_RESULT=FAIL" >> $WORKSPACE/installer_track.sh
-                echo "export INSTALLER={installer}" >> $WORKSPACE/installer_track.sh
+                echo "export INSTALLER=$INSTALLER_TYPE" >> $WORKSPACE/installer_track.sh
+                echo "export TIMESTAMP_END="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' > $WORKSPACE/installer_track.sh
             - shell:
-                !include-raw-escape: installer-report.sh
+                !include-raw: installer-report.sh
diff --git a/jjb/pharos/check-jinja2.yml b/jjb/pharos/check-jinja2.yml
index 7251d3f61..3ef2f04e5 100644
--- a/jjb/pharos/check-jinja2.yml
+++ b/jjb/pharos/check-jinja2.yml
@@ -68,11 +68,11 @@
                 - compare-type: ANT
                   pattern: '**/*.yaml'
                 - compare-type: ANT
-                  pattern: 'config/installers/**/*.j2'
+                  pattern: 'config/utils/*.py'
                 - compare-type: ANT
-                  pattern: 'check-jinja2.sh'
+                  pattern: 'config/installers/**/*.j2'
                 - compare-type: ANT
-                  pattern: 'check-schema.sh'
+                  pattern: 'check-*.sh'
           skip-vote:
             successful: false
             failed: false
diff --git a/jjb/releng/compass4nfv-docker.yml b/jjb/releng/compass4nfv-docker.yml
index 7f142241c..5fbb37ca2 100644
--- a/jjb/releng/compass4nfv-docker.yml
+++ b/jjb/releng/compass4nfv-docker.yml
@@ -27,6 +27,8 @@
       - 'db'
       - 'deck'
       - 'tasks-base'
+      - 'tasks-k8s'
+      - 'tasks-osa'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -95,6 +97,10 @@
               <<: *build-job-settings
             - name: 'compass-tasks-build-amd64-{stream}'
               <<: *build-job-settings
+            - name: 'compass-tasks-k8s-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'compass-tasks-osa-build-amd64-{stream}'
+              <<: *build-job-settings
 
     publishers:
       - 'compass-amd64-recipients'
diff --git a/jjb/releng/functest-docker.yml b/jjb/releng/functest-docker.yml
index bfeae5eaa..7c576cf00 100644
--- a/jjb/releng/functest-docker.yml
+++ b/jjb/releng/functest-docker.yml
@@ -29,6 +29,7 @@
       - 'features'
       - 'components'
       - 'parser'
+      - 'patrole'
       - 'smoke'
       - 'vnf'
       - 'restapi'
@@ -128,6 +129,10 @@
               <<: *build-job-settings
             - name: 'functest-parser-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-patrole-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-patrole-docker-build-arm64-{stream}'
+              <<: *build-job-settings
             - name: 'functest-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
             - name: 'functest-smoke-docker-build-arm64-{stream}'
@@ -153,6 +158,8 @@
               <<: *manifest-job-settings
             - name: 'functest-parser-docker-manifest-{stream}'
               <<: *manifest-job-settings
+            - name: 'functest-patrole-docker-manifest-{stream}'
+              <<: *manifest-job-settings
             - name: 'functest-smoke-docker-manifest-{stream}'
               <<: *manifest-job-settings
             - name: 'functest-vnf-docker-manifest-{stream}'
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 93b9a9c51..d0c2b2675 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -64,6 +64,11 @@
           dockerdir: 'docker/barometer-ves'
           <<: *master
           <<: *other-receivers
+      - 'barometer-snmp':
+          project: 'barometer'
+          dockerdir: 'docker/barometer-snmp'
+          <<: *master
+          <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
           <<: *master