Move dev server image build into main CI workflow

.github/workflows/build_test_push.yaml

@@ -54,6 +54,8 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
+        with:
+          driver: docker
 
       - name: Cache Docker layers
         uses: actions/cache@v2
@@ -64,12 +66,13 @@ jobs:
             ${{ runner.os }}-graphhopper-buildx
       # ---------------------
 
-        # Build image for unit tests
-      - name: Build test image
+      # Build base image for unit tests
+      - name: Build base image
         uses: docker/build-push-action@v2
         with:
           context: .
-          push: true
+          push: false
+          load: true
           file: Dockerfile.build
           tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-dev"
           build-args: |
@@ -80,6 +83,22 @@ jobs:
             MININORCAL_OSM_PATH=${{ secrets.MININORCAL_OSM_PATH}}
             MININORCAL_GTFS_PATH=${{ secrets.MININORCAL_GTFS_PATH}}
 
+      # Build the dev server image used in functional tests
+      - name: Build the server
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: false
+          load: true
+          file: Dockerfile.server
+          tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-server-dev"
+          build-args: |
+            BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-dev
+
+      - name: Push server-dev image
+        run: |
+          docker push us.gcr.io/model-159019/gh:${{ github.sha }}-server-dev
+
       - name: run unit tests
         run: |
           docker run -t -d --name testrunner us.gcr.io/model-159019/gh:${{ github.sha }}-dev /bin/bash

.github/workflows/functional-test.yaml

@@ -1,6 +1,6 @@
 name: Functional Test
 # This test does the following:
-# * Builds the "server" docker image that is used by the model repo
+# * Builds the sandbox docker image used for the router sandbox
 # * Runs functional tests queries against micro nor cal golden OD set
 # * Analyzes results of functional test queries, comparing against golden result set
 # * If tests pass, updates git and docker tags
@@ -23,7 +23,7 @@ jobs:
           GITHUB_CONTEXT: ${{ toJSON(github) }}
         run: echo "$GITHUB_CONTEXT"
   functional-test-queries:
-    name: "Build server image and run functional test queries"
+    name: "Build sandbox image and run functional test queries"
     if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     env:
@@ -85,25 +85,15 @@ jobs:
       - name: Set temp directory env variable
         run: echo "TMPDIR=$(mktemp -d)" >> $GITHUB_ENV
 
-      - name: build the server
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          file: Dockerfile.server
-          tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-server-dev"
-          build-args: |
-            BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-dev
-
-      - name: build the sandbox
+      - name: Build the sandbox
         uses: docker/build-push-action@v2
         with:
           context: .
           push: true
           file: Dockerfile.sandbox
           tags: "us.gcr.io/model-159019/gh:${{ github.sha }}-server-sandbox"
           build-args: |
-            BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-dev
+            BASE_IMAGE=us.gcr.io/model-159019/gh:${{ github.sha }}-server-dev
 
       - name: Install golang
         uses: actions/setup-go@v2