- Split docker build and test.

Author: general-kroll-4-life

.github/actionlint.yaml

@@ -3,6 +3,7 @@ self-hosted-runner:
   labels:
     - ubuntu-latest-m
     - ubuntu-22-04-m
+    - ubuntu-22-04-arm64-m
     - arm-ubuntu-22-04-runner-one
     - macos-13 # should not be necessary
     - macos-14 # should not be necessary

.github/workflows/build.yml

@@ -1188,7 +1188,7 @@ jobs:
   ##
   dockerbuild:
     name: Docker Build
-    runs-on: ubuntu-22-04-m
+    runs-on: ${{  matrix.platform == 'linux/arm64' && 'ubuntu-22-04-arm64-m' || 'ubuntu-22-04-m' }}
     timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && 120 || vars.DEFAULT_JOB_TIMEOUT_MIN }}
     strategy:
       fail-fast: false
@@ -1376,7 +1376,7 @@ jobs:
       run: |
         mkdir -p ${{ runner.temp }}/digests
         digest="${{ steps.img_build.outputs.digest }}"
-        touch "${{ runner.temp }}/digests/${digest#sha256:}"          
+        touch "${{ runner.temp }}/digests/${digest#sha256:}"        
 
     - name: Upload digest
       if: env.BUILD_IMAGE_REQUIRED == 'true'
@@ -1386,11 +1386,73 @@ jobs:
         path: ${{ runner.temp }}/digests/*
         if-no-files-found: error
 
+  
+  dockertest:
+    name: Docker Test
+    needs:
+      - dockerbuild
+    runs-on: ${{  matrix.platform == 'linux/arm64' && 'ubuntu-22-04-arm64-m' || 'ubuntu-22-04-m' }}
+    timeout-minutes: ${{ vars.DEFAULT_JOB_TIMEOUT_MIN == '' && 120 || vars.DEFAULT_JOB_TIMEOUT_MIN }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+        db_backend:
+          - sqlite
+          - postgres_tcp
+    steps:
+    - name: Prepare
+      run: |
+        platform=${{ matrix.platform }}
+        echo "PLATFORM_PAIR=${platform//\//-}" >> "${GITHUB_ENV}"          
+
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          ${{ env.STACKQL_IMAGE_NAME }}
+
+    - name: Download digests
+      uses: actions/download-artifact@v4
+      if: env.PUSH_IMAGE_REQUIRED == 'true'
+      with:
+        path: ${{ runner.temp }}/digests
+        name: digests-${{ env.PLATFORM_PAIR }}
+
+    - name: Prepare
+      working-directory: ${{ runner.temp }}/digests
+      run: |
+        platform=${{ matrix.platform }}
+        THIS_STACKQL_DIGEST="$(printf '%s' *)"
+        if [ "${THIS_STACKQL_DIGEST}" = "" ]; then
+          echo "No digest found for platform ${platform}" >&2
+          exit 1
+        fi
+        digestContainsSpaces="$(echo "${THIS_STACKQL_DIGEST}" | grep ' ')"
+        if [ "${digestContainsSpaces}" != "" ]; then
+          echo "Digest '${THIS_STACKQL_DIGEST}' contains spaces, as found for platform ${platform}" >&2
+          exit 1
+        fi
+        {
+          echo "THIS_STACKQL_DIGEST=${THIS_STACKQL_DIGEST}"
+        } >> "${GITHUB_ENV}"
+           
+      
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      if: env.BUILD_IMAGE_REQUIRED == 'true'
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
     - name: Pull by digest
       if: env.BUILD_IMAGE_REQUIRED == 'true'
       run: |
-        docker pull --platform ${{ matrix.platform }} ${{ env.STACKQL_IMAGE_NAME }}@${{ steps.img_build.outputs.digest }}
-        docker tag ${{ env.STACKQL_IMAGE_NAME }}@${{ steps.img_build.outputs.digest }} ${{ env.STACKQL_IMAGE_NAME }}:latest
+        docker pull --platform ${{ matrix.platform }} ${{ env.STACKQL_IMAGE_NAME }}@sha256:${{ env.THIS_STACKQL_DIGEST }}
+        docker tag ${{ env.STACKQL_IMAGE_NAME }}@sha256:${{ env.THIS_STACKQL_DIGEST }} ${{ env.STACKQL_IMAGE_NAME }}:latest
 
     - name: Debug info
       if: env.BUILD_IMAGE_REQUIRED == 'true'
@@ -1429,13 +1491,13 @@ jobs:
         echo ""
 
     - name: Run robot mocked functional tests
-      if: success() && env.CI_IS_EXPRESS != 'true' && matrix.platform == 'linux/amd64' && env.BUILD_IMAGE_REQUIRED == 'true'
+      if: success() && env.CI_IS_EXPRESS != 'true' && matrix.platform == 'linux/amd64' && env.BUILD_IMAGE_REQUIRED == 'true' && matrix.db_backend == 'sqlite'
       timeout-minutes: ${{ vars.DEFAULT_STEP_TIMEOUT_MIN == '' && 20 || vars.DEFAULT_STEP_TIMEOUT_MIN }}
       run: |
         python cicd/python/build.py --robot-test --config='{ "variables":  { "EXECUTION_PLATFORM": "docker" } }'
 
     - name: Run POSTGRES BACKEND robot mocked functional tests
-      if: success() && env.CI_IS_EXPRESS != 'true' && matrix.platform == 'linux/amd64' && env.BUILD_IMAGE_REQUIRED == 'true'
+      if: success() && env.CI_IS_EXPRESS != 'true' && matrix.platform == 'linux/amd64' && env.BUILD_IMAGE_REQUIRED == 'true' && matrix.db_backend == 'postgres_tcp'
       timeout-minutes: ${{ vars.DEFAULT_LONG_STEP_TIMEOUT_MIN == '' && 40 || vars.DEFAULT_LONG_STEP_TIMEOUT_MIN }}
       run: |
         echo "## Stray flask apps to be killed before robot tests ##"
@@ -1455,7 +1517,7 @@ jobs:
         python cicd/python/build.py --robot-test --config='{ "variables":  { "EXECUTION_PLATFORM": "docker", "SHOULD_RUN_DOCKER_EXTERNAL_TESTS": true, "SQL_BACKEND": "postgres_tcp" } }'
 
     - name: Output from mocked functional tests
-      if: always() && env.CI_IS_EXPRESS != 'true' && matrix.platform == 'linux/amd64' && env.BUILD_IMAGE_REQUIRED == 'true'
+      if: always() && env.CI_IS_EXPRESS != 'true' && matrix.platform == 'linux/amd64' && env.BUILD_IMAGE_REQUIRED == 'true' 
       run: |
         cat ./test/robot/reports/output.xml
 
@@ -1476,6 +1538,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs:
       - dockerbuild
+      - dockertest
     steps:
 
       - name: Check out code into the Go module directory