Merge "add unittests for testcase and refactor testcase related implementation"

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 991497a..5a15572 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -38,7 +38,7 @@
             installer: joid
             disabled: true
             <<: *brahmaputra
-        - huawei-us-deploy-bare-1:
+        - huawei-pod1:
             installer: compass
             disabled: true
             <<: *brahmaputra
@@ -251,7 +251,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'bottlenecks-params-huawei-us-deploy-bare-1'
+    name: 'bottlenecks-params-huawei-pod1'
     parameters:
         - string:
             name: BOTTLENECKS_DB_TARGET

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index c9560a5..ce9193c 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -22,7 +22,7 @@
 #--------------------------------
 #        brahmaputra
 #--------------------------------
-        - huawei-us-deploy-bare-1:
+        - huawei-pod1:
             os-version: 'trusty'
             <<: *brahmaputra
         - huawei-virtual:
@@ -31,7 +31,7 @@
 #--------------------------------
 #        master
 #--------------------------------
-        - huawei-us-deploy-bare-2:
+        - huawei-pod2:
             os-version: 'centos7'
             <<: *master
         - intel-pod8:
@@ -213,43 +213,43 @@
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod2-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-2-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-trigger'
     triggers:
         - timed: '0 9 * * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-trigger'
     triggers:
         - timed: '0 3 * * * '
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod1-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-trigger'
     triggers:
         - timed: '0 9 * * *'
 - trigger:

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index ed748aa..4898b87 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -8,11 +8,11 @@
 
     stream:
         - master:
-            slave_name: 'huawei-us-deploy-vm-1'
+            slave_name: 'huawei-virtual1'
             branch: '{stream}'
             gs-pathname: ''
         - brahmaputra:
-            slave_name: 'huawei-us-deploy-vm-2'
+            slave_name: 'huawei-virtual2'
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
 

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index cd3f11e..c955d4e 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -34,7 +34,7 @@
         - orange-pod2:
             installer: joid
             <<: *brahmaputra
-        - huawei-us-deploy-bare-1:
+        - huawei-pod1:
             installer: compass
             <<: *brahmaputra
         - ericsson-pod1:
@@ -91,7 +91,7 @@
         - virtual:
             installer: joid
             <<: *master
-        - huawei-us-deploy-bare-2:
+        - huawei-pod2:
             installer: compass
             <<: *master
         - nokia-pod1:

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 92d59b7..f0cf556 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -236,15 +236,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-us-deploy-bare-1-defaults'
+    name: 'huawei-pod1-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-pod1
             default-slaves:
-                - huawei-us-deploy-bare-1
+                - huawei-pod1
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -255,15 +255,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-us-deploy-bare-2-defaults'
+    name: 'huawei-pod2-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-us-deploy-bare-2
+                - huawei-pod2
             default-slaves:
-                - huawei-us-deploy-bare-2
+                - huawei-pod2
         - string:
             name: INSTALLER_VERSION
             default: stable
@@ -289,15 +289,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-sh-test-2-defaults'
+    name: 'huawei-pod3-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-sh-test-2
+                - huawei-pod3
             default-slaves:
-                - huawei-sh-test-2
+                - huawei-pod3
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'
@@ -311,15 +311,15 @@
             description: 'Git URL to use on this Jenkins Slave'
 
 - parameter:
-    name: 'huawei-sh-pod6-defaults'
+    name: 'huawei-pod4-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-sh-pod6
+                - huawei-pod4
             default-slaves:
-                - huawei-sh-pod6
+                - huawei-pod4
         - label:
             name: SLAVE_LABEL
             default: 'huawei-test'

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 32191ff..7496ba7 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -45,7 +45,7 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
-        - huawei-us-deploy-bare-1:
+        - huawei-pod1:
             installer: compass
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
@@ -123,7 +123,7 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
-        - huawei-us-deploy-bare-2:
+        - huawei-pod2:
             installer: compass
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
@@ -138,15 +138,15 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
-        - huawei-sh-test-2:
+        - huawei-pod3:
             installer: compass
             suite: daily
-            auto-trigger-name: 'yardstick-daily-huawei-sh-test-2-trigger'
+            auto-trigger-name: 'yardstick-daily-huawei-pod3-trigger'
             <<: *master
-        - huawei-sh-pod6:
+        - huawei-pod4:
             installer: compass
             suite: daily
-            auto-trigger-name: 'yardstick-daily-huawei-sh-pod6-trigger'
+            auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
             <<: *master
         - virtual:
             installer: joid
@@ -371,7 +371,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-us-deploy-bare-1'
+    name: 'yardstick-params-huawei-pod1'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -379,7 +379,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-us-deploy-bare-2'
+    name: 'yardstick-params-huawei-pod2'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -419,7 +419,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-sh-test-2'
+    name: 'yardstick-params-huawei-pod3'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -427,7 +427,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-huawei-sh-pod6'
+    name: 'yardstick-params-huawei-pod4'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -444,11 +444,11 @@
         - timed: '0 1 * * *'
 
 - trigger:
-    name: 'yardstick-daily-huawei-sh-test-2-trigger'
+    name: 'yardstick-daily-huawei-pod3-trigger'
     triggers:
         - timed: '0 1 * * *'
 
 - trigger:
-    name: 'yardstick-daily-huawei-sh-pod6-trigger'
+    name: 'yardstick-daily-huawei-pod4-trigger'
     triggers:
         - timed: '0 1 * * *'