Use wildcard *journal

In Aluminium the journal/ folder is now named segmented-journal/
Using a wildcard in the tests should let it work for all branches

this was partially done already with:
https://git.opendaylight.org/gerrit/c/integration/test/+/88658

Signed-off-by: Jamo Luhrsen <jamoluhrsen@ip-192-168-86-41.us-west-1.compute.internal>
Change-Id: I4cf26da11e388c986ab5343ca1ad93d0beb352f7

diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot
index 1c84caa9ad0c805485d45588d860aba59737d9f4..ecf281066830ff41af8b79c0ac8e40e50d9ba99f 100644 (file)
--- a/csit/libraries/ClusterManagement.robot
+++ b/csit/libraries/ClusterManagement.robot
@@ -48,7 +48,7 @@ ${JOLOKIA_CONFIG_LOCAL_SHARDS_URI}    jolokia/read/org.opendaylight.controller:t
 ${JOLOKIA_OPER_LOCAL_SHARDS_URI}    jolokia/read/org.opendaylight.controller:type=DistributedOperationalDatastore,Category=ShardManager,name=shard-manager-operational/LocalShards
 ${JOLOKIA_READ_URI}    jolokia/read/org.opendaylight.controller
 # Bug 9044 workaround: delete etc/host.key before restart.
-@{ODL_DEFAULT_DATA_PATHS}    tmp/    data/    cache/    snapshots/    journal/    etc/opendaylight/current/    etc/host.key
+@{ODL_DEFAULT_DATA_PATHS}    tmp/    data/    cache/    snapshots/    journal/    segmented-journal/    etc/opendaylight/current/    etc/host.key
 ${RESTCONF_MODULES_DIR}    ${CURDIR}/../variables/restconf/modules
 ${SINGLETON_NETCONF_DEVICE_ID_PREFIX_OLD}    /odl-general-entity:entity[odl-general-entity:name='KeyedInstanceIdentifier{targetType=interface org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node, path=[org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology, org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology[key=TopologyKey [_topologyId=Uri [_value=topology-netconf]]], org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node[key=NodeKey [_nodeId=Uri [_value=
 ${SINGLETON_NETCONF_DEVICE_ID_SUFFIX_OLD}    ]]]]}']
@@ -536,7 +536,7 @@ Clean_Journals_Data_And_Snapshots_On_List_Or_All
     ...    BEWARE: If only a subset of members is cleaned, this causes RetiredGenerationException in Carbon after the affected node re-start.
     ...    See https://bugs.opendaylight.org/show_bug.cgi?id=8138
     ${index_list} =    List_Indices_Or_All    given_list=${member_index_list}
-    ${command} =    Set Variable    rm -rf "${karaf_home}/journal" "${karaf_home}/snapshots" "${karaf_home}/data"
+    ${command} =    Set Variable    rm -rf "${karaf_home}/"*journal "${karaf_home}/snapshots" "${karaf_home}/data"
     FOR    ${index}    IN    @{index_list}    # usually: 1, 2, 3.
         Run_Bash_Command_On_Member    command=${command}    member_index=${index}
     END

diff --git a/csit/libraries/UtilLibrary.py b/csit/libraries/UtilLibrary.py
index 5e0ec10941d4db0bd22752a06118013d896fed3c..c342386f0aa85407410cc7d12333d15156928a58 100644 (file)
--- a/csit/libraries/UtilLibrary.py
+++ b/csit/libraries/UtilLibrary.py
@@ -207,7 +207,7 @@ def wait_for_controller_stopped(ip, username, password, karafHome):
 
 
 def clean_journal(ip, username, password, karafHome):
-    execute_ssh_command(ip, username, password, "rm -rf " + karafHome + "/journal")
+    execute_ssh_command(ip, username, password, "rm -rf " + karafHome + "/*journal")
 
 
 def kill_controller(ip, username, password, karafHome):

diff --git a/tools/clustering/cluster-deployer/restart.py b/tools/clustering/cluster-deployer/restart.py
index 48bfa903e693fb8c9f59e9f7d39944ecab37c528..044e03ee8b410744e8ef39288468d80c94086e49 100755 (executable)
--- a/tools/clustering/cluster-deployer/restart.py
+++ b/tools/clustering/cluster-deployer/restart.py
@@ -30,7 +30,7 @@ def main():
         remote = RemoteHost(hosts[x], args.user, args.password, args.rootdir)
         remote.kill_controller()
         if(args.clean):
-            remote.exec_cmd("rm -rf " + args.rootdir + "/deploy/current/odl/journal")
+            remote.exec_cmd("rm -rf " + args.rootdir + "/deploy/current/odl/*journal")
             remote.exec_cmd("rm -rf " + args.rootdir + "/deploy/current/odl/snapshots")
         remote.start_controller(args.rootdir + "/deploy/current")