diff options
author | xudan <xudan16@huawei.com> | 2016-12-02 08:58:16 +0000 |
---|---|---|
committer | xudan <xudan16@huawei.com> | 2016-12-14 02:43:19 +0000 |
commit | 05d995655dd07dfb72191c66e2c1c5177925dd5c (patch) | |
tree | 58eb529aae0ea084e983ebb293898b17ce0658e9 /dovetail/conf/cmd_config.yml | |
parent | 4cc82a8477e7b842e83281c72127a73da73edf1d (diff) |
dovetail tool: improve cli to update non-envs automatically
1. modify cmd_config.yml
a. change 'env' and 'non-env' into 'config' and 'control'
b. add subsection 'path' for each block in 'config'
c. delete 'DEPLOY_SCENARIO' and 'DEPLOY_TYPE'
d. use 'func_tag' and 'yard_tag' to control container's tag
2. if cmd in config
a. if its path is envs, it will be used to update envs in dovetail_config
b. if its path is non_envs, it will be used to update other value in the dict
JIRA: DOVETAIL-70
Change-Id: I1cf9bfcd1a19294a390a85bce6e458ce50672b7f
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/conf/cmd_config.yml')
-rw-r--r-- | dovetail/conf/cmd_config.yml | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml index 35c000ef..e2159ca7 100644 --- a/dovetail/conf/cmd_config.yml +++ b/dovetail/conf/cmd_config.yml @@ -1,42 +1,58 @@ cli: arguments: - envs: + config: # This is a simple example of arguments. # Dovetail has no need of this kind of parameters currently. # The arguments must be given orderly at the run-time. # # docker_tag: # flags: 'docker_tag' - non-envs: + # path: + # - 'functest/docker_tag' + # - 'yardstick/docker_tag' + control: options: - envs: + config: SUT_TYPE: flags: - '--SUT_TYPE' - '-t' + path: + - 'functest/envs' + - 'yardstick/envs' help: 'Installer type of the system under test (SUT).' SUT_IP: flags: - '--SUT_IP' - '-i' + path: + - 'functest/envs' + - 'yardstick/envs' help: 'IP of the system under test (SUT).' - DEPLOY_SCENARIO: - flags: - - '--DEPLOY_SCENARIO' - - '-S' - help: 'DEPLOY_SCENARIO of the system under test (SUT).' - DEPLOY_TYPE: - flags: - - '--DEPLOY_TYPE' - - '-T' - help: 'DEPLOY_TYPE of the system under test (SUT).' CON_DEBUG: flags: - '--CON_DEBUG' - '-c' + path: + - 'functest/envs' + - 'yardstick/envs' help: 'True for showing debug log in functest/yardstick container.' - non-envs: + yard_tag: + flags: + - '--yard_tag' + - '-y' + path: + - 'yardstick/docker_tag' + help: 'Overwrite tag for yardstick docker container (e.g. stable or latest)' + func_tag: + flags: + - '--func_tag' + - '-f' + path: + - 'functest/docker_tag' + help: 'Overwrite tag for functest docker container (e.g. stable or latest)' + control: testsuite: flags: - '--testsuite' @@ -47,11 +63,6 @@ cli: - '--testarea' default: 'full' help: 'compliance testarea within testsuite' - tag: - flags: - - '--tag' - - '-o' - help: 'Overwrite tags for each docker container (e.g. "functest:stable,yardstick:latest")' debug: flags: - '--debug' |