From 189f27b7a90b6ddc74f1c3ede806e87d7548c539 Mon Sep 17 00:00:00 2001
From: Georg Kunz <georg.kunz@ericsson.com>
Date: Tue, 6 Mar 2018 16:19:59 +0100
Subject: Separate valid docker tags for functest and yardstick

Specifying separate valid docker tags for functest and yardstick for
input validation.

DOVETAIL-592

Change-Id: I3365cdbd9ab521bf1368750c3f34b6863b3f7ec8
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
---
 etc/conf/cmd_config.yml      | 6 +++---
 etc/conf/dovetail_config.yml | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'etc/conf')

diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml
index 91a44b0b..4dbfbbc8 100644
--- a/etc/conf/cmd_config.yml
+++ b/etc/conf/cmd_config.yml
@@ -17,21 +17,21 @@ cli:
     config:
       yard_tag:
         flags:
-          - '--yard_tag'
+          - '--yardstick_tag'
           - '-y'
         path:
           - 'yardstick/docker_tag'
         help: 'Overwrite tag for yardstick docker container (e.g. opnfv-5.1.0)'
       func_tag:
         flags:
-          - '--func_tag'
+          - '--functest_tag'
           - '-f'
         path:
           - 'functest/docker_tag'
         help: 'Overwrite tag for functest docker container (e.g. euphrates)'
       bott_tag:
         flags:
-          - '--bott_tag'
+          - '--bottlenecks_tag'
           - '-b'
         path:
           - 'bottlenecks/docker_tag'
diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index 47b46503..464d046c 100644
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -93,11 +93,12 @@ test_project:
   - 'bottlenecks'
 
 validate_input:
-  valid_docker_tag:
-    - 'stable'
+  valid_functest_tags:
     - 'latest'
-    - 'danube.3.2'
     - 'euphrates'
+  valid_yardstick_tags:
+    - 'latest'
+    - 'opnfv-5.1.0'
 
 mandatory:
   - osinterop
-- 
cgit 1.2.3-korg