Also transfer segmented-journal directory

When using segmented-journal persistence plugin, we need to move
not 'journal' but 'segmented-journal'. Update the test suite to handle
both cases.

JIRA: CONTROLLER-1411
Change-Id: I1d05692280ae2f0437e1edb969bdf956fdd7edb3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/csit/suites/controller/akka_upgrade/1node.robot b/csit/suites/controller/akka_upgrade/1node.robot
index 2a3e56d5b3b0915056d5ae0feb4d28d41c3a85d3..537eaeb6f416293f705c2ad73904c07507c1a772 100644 (file)
--- a/csit/suites/controller/akka_upgrade/1node.robot
+++ b/csit/suites/controller/akka_upgrade/1node.robot
@@ -131,9 +131,9 @@ Kill_Older_Odl
     ClusterManagement.Kill_Members_From_List_Or_All
 
 Transfer_Persisted_Data
-    [Documentation]    Move snapshots and journal into the original ODL installation.
+    [Documentation]    Move snapshots and (segmented-)journal into the original ODL installation.
     # SSHLibrary.Switch_Connection    ${odl_system_ssh_index}
-    ${stdout} =    SSHKeywords.Execute_Command_Should_Pass    cp -rv "${alternative_bundlefolder}/snapshots" "${WORKSPACE}/${BUNDLEFOLDER}/" && cp -rv "${alternative_bundlefolder}/journal" "${WORKSPACE}/${BUNDLEFOLDER}/"
+    ${stdout} =    SSHKeywords.Execute_Command_Should_Pass    cp -rv "${alternative_bundlefolder}/snapshots" "${WORKSPACE}/${BUNDLEFOLDER}/" && cp -rv "${alternative_bundlefolder}/*journal" "${WORKSPACE}/${BUNDLEFOLDER}/"
     Set_Suite_Variable    ${stdout}
 
 Check_Snapshot_With_Transferred_Persisted_Data