diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-11 17:51:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 17:51:50 +0000 |
| commit | a8e3451b433586b477fbe2eb939848bf97a430f4 (patch) | |
| tree | 682cf8a8156c35d644999351e355f3bc40e4e253 | |
| parent | 10cb2762a27db3dfedac88525328bc74c5bae8a3 (diff) | |
| parent | 93a90cd2be0c9ec116537466f94cbe0c38741717 (diff) | |
Merge "Disable functest for xci until xci is ready"
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yml | 20 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 21 |
2 files changed, 33 insertions, 8 deletions
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml index 441acf5f0..0835e6709 100644 --- a/jjb/xci/xci-daily-jobs.yml +++ b/jjb/xci/xci-daily-jobs.yml @@ -215,6 +215,9 @@ name: XCI_LOOP default: 'daily' - string: + name: INSTALLER_TYPE + default: 'osa' + - string: name: FUNCTEST_SUITE_NAME default: 'daily' description: "Daily suite name to run" @@ -235,7 +238,16 @@ - builder: name: xci-functest-builder builders: - - shell: - !include-raw: - - ../../utils/fetch_os_creds.sh - - ../functest/functest-alpine.sh + - shell: | + #!/bin/bash + + echo "Hello World!" + +# this will be enabled once the xci is prepared +#- builder: +# name: xci-functest-builder +# builders: +# - shell: +# !include-raw: +# - ../../utils/fetch_os_creds.sh +# - ../functest/functest-alpine.sh diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 5fca9bdbb..2cdecb208 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -180,6 +180,9 @@ name: ANSIBLE_VERBOSITY default: '-vvvv' - string: + name: INSTALLER_TYPE + default: 'osa' + - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' @@ -214,10 +217,20 @@ cd $WORKSPACE/xci ./xci-deploy.sh + - builder: name: 'xci-verify-healthcheck-macro' builders: - - shell: - !include-raw: ../../utils/fetch_os_creds.sh - - shell: - !include-raw: ../functest/functest-alpine.sh + - shell: | + #!/bin/bash + + echo "Hello World!" + +# this will be enabled once the xci is prepared +#- builder: +# name: 'xci-verify-healthcheck-macro' +# builders: +# - shell: +# !include-raw: ../../utils/fetch_os_creds.sh +# - shell: +# !include-raw: ../functest/functest-alpine.sh |