Merge "Add parameter of external network for yardstick testing"

diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index 2ca87b0..479041a 100644 (file)
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -5,8 +5,8 @@
     name: bottlenecks
     jobs:
         - 'bottlenecks-verify-{stream}'
-        - 'bottlenecks-daily-{installer}-{pod}-{stream}'
-        - 'bottlenecks-upload-artifacts-{stream}'
+        - 'bottlenecks-daily-{installer}-{suite}-{pod}-{stream}'
+        - 'bottlenecks-{suite}-upload-artifacts-{stream}'
     pod:
         - lf:
             node: 'opnfv-jump-2'
@@ -14,16 +14,20 @@
             installer_ip: '10.20.0.2'
 
     installer:
-        -fuel
+        - 'fuel'
+
+    suite:
+        - 'rubbos'
+        - 'vstf'
 
 # only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
             gs-pathname: ''
 #        - brahmaputra:
-#            branch: 'stable/brahmaputra'
-#            gs-pathname: '/brahmaputra'
+#            branch: 'stable/{stream}'
+#            gs-pathname: '/{stream}'
 
     project: 'bottlenecks'
 ###############################
@@ -72,7 +76,7 @@
             echo "Nothing to verify!"
 
 - job-template:
-    name: 'bottlenecks-upload-artifacts-{stream}'
+    name: 'bottlenecks-{suite}-upload-artifacts-{stream}'
 
     node: ericsson-build
 
@@ -90,6 +94,7 @@
         - 'ericsson-ca-build-1-defaults'
         - bottlenecks-parameter:
             gs-pathname: '{gs-pathname}'
+            suite: '{suite}'
 
     scm:
         - git-scm:
@@ -102,7 +107,7 @@
         - 'bottlenecks-workspace-cleanup'
 
 - job-template:
-    name: 'bottlenecks-daily-{installer}-{pod}-{stream}'
+    name: 'bottlenecks-daily-{installer}-{suite}-{pod}-{stream}'
 
     disabled: false
 
@@ -140,11 +145,11 @@
 
     builders:
         - 'bottlenecks-fetch-os-creds'
-        - 'bottlenecks-run-rubbos'
+        - 'bottlenecks-run-{suite}'
 
     publishers:
         - email:
-            recipients: hongbo.tianhongbo@huawei.com matthew.lijun@huawei.com liangqi1@huawei.com
+            recipients: hongbo.tianhongbo@huawei.com matthew.lijun@huawei.com liangqi1@huawei.com liyiting@huawei.com
 
 ####################
 # parameter macros
@@ -154,15 +159,15 @@
     parameters:
         - string:
            name: CACHE_DIR
-           default: $WORKSPACE/cache
+           default: $WORKSPACE/cache/{suite}
            description: "the cache to store packages downloaded from public IP"
         - string:
-           name: RUBBOS_URL
-           default: gs://artifacts.opnfv.org/bottlenecks/rubbos{gs-pathname}
+           name: SUITE_URL
+           default: gs://artifacts.opnfv.org/bottlenecks/{suite}{gs-pathname}
            description: "LF artifacts url for storage of bottlenecks packages"
         - string:
            name: PACKAGE_URL
-           default: http://205.177.226.235:9999/bottlenecks/rubbos/
+           default: http://205.177.226.235:9999/bottlenecks/{suite}/
            description: "the url where we store the packages used for bottlenecks rubbos"
 
 ###################################
@@ -185,6 +190,16 @@
             cd $WORKSPACE
             ./ci/run.sh $GERRIT_REFSPEC_DEBUG
 
+- builder:
+    name: bottlenecks-run-vstf
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+
+            echo "Bottlenecks: vstf running now..."
+            cd $WORKSPACE
+            ./ci/vstf_run.sh $GERRIT_REFSPEC_DEBUG
 - builder:
     name: bottlenecks-builder-upload-artifact
     builders:
@@ -192,7 +207,7 @@
             #!/bin/bash
             set -o errexit
 
-            echo "Bottlenecks: upload to artifacts from the public IP"
+            echo "Bottlenecks ${suite}: upload to artifacts from the public IP"
 
             [[ -d $CACHE_DIR ]] || mkdir -p $CACHE_DIR
 
@@ -202,7 +217,7 @@
                                sed 's/".*//' |
                                grep '^[a-zA-Z].*'); do
                  curl --connect-timeout 10 -o $CACHE_DIR/$file $PACKAGE_URL$file
-                 gsutil cp $CACHE_DIR/$file $RUBBOS_URL
+                 gsutil cp $CACHE_DIR/$file $SUITE_URL
             done
 
 - builder:

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 5479710..92bc2da 100644 (file)
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -9,7 +9,7 @@
         - 'compass-daily-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-deploy-virtual-{flavor}-{stream}'
+        - 'compass-deploy-virtual-{sdn-controller}-{stream}'
         - 'compass-deploy-bare-huawei-us-{stream}'
 
 # only master branch is enabled at the moment to keep no of jobs sane
@@ -21,16 +21,19 @@
 #            branch: 'stable/{stream}'
 #            gs-pathname: '/{stream}'
 
-    flavor:
-        - cluster-odl:
-            conf: 'virtual_cluster_odl'
-            node: 'huawei-deploy-vm'
-        - cluster-onos:
-            conf: 'virtual_cluster_onos'
-            node: 'huawei-deploy-vm'
-        - cluster:
-            conf: 'virtual_cluster'
-            node: 'huawei-deploy-vm'
+    sdn-controller:
+        - 'nosdn':
+            disabled: false
+            node: huawei-deploy-vm
+        - 'odl':
+            disabled: false
+            node: huawei-deploy-vm
+        - 'onos':
+            disabled: false
+            node: huawei-deploy-vm
+        - 'opencontrail':
+            disabled: true
+            node: huawei-deploy-vm
 
     project: 'compass4nfv'
 
@@ -61,9 +64,8 @@
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
-            name: FLAVOR_CONF
-            default: 'virtual_cluster'
-            description: ""
+            name: SDN_CONTROLLER
+            default: '{sdn-controller}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -94,7 +96,7 @@
 
     builders:
         - 'builder-compass-build-iso'
-        - 'builder-compass-deploy-virtual-flavor'
+        - 'builder-compass-deploy-virtual'
     publishers:
         - archive:
             artifacts: 'ansible.log'
@@ -136,21 +138,21 @@
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'compass-deploy-virtual-cluster-{stream}'
+          - project: 'compass-deploy-virtual-cluster-nosnd-{stream}'
             git-revision: true
-            block: true
+            block: false
         - trigger-builds:
           - project: 'compass-deploy-virtual-cluster-odl-{stream}'
             git-revision: true
-            block: true
+            block: false
         - trigger-builds:
           - project: 'compass-deploy-virtual-cluster-onos-{stream}'
             git-revision: true
-            block: true
+            block: false
         - trigger-builds:
           - project: 'compass-deploy-bare-huawei-us-{stream}'
             git-revision: true
-            block: true
+            block: false
 
 
 - job-template:
@@ -219,7 +221,7 @@
         - 'builder-compass-make-ppa'
 
 - job-template:
-    name: 'compass-deploy-virtual-{flavor}-{stream}'
+    name: 'compass-deploy-virtual-{sdn-controller}-{stream}'
 
     disabled: false
 
@@ -240,14 +242,13 @@
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
-            name: FLAVOR_CONF
-            default: '{conf}'
-            description: ""
+            name: SDN_CONTROLLER
+            default: '{sdn-controller}'
 
     builders:
         - 'builder-compass-ci-preclean-workspace'
         - 'builder-compass-download-artifact'
-        - 'builder-compass-deploy-virtual-flavor'
+        - 'builder-compass-deploy-virtual'
     publishers:
         - archive:
             artifacts: 'ansible.log'
@@ -275,6 +276,9 @@
         - compass-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: SDN_CONTROLLER
+            default: '{sdn-controller}'
 
     builders:
         - 'builder-compass-ci-preclean-workspace'
@@ -409,7 +413,7 @@
             echo "Done!"
 
 - builder:
-    name: 'builder-compass-deploy-virtual-flavor'
+    name: 'builder-compass-deploy-virtual'
     builders:
         - shell: |
             #!/bin/bash
@@ -421,14 +425,10 @@
             echo
 
             export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
-            sudo brctl addbr vnic_ci
-            sudo ifconfig vnic_ci up
-            export EXTERNAL_NIC=vnic_ci
-            cd $WORKSPACE
-
             export OS_VERSION=${COMPASS_OS_VERSION}
             export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
-            ./deploy.sh $FLAVOR_CONF
+            export CONFDIR=$WORKSPACE/deploy/conf/vm_environment
+            ./deploy.sh --dha $CONFDIR/$SDN_CONTROLLER.yml --network $CONFDIR/$NODE_NAME/network.yml
             if [ $? -ne 0 ]; then
                 echo "depolyment failed!"
                 deploy_ret=1

diff --git a/jjb/functest/res-build.sh b/jjb/functest/res-build.sh
index 9d42577..1f46996 100644 (file)
--- a/jjb/functest/res-build.sh
+++ b/jjb/functest/res-build.sh
@@ -9,7 +9,7 @@ res_build_date=$(date -u +"%Y-%m-%d_%H-%M-%S")
 
 # Result directory in the jumphost
 # to be used only with CI
-dir_result="${HOME}/opnfv/functest/reports"
+dir_result="${HOME}/opnfv/functest/results"
 
 # Clean the results directory
 # remove json file for rally, export only html