Move Karaf Home variable

Karaf_home variable is used in Variables.robot
without definition, which causes test execution error
in some test suites.

Moved it from Clustermanagement.robot library to
Variables.robot

Change-Id: I09e7be5046cb1971084d90dd77c8972cbde509e6
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>

diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot
index 265753b01af40cd6c1db06f30b02a21bb40d1400..719a1c1d7466eb154435cb7d7964cfa794363ace 100644 (file)
--- a/csit/libraries/ClusterManagement.robot
+++ b/csit/libraries/ClusterManagement.robot
@@ -45,7 +45,6 @@ ${JAVA_HOME}      ${EMPTY}    # releng/builder scripts should provide correct va
 ${JOLOKIA_CONF_SHARD_MANAGER_URI}    jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore
 ${JOLOKIA_OPER_SHARD_MANAGER_URI}    jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-operational,type=DistributedOperationalDatastore
 ${JOLOKIA_READ_URI}    jolokia/read/org.opendaylight.controller
-${KARAF_HOME}     ${WORKSPACE}${/}${BUNDLEFOLDER}    # TODO: Migrate to Variables.robot
 # Bug 9044 workaround: delete etc/host.key before restart.
 @{ODL_DEFAULT_DATA_PATHS}    tmp/    data/    cache/    snapshots/    journal/    etc/opendaylight/current/    etc/host.key
 ${RESTCONF_MODULES_DIR}    ${CURDIR}/../variables/restconf/modules

diff --git a/csit/variables/Variables.robot b/csit/variables/Variables.robot
index 25eb7007c55361c3aba6346a8eb46ef4c26efebb..ee384c1db3ac516df1e1b8bf0601f11728055d41 100644 (file)
--- a/csit/variables/Variables.robot
+++ b/csit/variables/Variables.robot
@@ -93,6 +93,7 @@ ${GET_INTENTS_URI}    /retconf/config/intent:intents    # FIXME: Move to a separ
 ${KARAF_PROMPT_LOGIN}    opendaylight-user    # This is used for karaf console login.
 ${ICMP_TYPE}      135
 ${KARAF_DETAILED_PROMPT}    @${ESCAPE_CHARACTER}[0m${ESCAPE_CHARACTER}[34mroot${ESCAPE_CHARACTER}[0m>    # Larger substring of Karaf prompt, shorter ones may result in false positives.
+${KARAF_HOME}     ${WORKSPACE}${/}${BUNDLEFOLDER}    # Karaf home directory path.
 ${KARAF_PASSWORD}    karaf    # Plaintext password to authenticate to Karaf console.
 ${KARAF_PROMPT}    opendaylight-user.*root.*>    # This is used for interactive read until prompt in regexp format.
 ${KARAF_SHELL_PORT}    8101    # ODL provides SSH access to Karaf consoleon this port.