diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-09-11 07:31:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 07:31:59 +0000 |
| commit | 9e686dafc73f390c13ca05bbeea7f7729aa57f38 (patch) | |
| tree | 737fe45746680158b449b573cd0a1b795a04b874 | |
| parent | 641e4920bec46a77d8e3d3bfcd1dd4f9f9ac512f (diff) | |
| parent | 720399137357dc4eb2b1379e842c4e85c37f07a8 (diff) | |
Merge "run Functest daily in xci"
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yml | 9 | ||||
| -rwxr-xr-x | jjb/xci/xci-functest.sh | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml index c39d07e39..441acf5f0 100644 --- a/jjb/xci/xci-daily-jobs.yml +++ b/jjb/xci/xci-daily-jobs.yml @@ -214,7 +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 @@ name: xci-functest-builder builders: - shell: - !include-raw: ./xci-functest.sh + !include-raw: + - ../../utils/fetch_os_creds.sh + - ../functest/functest-alpine.sh diff --git a/jjb/xci/xci-functest.sh b/jjb/xci/xci-functest.sh deleted file mode 100755 index 0f58dfefc..000000000 --- a/jjb/xci/xci-functest.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "Functional testing with functest" |