Merge "[daisy]Enable yardstick daily jobs on zte-pod3 and zte-pod9"

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index c74e3c8..0bf750b 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -250,6 +250,7 @@
           gs-pathname: '{gs-pathname}'
       - '{slave-label}-defaults':
           installer: '{installer}'
+      - testapi-parameter
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
@@ -262,6 +263,7 @@
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
+      - track-begin-timestamp
       - shell:
           !include-raw-escape: ../fuel/fuel-deploy.sh
 
@@ -269,6 +271,7 @@
       - email:
           recipients: armband@enea.com
       - email-jenkins-admins-on-failure
+      - report-provision-result
 
 ########################
 # trigger macros

diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
index 56aee17..cd38313 100644 (file)
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
@@ -34,7 +34,6 @@
       - dovetail
       - dpacc
       - enfv
-      - fastpathmetrics
       - fds
       - fuel
       - functest
@@ -43,12 +42,9 @@
       - kvmfornfv
       - models
       - moon
-      - multisite
       - netready
       - nfvbench
-      - octopus
       - onosfw
-      - openretriever
       - opera
       - opnfvdocs
       - orchestra
@@ -159,7 +155,7 @@
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|escalator|fds|fuel|functest|octopus|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|lsoapi|models|moon|multisite|netready'
+              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 444b173..c357ff6 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -14,14 +14,14 @@
           gs-pathname: ''
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'ocata'
+          openstack-version: 'pike'
           branch-type: 'master'
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'ocata'
+          openstack-version: 'pike'
           branch-type: 'master'
 
     distro:

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 5732100..3985356 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -121,7 +121,9 @@
           branch: '{branch}'
       - '{installer}-defaults'
       - 'doctor-slave-parameter'
-      - 'doctor-parameter'
+      - 'doctor-parameter':
+          docker-tag: '{docker-tag}'
+          scenario: '{scenario}'
       - 'doctor-functest-parameter'
     scm:
       - git-scm-gerrit

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index d011283..f74b107 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -213,7 +213,7 @@ if [[ ! -f ${ubuntu_image} ]]; then
 fi
 sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES}
 
-# functest needs to download this image first before running
+# yardstick and bottlenecks need to download this image first before running
 cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img
 if [[ ! -f ${cirros_image} ]]; then
     echo "Download image cirros-0.3.5-x86_64-disk.img ..."
@@ -221,6 +221,14 @@ if [[ ! -f ${cirros_image} ]]; then
 fi
 sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
 
+# functest needs to download this image first before running
+cirros_image=${image_path}/cirros-0.4.0-x86_64-disk.img
+if [[ ! -f ${cirros_image} ]]; then
+    echo "Download image cirros-0.4.0-x86_64-disk.img ..."
+    wget -q -nc http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P ${image_path}
+fi
+sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
+
 # snaps_smoke test case needs to download this image first before running
 ubuntu14_image=${image_path}/ubuntu-14.04-server-cloudimg-amd64-disk1.img
 if [[ ! -f ${ubuntu14_image} ]]; then

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index d70e7e0..f473d85 100644 (file)
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -685,22 +685,6 @@
           recipients: >
             JBuchanan@advaoptical.com
 
-- publisher:
-    name: 'email-escalator-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            kong.wei2@zte.com.cn
-
-- publisher:
-    name: 'email-fastpathmetrics-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            maryam.tahhan@intel.com
-
 - publisher:
     name: 'email-fds-ptl'
     publishers:
@@ -765,14 +749,6 @@
           recipients: >
             ruan.he@orange.com
 
-- publisher:
-    name: 'email-multisite-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            joehuang@huawei.com
-
 - publisher:
     name: 'email-netready-ptl'
     publishers:
@@ -789,14 +765,6 @@
           recipients: >
             ahothan@cisco.com
 
-- publisher:
-    name: 'email-octopus-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            ulrich.kleber@huawei.com
-
 - publisher:
     name: 'email-onosfw-ptl'
     publishers:
@@ -805,14 +773,6 @@
           recipients: >
             su.wei@huawei.com
 
-- publisher:
-    name: 'email-openretriever-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            jiaxuan@chinamobile.com
-
 - publisher:
     name: 'email-opera-ptl'
     publishers:

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index ee63578..9d8bed4 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -1014,17 +1014,6 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to be used'
 
-- parameter:
-    name: 'multisite-virtual-defaults'
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'multisite-virtual'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-
 - parameter:
     name: 'ericsson-virtual5-defaults'
     parameters:

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
deleted file mode 100644 (file)
index a04d7f1..0000000
--- a/jjb/octopus/octopus.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-################################
-# job configuration for Octopus
-################################
-- project:
-    name: octopus
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'

diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
deleted file mode 100644 (file)
index b686d95..0000000
--- a/jjb/prediction/prediction.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
-    name: prediction
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'

diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 80893de..f8e994c 100644 (file)
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -172,7 +172,7 @@
                 comment-contains-value: 'reverify'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'armband|fuel|octopus|releng-anteater'
+              project-pattern: 'armband|fuel|releng-anteater'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'