From e12ba90cd27577c4c6c70ee54f7d599b5f6777ba Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Wed, 20 Sep 2017 15:57:10 -0700 Subject: [PATCH] Default BUNDLEFOLDER var to /opt/opendaylight this currently will have zero effect on upstream ODL CSIT, because we always pass this variable on the pybot command line. However, some other CSIT consumers (e.g. OPNFV) are seeing lots of warnings [0] because they are not *always* passing BUNDLEFOLDER in their robot argument list. This will remove that error for them, while giving us a decent default of /opt/opendaylight which is where the rpm package installs to. [0] https://git.opendaylight.org/gerrit/63293 Change-Id: Ie32d50cd8f42b05378949439b1b1976348032e59 Signed-off-by: Jamo Luhrsen --- csit/variables/Variables.robot | 1 + 1 file changed, 1 insertion(+) diff --git a/csit/variables/Variables.robot b/csit/variables/Variables.robot index a4026f5f36..ad8802c1be 100644 --- a/csit/variables/Variables.robot +++ b/csit/variables/Variables.robot @@ -38,6 +38,7 @@ ${ALERTMESSAGECOUNTRULERECORD} /restconf/config/alertrule:alertMessageCountRu ${AUTH_TOKEN_API} /oauth2/token # FIXME: Move to a separate AAA-related Resource and add description. ${BGP_TOOL_PORT} 17900 # Tool side of BGP communication listens on this port. ${BGPCEP_LOG_LEVEL} ${DEFAULT_BGPCEP_LOG_LEVEL} # Some suites temporarily override org.opendaylight.bgpcep Karaf log level to this value. +${BUNDLEFOLDER} /opt/opendaylight # default location to find opendaylight root folder. Upstream CSIT overrides this on the pybot command line ${CTRLS} controllers # A shorthand. FIXME: Find who uses this and eliminate, or at least add a good description. ${CTRLS_CREATE} controllers.json # A shorthand. FIXME: Find who uses this and eliminate, or at least add a good description. ${CONFIG_NODES_API} /restconf/config/opendaylight-inventory:nodes # FIXME: Move to a separate Resource and add description. -- 2.36.6