Remove reference to version in installation scripts (#2553)

* Remove reference to version in installation scripts Signed-off-by: James Rhodes <[email protected]> * Update tests to check for possible rc versions Signed-off-by: James Rhodes <[email protected]> * Fix escaping in regex * Fix other regex --------- Signed-off-by: James Rhodes <[email protected]>
thin-edge · Dec 21, 2023 · 580e4e5 · 580e4e5 · github-actions · Dec 21, 2023
1 parent a7f8439
commit 580e4e5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/ci/installation_scripts/install_for_amd64.sh b/ci/installation_scripts/install_for_amd64.sh
@@ -14,5 +14,5 @@ sudo apt-get --assume-yes install "${EXTERNAL_AMD64_PACKAGES[@]}"
 # Install thin-edge packages
 for PACKAGE in "${RELEASE_PACKAGES[@]}"
 do
-    sudo dpkg -i ./"$PKG_DIR"/"$PACKAGE"_0.*_amd64.deb
+    sudo dpkg -i ./"$PKG_DIR"/"$PACKAGE"_*_amd64.deb
 done
diff --git a/ci/installation_scripts/install_for_arm.sh b/ci/installation_scripts/install_for_arm.sh
@@ -14,7 +14,7 @@ sudo apt-get --assume-yes install "${EXTERNAL_ARM_PACKAGES[@]}"
 # Install thin-edge packages
 for PACKAGE in "${RELEASE_PACKAGES[@]}"
 do
-    sudo dpkg -i ./"$PKG_DIR"/"$PACKAGE"_0.*_armhf.deb
+    sudo dpkg -i ./"$PKG_DIR"/"$PACKAGE"_*_armhf.deb
 done
 
 # Configure collectd

diff --git a/tests/RobotFramework/tasks/build_install_rpi.robot b/tests/RobotFramework/tasks/build_install_rpi.robot
@@ -13,7 +13,7 @@ ${HOST}
 ${USERNAME}       pi
 ${PASSWORD}       crypt:LO3wCxZPltyviM8gEyBkRylToqtWm+hvq9mMVEPxtn0BXB65v/5wxUu7EqicpOgGhgNZVgFjY0o=    
 ${DeviceID}       
-${Version}        0.*
+${Version}        *.*
 ${download_dir}    /home/pi/
 ${url_dow}    https://github.com/thin-edge/thin-edge.io/actions
 ${user_git}    crypt:3Uk76kNdyyYOXxus2GFoLf8eRlt/W77eEkcSiswwh04HNfwt0NlJwI7ATKPABmxKk8K1a8NsI5QH0w8EmT8GWeqrFwX2    

diff --git a/tests/RobotFramework/tests/installation/install_tedge.robot b/tests/RobotFramework/tests/installation/install_tedge.robot
@@ -9,7 +9,7 @@ Test Teardown    Get Logs
 *** Test Cases ***
 Install latest via script (from current branch)
     Execute Command    curl -fsSL https://thin-edge.io/install.sh | sh -s
-    Tedge Version Should Match Regex    ^\\d+\\.\\d+\\.\\d+$
+    Tedge Version Should Match Regex    ^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$
 
     # Uninstall
     Uninstall tedge using local Script
@@ -30,7 +30,7 @@ Install specific version via script (from current branch)
 
 Install latest tedge via script
     Execute Command    curl -fsSL https://thin-edge.io/install.sh | sh -s
-    Tedge Version Should Match Regex    ^\\d+\\.\\d+\\.\\d+$
+    Tedge Version Should Match Regex    ^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$
 
 Install then uninstall latest tedge via script (from main branch)
     # Install (just install everything, don't set anything up)

diff --git a/tests/RobotFramework/tests/plugin_apt/filter_packages_list_output.robot b/tests/RobotFramework/tests/plugin_apt/filter_packages_list_output.robot
@@ -55,6 +55,6 @@ Both filters as empty string
 *** Keywords ***
 Custom Setup
     Setup
-    ${RAW_VERSION}=    Execute Command    tedge --version | cut -d' ' -f 2    strip=${True}
+    ${RAW_VERSION}=    Execute Command    tedge --version | cut -d' ' -f 2 | sed 's/-rc\./~rc./'   strip=${True}
     ${VERSION}=    Regexp Escape    ${RAW_VERSION}
     Set Suite Variable    ${VERSION}
diff --git a/tests/RobotFramework/tests/tedge/call_tedge.robot b/tests/RobotFramework/tests/tedge/call_tedge.robot
@@ -19,7 +19,7 @@ ${version}
 Install thin-edge.io
     ${output}=    Execute Command    curl -fsSL https://thin-edge.io/install.sh | sh -s    #running the script for installing latest version of tedge
     # Use apt-cache policy to get the installed version as the script lets apt handle this
-    ${version}=    Execute Command    apt-cache policy tedge | grep "Installed:" | cut -d":" -f2 | xargs
+    ${version}=    Execute Command    apt-cache policy tedge | grep "Installed:" | cut -d":" -f2 | sed 's/~rc\./-rc./' | xargs
     Set Suite Variable    ${version}
 
 call tedge -V