Merge pull request #2406 from reubenmiller/update-install-tests

tests: update tests after latest 0.13.0 release

crates/common/download/examples/simple_download.rs

@@ -7,7 +7,7 @@ use download::Downloader;
 async fn main() -> Result<()> {
     // Create Download metadata.
     let url_data = DownloadInfo::new(
-        "https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/get-thin-edge_io.sh",
+        "https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/README.md",
     );
 
     // Create downloader instance with desired file path and target directory.

crates/common/download/src/lib.rs

@@ -26,7 +26,7 @@
 //! async fn main() -> Result<()> {
 //!     // Create Download metadata.
 //!     let url_data = DownloadInfo::new(
-//!         "https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/get-thin-edge_io.sh",
+//!         "https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/README.md",
 //!     );
 //!
 //!     // Create downloader instance with desired file path and target directory.

tests/RobotFramework/README.md

@@ -226,7 +226,7 @@ If you are looking to use packages that you locally built, then just use `invoke
 
 **What is happening?**
 
-When building the docker image it will automatically add all the files/folders under the `tests/images/deb` path to the built image. These files are then used by the test bootstrapping script (`bootstrap.sh`) which is also part of the docker image. The bootstrapping process is smart enough to detect if there are debian packages there, and if will install the tedge related packages. If no packages are found then it will revert to installing the latest official tedge version via the `get-thin-edge_io.sh` script.
+When building the docker image it will automatically add all the files/folders under the `tests/images/deb` path to the built image. These files are then used by the test bootstrapping script (`bootstrap.sh`) which is also part of the docker image. The bootstrapping process is smart enough to detect if there are debian packages there, and if will install the tedge related packages. If no packages are found then it will revert to installing the latest official tedge version via the `https://thin-edge.io/install.sh` script.
 
 ## Viewing the test reports and logs
 

tests/RobotFramework/tasks/E2E_Tutorials/Connect_to_c8y.robot

@@ -95,4 +95,4 @@ Clear previous downloaded files if any
     Execute Command    rm -f *.deb; rm -f uninstall-thin-edge_io.sh
 
 Install thin-edge.io
-    Execute Command    curl -fsSL https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/get-thin-edge_io.sh | sudo sh -s
+    Execute Command    curl -fsSL https://thin-edge.io/install.sh | sh -s

tests/RobotFramework/tests/installation/install_tedge.robot

@@ -8,8 +8,7 @@ Test Teardown    Get Logs
 
 *** Test Cases ***
 Install latest via script (from current branch)
-    Transfer To Device    ${CURDIR}/../../../../get-thin-edge_io.sh    /setup/
-    Execute Command    chmod a+x /setup/get-thin-edge_io.sh && sudo /setup/get-thin-edge_io.sh
+    Execute Command    curl -fsSL https://thin-edge.io/install.sh | sh -s
     Tedge Version Should Match Regex    ^\\d+\\.\\d+\\.\\d+$
 
     # Uninstall
@@ -19,6 +18,7 @@ Install latest via script (from current branch)
 Install specific version via script (from current branch)
     [Documentation]    Remove the tedge.toml file as the apt filter is not supported in older tedge versions
     ...                and unknown configuration causes problems
+    # TODO: Remove reliance on the legacy get-thin-edge_io.sh script, however thin-edge.io/install.sh does not currently support installing a specific version
     Transfer To Device    ${CURDIR}/../../../../get-thin-edge_io.sh    /setup/
     Execute Command    [ -f /etc/tedge/tedge.toml ] && sed -i '/\\[apt\\]/,/\\n/d' /etc/tedge/tedge.toml
     Execute Command    chmod a+x /setup/get-thin-edge_io.sh && sudo /setup/get-thin-edge_io.sh 0.8.1
@@ -28,8 +28,8 @@ Install specific version via script (from current branch)
     Uninstall tedge using local Script
     Tedge Should Not Be Installed    tedge-log-plugin
 
-Install latest tedge via script (from main branch)
-    Execute Command    curl -fsSL https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/get-thin-edge_io.sh | sudo sh -s
+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+$
 
 Install then uninstall latest tedge via script (from main branch)

tests/RobotFramework/tests/tedge/call_tedge.robot

@@ -1,10 +1,8 @@
 *** Settings ***
 Documentation    Purpose of this test is to verify that the proper version number
 ...              will be shown by using the tedge -V command.
-...              By executing the tedge -h command that USAGE, OPTIONS and SUBCOMMANDS
+...              By executing the tedge -h command that Usage, Options and Commands
 ...              will be shown
-...              By executing the tedge -h -V command combination of both previous
-...              commands will be shown
 
 Resource    ../../resources/common.resource
 Library    ThinEdgeIO
@@ -19,9 +17,9 @@ ${version}
 
 *** Test Cases ***
 Install thin-edge.io
-    ${output}=    Execute Command    curl -fsSL https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/get-thin-edge_io.sh | sudo sh -s    #running the script for installing latest version of tedge
-    ${line}    Get Line    ${output}    0    # Get the version which is installed out of the log
-    ${version}    Fetch From Right    ${line}    :     # Cutting log output in order only to keep version number
+    ${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
     Set Suite Variable    ${version}
 
 call tedge -V
@@ -30,22 +28,15 @@ call tedge -V
 
 call tedge -h
     ${output}=    Execute Command    tedge -h
-    Should Contain    ${output}    USAGE:
-    Should Contain    ${output}    OPTIONS:
-    Should Contain    ${output}    SUBCOMMANDS:
-
-call tedge -h -V
-    ${output}=    Execute Command    tedge -h -V   # Execute command to call help and check the version at same time
-    Should Contain    ${output}    ${version}    # Check that the output of tedge -V returns the version which was installed
-    Should Contain    ${output}    USAGE:
-    Should Contain    ${output}    OPTIONS:
-    Should Contain    ${output}    SUBCOMMANDS:
+    Should Contain    ${output}    Usage:
+    Should Contain    ${output}    Options:
+    Should Contain    ${output}    Commands:
 
 call tedge help
     ${output}=    Execute Command    tedge help
-    Should Contain    ${output}    USAGE:
-    Should Contain    ${output}    OPTIONS:
-    Should Contain    ${output}    SUBCOMMANDS:
+    Should Contain    ${output}    Usage:
+    Should Contain    ${output}    Options:
+    Should Contain    ${output}    Commands:
 
 *** Keywords ***
 

tests/images/debian-systemd/files/bootstrap.sh

@@ -43,7 +43,7 @@ FLAGS
 INSTALL METHODS
     local - Install the thin-edge.io .deb packages found locally on the disk under '--install-sourcedir <path>'
     apt - Install using public APT repository
-    script - Install using the get-thin-edge_io.sh script from GitHub
+    script - Install using the https://thin-edge.io/install.sh script
 
 EXAMPLES
     sudo -E $0
@@ -516,7 +516,7 @@ install_via_script() {
         curl -fsSL https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/get-thin-edge_io.sh | sudo sh -s "$VERSION"
     else
         echo "Installing latest official version"
-        curl -fsSL https://raw.githubusercontent.com/thin-edge/thin-edge.io/main/get-thin-edge_io.sh | sudo sh -s
+        curl -fsSL https://thin-edge.io/install.sh | sh -s
     fi
 }
 
@@ -538,7 +538,7 @@ install_via_local_files() {
 
     ARCH=$(get_debian_arch)
 
-    # Install tedge packages in same order as the get-thin-edge_io.sh script
+    # Install tedge packages
     find_then_install_deb "$INSTALL_SOURCEDIR" "tedge_[0-9]*_$ARCH.deb"
     find_then_install_deb "$INSTALL_SOURCEDIR" "tedge[_-]mapper_*_$ARCH.deb"
     find_then_install_deb "$INSTALL_SOURCEDIR" "tedge[_-]agent_*_$ARCH.deb"
@@ -652,7 +652,7 @@ install_tedge() {
             ;;
 
         *)
-            echo "Installing thin-edge.io using the 'get-thin-edge_io.sh' script"
+            echo "Installing thin-edge.io using the install script"
             # Remove system.toml as the latest official release does not support custom reboot command
             rm -f /etc/tedge/system.toml
             install_via_script