From 6d09a0f714e6de97f2ed2b3571f7ef5a1e80e073 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sat, 14 Oct 2023 01:20:24 +0200 Subject: [PATCH] changes --- .github/workflows/docker_bullseye_altuser.yml | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker_bullseye_altuser.yml b/.github/workflows/docker_bullseye_altuser.yml index 965ef7b7b..e3569a4f0 100644 --- a/.github/workflows/docker_bullseye_altuser.yml +++ b/.github/workflows/docker_bullseye_altuser.yml @@ -11,6 +11,9 @@ on: # The branches below must be a subset of the branches above branches: [ develop ] +env: + DOCKER_IMAGE_NAME: rpi-jukebox-rfid-bullseye-altuser + jobs: prepare: @@ -35,10 +38,10 @@ jobs: push: false file: ./ci/Dockerfile.bullseye.test_install.armv7 platforms: linux/arm/v7 - tags: rpi-jukebox-rfid-bullseye-altuser:latest + tags: ${{ DOCKER_IMAGE_NAME }}:latest cache-from: type=gha,scope=${{ github.ref_name }}-bullseye-altuser cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-bullseye-altuser - outputs: type=docker,dest=/tmp/rpi-jukebox-rfid-bullseye-altuser_latest.tar + outputs: type=docker,dest=/tmp/${{ DOCKER_IMAGE_NAME }}_latest.tar build-args: | USER_NAME=hans USER_GROUP=wurst @@ -48,8 +51,8 @@ jobs: - name: Upload Docker Build Image uses: actions/upload-artifact@v3 with: - name: rpi-jukebox-rfid-bullseye-altuser_latest.tar - path: /tmp/rpi-jukebox-rfid-bullseye-altuser_latest.tar + name: ${{ DOCKER_IMAGE_NAME }}_latest.tar + path: /tmp/${{ DOCKER_IMAGE_NAME }}_latest.tar test: @@ -60,25 +63,25 @@ jobs: strategy: fail-fast: false matrix: - test_Script: [./run_installation_tests.sh, ./run_installation_tests2.sh, ./run_installation_tests3.sh] + test_Script: [run_installation_tests.sh, run_installation_tests2.sh, run_installation_tests3.sh] steps: - name: Download Docker Build Image - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: - name: rpi-jukebox-rfid-bullseye-altuser_latest.tar + name: ${{ DOCKER_IMAGE_NAME }}_latest.tar path: /tmp/ - name: Load Docker Build Image run: | - docker load --input /tmp/rpi-jukebox-rfid-bullseye-altuser_latest.tar + docker load --input /tmp/${{ DOCKER_IMAGE_NAME }}_latest.tar - name: Run ${{ matrix.test_Script }} Bullseye ARMv7 uses: tj-actions/docker-run@v2 with: - image: rpi-jukebox-rfid-bullseye-altuser:latest + image: ${{ DOCKER_IMAGE_NAME }}:latest options: --platform linux/arm/v7 name: ${{ matrix.test_Script }} args: | - ${{ matrix.test_Script }} + "./${{ matrix.test_Script }}"