Merge "Enable compass Arno scenario for master and stable/brahmaputra"

diff --combined jjb/functest/functest-ci-jobs.yml
index 6f202d8,f3bcd17..663702f
--- 1/jjb/functest/functest-ci-jobs.yml
--- 2/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@@ -29,15 -29,18 +29,18 @@@
          - intel-pod5:
              installer: joid
              <<: *brahmaputra
+         - huawei-us-deploy-bare-1:
+             installer: compass
+             <<: *brahmaputra
  #--------------------------------
  #        master
  #--------------------------------
-         - huawei-us-deploy-bare-1:
-             installer: compass
-             <<: *master
          - intel-pod6:
              installer: joid
              <<: *master
+         - intel-pod8:
+             installer: compass
+             <<: *master
          - intel-us-deploy-virtual-2:
              installer: apex
              <<: *master
@@@ -191,9 -194,12 +194,9 @@@
              elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
                  # If production lab then creds may be retrieved dynamically
                  # creds are on the jumphost, always in the same folder
 -                labconfig="-v /var/lib/jenkins/joid_config/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
 +                labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
                  # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
                  # replace the default one by the customized one provided by jenkins config
 -                if [ -n "${LAB_CONFIG}" ]; then
 -                    labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
 -                fi
              fi
              echo "Functest: Start Docker and prepare environment"
              envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"

diff --combined jjb/opnfv/slave-params.yml
index 3870382,4e169a8..8c86032
--- 1/jjb/opnfv/slave-params.yml
--- 2/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@@ -146,10 -146,6 +146,10 @@@
              name: GIT_BASE
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
              description: 'Git URL to use on this Jenkins Slave'
 +        - string:
 +            name: CEPH_DISKS
 +            default: /srv
 +            description: "Disks to use by ceph (comma separated list)"
  
  - parameter:
      name: 'intel-pod6-defaults'
@@@ -169,10 -165,6 +169,10 @@@
              name: GIT_BASE
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
              description: 'Git URL to use on this Jenkins Slave'
 +        - string:
 +            name: CEPH_DISKS
 +            default: /srv
 +            description: "Disks to use by ceph (comma separated list)"
  
  - parameter:
      name: 'intel-pod8-defaults'
@@@ -193,6 -185,43 +193,43 @@@
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
              description: 'Git URL to use on this Jenkins Slave'
  
+ - parameter:
+     name: 'ericsson-build-defaults'
+     parameters:
+         - node:
+             name: SLAVE_NAME
+             description: 'Slave name on Jenkins'
+             allowed-slaves:
+                 - ericsson-build
+             default-slaves:
+                 - ericsson-build
+         - string:
+             name: INSTALLER_VERSION
+             default: stable
+             description: 'Version of the installer to deploy'
+         - string:
+             name: GIT_BASE
+             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+             description: 'Git URL to use on this Jenkins Slave'
+ - parameter:
+     name: 'huawei-build-defaults'
+     parameters:
+         - node:
+             name: SLAVE_NAME
+             description: 'Slave name on Jenkins'
+             allowed-slaves:
+                 - huawei-build
+             default-slaves:
+                 - huawei-build
+         - string:
+             name: INSTALLER_VERSION
+             default: stable
+             description: 'Version of the installer to deploy'
+         - string:
+             name: GIT_BASE
+             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+             description: 'Git URL to use on this Jenkins Slave'
+ 
  - parameter:
      name: 'huawei-us-deploy-bare-1-defaults'
      parameters:
@@@ -211,6 -240,24 +248,24 @@@
              name: GIT_BASE
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
              description: 'Git URL to use on this Jenkins Slave'
+ - parameter:
+     name: 'huawei-deploy-vm-defaults'
+     parameters:
+         - node:
+             name: SLAVE_NAME
+             description: 'Slave name on Jenkins'
+             allowed-slaves:
+                 - huawei-us-deploy-vm-1
+             default-slaves:
+                 - huawei-us-deploy-vm-1
+         - string:
+             name: INSTALLER_VERSION
+             default: stable
+             description: 'Version of the installer to deploy'
+         - string:
+             name: GIT_BASE
+             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+             description: 'Git URL to use on this Jenkins Slave'
  
  - parameter:
      name: 'opnfv-build-defaults'
@@@ -312,13 -359,10 +367,13 @@@
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
              description: 'Git URL to use on this Jenkins Slave'
          - string:
 -            name: LAB_CONFIG
 -            default: "/home/opnfv/repos/functest"
 -            description: "Openstack credentials on the dev lab"
 -
 +            name: CEPH_DISKS
 +            default: /dev/sdb /dev/sdc
 +            description: "Disks to use by ceph by default (space separated list)"
 +        - string:
 +            name: CEPH_DISKS_CONTROLLERS
 +            default: /dev/sdb
 +            description: "Disks to use by ceph on controler nodes (space separated list)"
  
  - parameter:
      name: 'orange-test1-defaults'

diff --combined jjb/yardstick/yardstick-ci-jobs.yml
index 15ba405,ef26ed5..87485c4
--- 1/jjb/yardstick/yardstick-ci-jobs.yml
--- 2/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@@ -29,6 -29,9 +29,9 @@@
          - intel-pod5:
              installer: joid
              <<: *brahmaputra
+         - huawei-us-deploy-bare-1:
+             installer: compass
+             <<: *brahmaputra
  #--------------------------------
  #        master
  #--------------------------------
@@@ -41,15 -44,12 +44,15 @@@
          - intel-pod6:
              installer: joid
              <<: *master
-         - huawei-us-deploy-bare-1:
+         - intel-pod8:
              installer: compass
              <<: *master
          - zte-build-1:
              installer: fuel
              <<: *master
 +        - orange-pod2:
 +            installer: joid
 +            <<: *master
  #--------------------------------
      loop:
          - daily
@@@ -175,6 -175,14 +178,14 @@@
              default: ''
              description: 'Arguments to use in order to choose the backend DB'
  
+ - parameter:
+     name: 'yardstick-params-intel-pod8'
+     parameters:
+         - string:
+             name: YARDSTICK_DB_BACKEND
+             default: ''
+             description: 'Arguments to use in order to choose the backend DB'
+ 
  - parameter:
      name: 'yardstick-params-ericsson-pod1'
      parameters:
@@@ -215,10 -223,3 +226,10 @@@
              default: ''
              description: 'Arguments to use in order to choose the backend DB'
  
 +- parameter:
 +    name: 'yardstick-params-orange-pod2'
 +    parameters:
 +        - string:
 +            name: YARDSTICK_DB_BACKEND
 +            default: ''
 +            description: 'Arguments to use in order to choose the backend DB'