Merge pull request #70 from thin-edge/tests-main-release

ci: test on tedge-main image

Author: reubenmiller

.github/workflows/publish.yaml

@@ -37,3 +37,10 @@ jobs:
 
       - name: Publish images
         run: just publish registry ${{ inputs.VERSION || github.ref_name }}
+
+      - name: Publish image (tedge-main branch)
+        env:
+          IMAGE: tedge-container-bundle-main
+          TEDGE_IMAGE: tedge-main
+          TEDGE_TAG: latest
+        run: just publish registry ${{ inputs.VERSION || github.ref_name }}

.github/workflows/test.yaml

@@ -23,7 +23,7 @@ jobs:
         run: echo "Approved"
 
   test:
-    name: Test ${{ matrix.job.name }}
+    name: Test ${{ matrix.job.name }} (${{ matrix.build.image }}@${{ matrix.build.tag }})
     runs-on: ubuntu-latest
     needs: approve
     environment:
@@ -34,6 +34,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        build:
+          - { image: tedge, tag: latest }
+          - { image: tedge-main, tag: latest }
         job:
           # docker
           - { target: tedge-container-bundle, name: "docker v27", image: "docker:27-dind" }
@@ -78,6 +81,9 @@ jobs:
             tests/requirements.txt
 
       - name: Install dependencies
+        env:
+          TEDGE_IMAGE: ${{ matrix.build.image }}
+          TEDGE_TAG: ${{ matrix.build.tag }}
         run: |
           just venv
           just build-test
@@ -89,7 +95,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: reports-${{ matrix.job.name }}
+          name: reports-${{ matrix.job.name }}-${{ matrix.build.image }}@${{ matrix.build.tag }}
           path: output
 
       - name: Send report to commit

justfile

@@ -1,9 +1,9 @@
 set dotenv-load
 set export
 
-IMAGE := "tedge-container-bundle"
-TEDGE_IMAGE := "tedge"
-TEDGE_TAG := "1.4.2"
+IMAGE := env_var_or_default("IMAGE", "tedge-container-bundle")
+TEDGE_IMAGE := env_var_or_default("TEDGE_IMAGE", "tedge")
+TEDGE_TAG := env_var_or_default("TEDGE_TAG", "1.4.2")
 
 REGISTRY := "ghcr.io"
 REPO_OWNER := "thin-edge"
@@ -81,7 +81,9 @@ lint *ARGS:
 # Build test images
 build-test: build-test-bundles
     echo "Creating test infrastructure image"
-    [ -d "./test-images/{{TEST_IMAGE}}" ] && docker build --load -t {{TEST_IMAGE}} -f ./test-images/{{TEST_IMAGE}}/Dockerfile . || docker pull "{{TEST_IMAGE}}"
+    [ -d "./test-images/{{TEST_IMAGE}}" ] && docker build \
+        --load -t {{TEST_IMAGE}} \
+        -f ./test-images/{{TEST_IMAGE}}/Dockerfile . || docker pull "{{TEST_IMAGE}}"
 
 build-test-bundles:
     echo "Building tedge-container-bundle images"

tests/main/self-update-compat.robot

@@ -4,7 +4,8 @@ Library             DateTime
 
 Test Teardown       Stop Device
 
-Test Tags           self-update
+# Retry due to a problem with the older tedge-container-bundle images
+Test Tags           self-update    test:retry(3)
 
 
 *** Test Cases ***