Merge "[compass4nfv] Add new scenarios"

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index cc9bac0..f14ca75 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -214,6 +214,10 @@
             slave-label: '{alpine-pod}'
             installer: fuel
             <<: *master
+        - huawei-virtual5:
+            slave-label: '{alpine-pod}'
+            installer: compass
+            <<: *master
 
     testsuite:
         - 'suite':

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index ee154af..5e07a11 100644 (file)
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -75,8 +75,8 @@
             description: 'Model to deploy (os|k8)'
         - string:
             name: OS_RELEASE
-            default: 'newton'
-            description: 'OpenStack release (mitaka|newton)'
+            default: 'ocata'
+            description: 'OpenStack release (mitaka|newton|ocata)'
         - string:
             name: EXTERNAL_NETWORK
             default: ext-net

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 3694c0b..7a257f1 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -581,6 +581,15 @@
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+- parameter:
+    name: 'huawei-virtual5-defaults'
+    parameters:
+        - label:
+            name: SLAVE_LABEL
+            default: 'huawei-virtual5'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
 - parameter:
     name: 'huawei-virtual7-defaults'
     parameters:

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index b898fa3..fa9c441 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -55,10 +55,6 @@
             project: 'qtip'
             <<: *master
             <<: *other-receivers
-        - 'storperf':
-            project: 'storperf'
-            <<: *master
-            <<: *other-receivers
         - 'storperf-master':
             project: 'storperf'
             dockerdir: 'docker/storperf-master'