From 448c12179185860a613e1153b17e6d3be5b8b581 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sebastian@doubleopen.org>
Date: Wed, 17 Apr 2024 21:59:48 +0200
Subject: [PATCH] WIP

---
 .github/workflows/build-and-test.yml | 38 +++++-----------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c51f9e46744bd..39c7e2706f7f9 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -115,51 +115,27 @@ jobs:
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         flags: funTest-non-docker
-  funTest-docker-build:
+  funTest-docker:
     runs-on: ubuntu-22.04
-    outputs:
-      # Map a step output to a job output.
-      test_image_tag: ${{ steps.final.outputs.test_image_tag }}
     steps:
-    - name: Checkout Actions
+    - name: Checkout Repository
       uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - name: Free Disk Space
       uses: ./.github/actions/free-disk-space
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ${{ env.REGISTRY }}
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build ORT Docker Image
       uses: docker/build-push-action@v5
       with:
         context: .
-        push: true
-        tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/ort-test:run-${{ github.run_id }}
+        load: true
+        tags: ${{ env.TEST_IMAGE_TAG }}
         target: all-tools
         cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/ort:cache
-    - name: Set step output
-      id: final
-      run: echo "test_image_tag=${{ env.REGISTRY }}/${{ github.repository_owner }}/ort-test:run-${{ github.run_id }}" >> "$GITHUB_OUTPUT"
-  funTest-docker:
-    needs: funTest-docker-build
-    runs-on: ubuntu-22.04
-    container:
-      image: ${{ needs.funTest-docker-build.outputs.test_image_tag }}
-      options: --user 1001
-    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
     - name: Run functional tests that do require external tools
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        gradle-home-cache-cleanup: true
-        arguments: --scan -Ptests.include=org.ossreviewtoolkit.plugins.packagemanagers.* funTest jacocoFunTestReport
+      uses: docker://${{ env.TEST_IMAGE_TAG }}
     - name: Upload code coverage data
       uses: codecov/codecov-action@v4
       with: