Merge "run Functest daily in xci"

diff --combined jjb/xci/xci-daily-jobs.yml
index c39d07e,c7d59d5..441acf5
--- 1/jjb/xci/xci-daily-jobs.yml
--- 2/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@@ -16,6 -16,10 +16,6 @@@
          stream: master
          opnfv-releng-version: master
          gs-pathname: ''
 -    ocata: &ocata
 -        stream: ocata
 -        opnfv-releng-version: master
 -        gs-pathname: '/{stream}'
  #--------------------------------
  # Scenarios
  #--------------------------------
@@@ -26,18 -30,14 +26,18 @@@
          - 'os-nosdn-nofeature-noha':
              auto-trigger-name: 'daily-trigger-disabled'
              xci-flavor: 'noha'
 +        - 'os-odl-sfc-ha':
 +            auto-trigger-name: 'daily-trigger-disabled'
 +            xci-flavor: 'ha'
 +        - 'os-odl-sfc-noha':
 +            auto-trigger-name: 'daily-trigger-disabled'
 +            xci-flavor: 'noha'
  #--------------------------------
  # XCI PODs
  #--------------------------------
      pod:
          - virtual:
              <<: *master
 -        - virtual:
 -            <<: *ocata
  #--------------------------------
  # Supported Distros
  #--------------------------------
@@@ -59,7 -59,7 +59,7 @@@
          - 'suse':
              disabled: true
              slave-label: xci-suse-virtual
 -            dib-os-release: '42.2'
 +            dib-os-release: '42.3'
              dib-os-element: 'opensuse-minimal'
              dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
              extra-dib-elements: 'openssh-server'
@@@ -214,7 -214,10 +214,10 @@@
          - string:
              name: XCI_LOOP
              default: 'daily'
- 
+         - string:
+             name: FUNCTEST_SUITE_NAME
+             default: 'daily'
+             description: "Daily suite name to run"
      builders:
          - description-setter:
              description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
@@@ -233,4 -236,6 +236,6 @@@
      name: xci-functest-builder
      builders:
          - shell:
-             !include-raw: ./xci-functest.sh
+             !include-raw:
+                 - ../../utils/fetch_os_creds.sh
+                 - ../functest/functest-alpine.sh