From da197d8c74177614b55e0eefc4290772c6f1af58 Mon Sep 17 00:00:00 2001 From: reubenmiller Date: Fri, 29 Nov 2024 17:29:09 +0100 Subject: [PATCH] tests: use full image names in version field --- tests/main/self-update-compat.robot | 8 ++++---- tests/main/self-update.robot | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/main/self-update-compat.robot b/tests/main/self-update-compat.robot index a8637c0..b18baae 100644 --- a/tests/main/self-update-compat.robot +++ b/tests/main/self-update-compat.robot @@ -10,12 +10,12 @@ Test Tags self-update *** Test Cases *** Update From Legacy Versions [Template] Upgrade From Base Image - ghcr.io/thin-edge/tedge-container-bundle:20241126.1855 tedge-container-bundle:20241126.1855 + ghcr.io/thin-edge/tedge-container-bundle:20241126.1855 *** Keywords *** Upgrade From Base Image - [Arguments] ${IMAGE} ${SOFTWARE_VERSION} + [Arguments] ${IMAGE} # pre-condition Setup Device image=${IMAGE} @@ -26,11 +26,11 @@ Upgrade From Base Image Skip If '${major_version}' == '4' Legacy images didn't support podman 4.x Device Should Have Installed Software - ... {"name": "tedge", "version": "${SOFTWARE_VERSION}", "softwareType": "self"} timeout=10 + ... {"name": "tedge", "version": "${IMAGE}", "softwareType": "self"} timeout=10 ${operation}= Cumulocity.Install Software ... {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.1", "softwareType": "self"} Cumulocity.Operation Should Be SUCCESSFUL ${operation} timeout=120 Device Should Have Installed Software - ... {"name": "tedge", "version": "tedge-container-bundle:99.99.1", "softwareType": "self"} + ... {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.1", "softwareType": "self"} diff --git a/tests/main/self-update.robot b/tests/main/self-update.robot index 84c3aa5..6b861a0 100644 --- a/tests/main/self-update.robot +++ b/tests/main/self-update.robot @@ -35,23 +35,23 @@ Self update should only update if there is a new image Self update using software update operation # pre-condition Device Should Have Installed Software - ... {"name": "tedge", "version": "tedge-container-bundle:99.99.1", "softwareType": "self"} timeout=10 + ... {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.1", "softwareType": "self"} timeout=10 ${operation}= Cumulocity.Install Software ... {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.2", "softwareType": "self"} Cumulocity.Operation Should Be SUCCESSFUL ${operation} timeout=120 Device Should Have Installed Software - ... {"name": "tedge", "version": "tedge-container-bundle:99.99.2", "softwareType": "self"} + ... {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.2", "softwareType": "self"} Rollback when trying to install a non-tedge based image # pre-condition Device Should Have Installed Software - ... {"name": "tedge", "version": "tedge-container-bundle:99.99.1", "softwareType": "self"} timeout=10 + ... {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.1", "softwareType": "self"} timeout=10 ${operation}= Cumulocity.Install Software ... {"name": "tedge", "version": "docker.io/library/alpine:latest", "softwareType": "self"} Cumulocity.Operation Should Be FAILED ${operation} timeout=120 Device Should Have Installed Software - ... {"name": "tedge", "version": "tedge-container-bundle:99.99.1", "softwareType": "self"} + ... {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.1", "softwareType": "self"}