Merge "Add 'docker' string to functest docker build names"

diff --git a/INFO b/INFO
index 18c8cf2..d9051ab 100644 (file)
--- a/INFO
+++ b/INFO
@@ -16,7 +16,6 @@ Fatih Degirmenci (Ericsson, fatih.degirmenci@ericsson.com)
 Aric Gardner (Linux Foundation, agardner@linuxfoundation.org)
 Tim Rozet (Red Hat, trozet@redhat.com)
 Morgan Richomme (Orange, morgan.richomme@orange.com)
-Matthew Lijun (Huawei, matthew.lijun@huawei.com)
 Jose Lausuch (Ericsson, jose.lausuch@ericsson.com)
 Ryota Mibu (NEC, r-mibu@cq.jp.nec.com)
 Mei Mei (Huawei, meimei@huawei.com)

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 43e234c..eadfbf9 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -543,7 +543,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 6cd9de2..f49c7fa 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -419,7 +419,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 4adfc2a..0790b83 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -13,7 +13,7 @@
       gs-pathname: ''
       ppa-pathname: '/{stream}'
       disabled: false
-      openstack-version: ocata
+      openstack-version: pike
     euphrates: &euphrates
       stream: euphrates
       branch: 'stable/{stream}'
@@ -54,7 +54,7 @@
       #        master
       # -------------------------------
       - baremetal-centos:
-          slave-label: 'intel-pod8'
+          slave-label: 'intel-pod17'
           os-version: 'centos7'
           <<: *master
       # -------------------------------
@@ -120,6 +120,9 @@
       - 'os-nosdn-ovs_dpdk-noha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-bar-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
       - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -207,24 +210,21 @@
               unstable-threshold: 'FAILURE'
       # dovetail only master by now, not sync with A/B/C branches
       # here the stream means the SUT stream, dovetail stream is defined in its own job
-      # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario
-      # run against SUT master branch, dovetail docker image with latest tag
-      # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday)
-      # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday)
+      # only run on os-(nosdn|odl_l2|odl_l3)-nofeature-ha scenario
+      # run against SUT master/euphrates branch, dovetail docker image with latest tag(Monday, Tuesday)
+      # run against SUT master/euphrates branch, dovetail docker image with cvp.X.X.X tag(Thursday, Friday)
+      # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag on huawei-pod7
       - conditional-step:
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: danube
-              label: '{stream}'
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+              regex: os-(nosdn|odl_l3)-nofeature-ha
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
               days:
                 MON: true
-                SUN: true
+                TUES: true
               use-build-time: true
           steps:
             - trigger-builds:
@@ -243,19 +243,13 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: danube
-              label: '{stream}'
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+              regex: os-(nosdn|odl_l3)-nofeature-ha
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                TUES: true
-                WED: true
                 THURS: true
                 FRI: true
-                SAT: true
               use-build-time: true
           steps:
             - trigger-builds:
@@ -269,27 +263,6 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
-              label: '{scenario}'
-            - condition-kind: regex-match
-              regex: master
-              label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
-                  current-parameters: false
-                  predefined-parameters:
-                    DEPLOY_SCENARIO={scenario}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
       - conditional-step:
           condition-kind: and
           condition-operands:
@@ -333,7 +306,7 @@
       - build-name:
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
       - timeout:
-          timeout: 240
+          timeout: 360
           abort: true
       - fix-workspace-permissions
 
@@ -453,6 +426,10 @@
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-ha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: ''  # '0 19 * * *'
 
 # ----------------------------
 # noha-baremetal-centos-master
@@ -533,6 +510,10 @@
     name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-ha-huawei-pod7-danube-trigger'
+    triggers:
+      - timed: ''  # '0 19 * * *'
 
 # ----------------------------
 # noha-huawei-pod7-danube
@@ -568,7 +549,7 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 20 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
     triggers:
@@ -580,7 +561,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: '0 18 1-29/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
     triggers:
@@ -596,15 +577,15 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 12 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 14 * * *'
+      - timed: '0 14 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 2-30/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
@@ -612,7 +593,11 @@
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 10 * * *'
+      - timed: '0 10 1-29/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '0 2 2-30/2 * *'
 
 # ---------------------
 # noha-baremetal-master
@@ -648,7 +633,7 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 1 * * *'
+      - timed: '0 1 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
     triggers:
@@ -660,7 +645,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 21 * * *'
+      - timed: '0 21 2-30/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
@@ -676,15 +661,15 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 5 * * *'
+      - timed: '0 5 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 13 * * *'
+      - timed: '0 13 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 9 * * *'
+      - timed: '0 9 1-29/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
@@ -692,7 +677,11 @@
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '0 17 * * *'
+      - timed: '0 17 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: '0 21 1-29/2 * *'
 
 # ---------------------
 # noha-baremetal-euphrates
@@ -740,7 +729,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 19 * * *'
+      - timed: '0 19 2-30/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -756,15 +745,15 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-      - timed: '30 12 * * *'
+      - timed: '30 12 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 13 * * *'
+      - timed: '0 13 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 17 * * *'
+      - timed: '0 17 2-30/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -772,7 +761,11 @@
 - trigger:
     name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-ha-virtual-master-trigger'
+    triggers:
+      - timed: '0 17 1-29/2 * *'
 
 # -------------------
 # noha-virtual-master
@@ -780,27 +773,27 @@
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-virtual-master-trigger'
     triggers:
-      - timed: '30 13 * * *'
+      - timed: '30 13 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 14 * * *'
+      - timed: '0 14 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 15 * * *'
+      - timed: '0 15 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: '0 18 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 20 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 11 * * *'
+      - timed: '0 11 2-30/2 * *'
 
 # -----------------
 # ha-virtual-euphrates
@@ -808,7 +801,7 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 23 * * *'
+      - timed: '0 23 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
     triggers:
@@ -820,7 +813,7 @@
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 22 * * *'
+      - timed: '0 22 2-30/2 * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
     triggers:
@@ -836,23 +829,27 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 20 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 14 * * *'
+      - timed: '0 14 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: '0 18 2-30/2 * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-      - timed: '5 1 * * *'
+      - timed: '5 1 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
+    triggers:
+      - timed: '0 19 1-29/2 * *'
 
 # -------------------
 # noha-virtual-euphrates
@@ -860,24 +857,24 @@
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 15 * * *'
+      - timed: '0 15 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 17 * * *'
+      - timed: '0 17 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 23 * * *'
+      - timed: '0 23 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 21 * * *'
+      - timed: '0 21 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 19 * * *'
+      - timed: '0 19 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 12 2-30/2 * *'

diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index ad069a5..ac649b9 100644 (file)
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -45,10 +45,6 @@ else
     export NETWORK_CONF_FILE=network.yml
 fi
 
-if [[ "$NODE_NAME" =~ "intel-pod8" ]]; then
-    export OS_MGMT_NIC=em4
-fi
-
 if [[ "$NODE_NAME" =~ "-virtual" ]]; then
     export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE}
     export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml
@@ -58,7 +54,11 @@ if [[ "$NODE_NAME" =~ "-virtual" ]]; then
         export VIRT_NUMBER=2
     fi
 else
-    export INSTALL_NIC=eth1
+    if [[ "$NODE_NAME" =~ "intel-pod17" ]]; then
+        export INSTALL_NIC=eno2
+    else
+        export INSTALL_NIC=eth1
+    fi
     export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE}
     export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
 fi

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 6927145..7024dad 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -16,13 +16,13 @@
           disabled: false
           openstack-version: 'ocata'
           branch-type: 'master'
-      - danube:
+      - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'newton'
-          branch-type: 'branch'
+          openstack-version: 'ocata'
+          branch-type: 'master'
 
     distro:
       - 'xenial':
@@ -75,7 +75,7 @@
     wrappers:
       - ssh-agent-wrapper
       - timeout:
-          timeout: 240
+          timeout: 360
           fail: true
       - fix-workspace-permissions
 

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 2d5d397..79e5c15 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -192,9 +192,9 @@
       - 'suite':
           job-timeout: 60
       - 'daily':
-          job-timeout: 240
+          job-timeout: 300
       - 'arm-daily':
-          job-timeout: 240
+          job-timeout: 300
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index c645de6..dc0fb0c 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -646,6 +646,20 @@
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
 
+- parameter:
+    name: 'intel-pod17-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod17
+          default-slaves:
+            - intel-pod17
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+
 - parameter:
     name: 'huawei-virtual5-defaults'
     parameters:

diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index db2fb8b..103069f 100644 (file)
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -7,7 +7,7 @@
     name: qtip-experimental-jobs
     project: qtip
     jobs:
-      - 'qtip-experimental-{stream}'
+      - 'qtip-experimental-{pod}-{stream}'
     stream:
       - master:
           branch: '{stream}'
@@ -18,12 +18,17 @@
           gs-pathname: '/{stream}'
           disabled: false
 
+    pod:
+      - zte-virtual6:
+          installer: fuel
+          pod: zte-virtual6
+
 ################################
 ## job templates
 #################################
 
 - job-template:
-    name: 'qtip-experimental-{stream}'
+    name: 'qtip-experimental-{pod}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -31,9 +36,8 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      # Pin the tests on zte-pod6 with MCP deployment
-      - fuel-defaults
-      - zte-virtual6-defaults
+      - '{installer}-defaults'
+      - '{pod}-defaults'
     scm:
       - git-scm-gerrit
 

diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml
index 047d7f2..f772e39 100644 (file)
--- a/jjb/qtip/qtip-verify-jobs.yml
+++ b/jjb/qtip/qtip-verify-jobs.yml
@@ -191,7 +191,8 @@
 
           mkdir -p $local_path
 
-          git diff HEAD~1 --name-only | grep -E ".+\.ipynb$" | xargs -I '{}' cp '{}' $local_path
+          git diff HEAD~1 --name-status | grep -E "[AM]\t.+\.ipynb$" | awk '{print $2}' \
+            | xargs -I '{}' cp '{}' $local_path
           gsutil -m cp -r "$local_path" "gs://$gs_base/"
 
           echo "Document link(s):" >> gerrit_comment.txt

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 8250bfe..1a27562 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -39,6 +39,10 @@
           project: 'releng-anteater'
           <<: *master
           <<: *other-receivers
+      - 'barometer':
+          project: 'barometer'
+          <<: *master
+          <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
           <<: *master
@@ -93,18 +97,17 @@
           project: 'yardstick'
           <<: *master
           <<: *other-receivers
-      # projects with jobs for Danube
-      - 'qtip':
-          project: 'qtip'
+      # projects with jobs for euphrates
+      - 'bottlenecks':
+          project: 'bottlenecks'
           <<: *euphrates
           <<: *other-receivers
-      - 'yardstick':
-          project: 'yardstick'
+      - 'nfvbench':
+          project: 'nfvbench'
           <<: *euphrates
           <<: *other-receivers
-      # projects with jobs for euphrates
-      - 'bottlenecks':
-          project: 'bottlenecks'
+      - 'qtip':
+          project: 'qtip'
           <<: *euphrates
           <<: *other-receivers
       - 'storperf-master':
@@ -137,8 +140,8 @@
           arch_tag: 'x86_64'
           <<: *euphrates
           <<: *storperf-receivers
-      - 'nfvbench':
-          project: 'nfvbench'
+      - 'yardstick':
+          project: 'yardstick'
           <<: *euphrates
           <<: *other-receivers
 

diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh
index 2408c2a..6fa0aef 100644 (file)
--- a/jjb/releng/opnfv-repo-archiver.sh
+++ b/jjb/releng/opnfv-repo-archiver.sh
@@ -61,6 +61,8 @@ echo "--------------------------------------"
 gsutil cp "$WORKSPACE/opnfv-archive-$DATE.tar.gz" \
     "gs://opnfv-archive/opnfv-archive-$DATE.tar.gz" 2>&1
 
+echo "https://storage.googleapis.com/opnfv-archive/opnfv-archive-$DATE.tar.gz" > archive-link.txt
+
 rm -f opnfv-archive-$DATE.tar.gz
 
 echo "Finished"

diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index 80cd08f..6f77cd2 100644 (file)
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -24,8 +24,8 @@
           description: Slaves to prune docker images
           default-slaves:
             - arm-build2
+            - ericsson-build3
             - ericsson-build4
-            - ericsson-build5
             - lf-build2
           allowed-multiselect: true
           ignore-offline-nodes: true
@@ -65,6 +65,19 @@
       - shell:
           !include-raw-escape: opnfv-repo-archiver.sh
 
+    publishers:
+      - email-ext:
+          content-type: 'text'
+          failure: false
+          always: true
+          body:
+            ${{FILE,path="archive-link.txt"}}
+          reply-to: >
+            helpdesk@opnfv.org
+          recipients: >
+            swinslow@linuxfoundation.org
+
+
 - job-template:
     name: 'check-status-of-slaves'
 

diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 263f544..198f2e1 100755 (executable)
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -25,9 +25,6 @@ cd ~/bifrost
 # provision 3 VMs; xcimaster, controller, and compute
 ./scripts/bifrost-provision.sh
 
-# list the provisioned VMs
-source env-vars
-ironic node-list
 sudo -H -E virsh list
 EOF
 chmod a+x bifrost_test.sh
@@ -44,6 +41,6 @@ export XCI_UPDATE_CLEAN_VM_OS=true
 
 ./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
 
-rsync -a $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
+rsync -a -e "ssh -F $HOME/.ssh/xci-vm-config" $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
 
 ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh"

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 93ca187..ca14cd9 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -195,8 +195,8 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'bifrost-verify-.*'
-            - 'bifrost-periodic-.*'
+            - '.*-bifrost-verify-.*'
+            - '.*-bifrost-periodic-.*'
             - 'osa-verify-.*'
             - 'osa-periodic-.*'
           block-level: 'NODE'

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 7486d8a..e2fee29 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -67,7 +67,12 @@
           fail: true
 
     builders:
-      - yardstick-unit-tests-and-docs-build
+      - yardstick-unit-tests-python-27
+      - yardstick-unit-tests-python-3
+      - yardstick-functional-tests-python-27
+      - yardstick-functional-tests-python-3
+      - yardstick-coverage-tests
+      - yardstick-pep8-tests
 
 - job-template:
     name: 'yardstick-merge-{stream}'
@@ -108,14 +113,19 @@
           fail: true
 
     builders:
-      - yardstick-unit-tests-and-docs-build
+      - yardstick-unit-tests-python-27
+      - yardstick-unit-tests-python-3
+      - yardstick-functional-tests-python-27
+      - yardstick-functional-tests-python-3
+      - yardstick-coverage-tests
+      - yardstick-pep8-tests
 
 ################################
 # job builders
 ################################
 
 - builder:
-    name: yardstick-unit-tests-and-docs-build
+    name: yardstick-unit-tests-python-27
     builders:
       - shell: |
           #!/bin/bash
@@ -124,6 +134,76 @@
 
           sudo apt-get install -y build-essential python-dev python3-dev
 
-          echo "Running unit tests..."
+          echo "Running unit tests in Python 2.7 ..."
           cd $WORKSPACE
-          tox
+          tox -epy27
+
+- builder:
+    name: yardstick-unit-tests-python-3
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get install -y build-essential python-dev python3-dev
+
+          echo "Running unit tests in Python 3 ..."
+          cd $WORKSPACE
+          tox -epy3
+
+- builder:
+    name: yardstick-functional-tests-python-27
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get install -y build-essential python-dev python3-dev
+
+          echo "Running functional tests in Python 2.7 ..."
+          cd $WORKSPACE
+          tox -efunctional
+
+- builder:
+    name: yardstick-functional-tests-python-3
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get install -y build-essential python-dev python3-dev
+
+          echo "Running functional tests in Python 3 ..."
+          cd $WORKSPACE
+          tox -efunctional-py3
+
+- builder:
+    name: yardstick-coverage-tests
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get install -y build-essential python-dev python3-dev
+
+          echo "Running coverage tests ..."
+          cd $WORKSPACE
+          tox -ecoverage
+
+- builder:
+    name: yardstick-pep8-tests
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get install -y build-essential python-dev python3-dev
+
+          echo "Running style guidelines (PEP8) tests ..."
+          cd $WORKSPACE
+          tox -epep8

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 238c4c6..0fcea0d 100644 (file)
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -23,7 +23,7 @@ dir_result="${HOME}/opnfv/$project/results/${branch}"
 node_list=(\
 'lf-pod1' 'lf-pod2' 'intel-pod2' 'intel-pod12' \
 'lf-virtual2' 'lf-virtual3' \
-'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' \
+'intel-pod5' 'intel-pod6' 'intel-pod7' 'intel-pod8' 'intel-pod18' \
 'ericsson-pod1' 'ericsson-pod2' \
 'ericsson-virtual1' 'ericsson-virtual2'  'ericsson-virtual3' \
 'ericsson-virtual4' 'ericsson-virtual5' 'ericsson-virtual12' \