Merge jobs test, build & run for x86 again

Author: olapiv

.github/workflows/build_test_push.yaml

@@ -76,14 +76,21 @@ jobs:
             echo "is_highest=false" >> $GITHUB_ENV
           fi
 
-  integration-test-x86:
+  build-test-push-x86:
     runs-on: ubuntu-latest
-    if: ${{ inputs.skip_test == 'false' }}
     needs: [check-git]
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Dockerhub
+        uses: docker/login-action@v2
+        if: github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
+        with:
+          username: hopsworks
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build and run Docker Compose cluster with benchmarking
+        if: ${{ inputs.skip_test == 'false' }}
         run: |
           ./run.sh -lv \
             --rondb-tarball-url $BASE_DOWNLOAD_URL/${{ inputs.rondb_x86_tarball_name }} \
@@ -93,6 +100,7 @@ jobs:
             --detached
 
       - name: Wait for one container exit or timeout
+        if: ${{ inputs.skip_test == 'false' }}
         run: |
           start=`date +%s`
           while true; do
@@ -111,17 +119,24 @@ jobs:
           done
 
       - run: docker container ls
+        if: ${{ inputs.skip_test == 'false' }}
       - run: docker logs mgmd_1
+        if: ${{ inputs.skip_test == 'false' }}
       - run: docker logs ndbd_1
+        if: ${{ inputs.skip_test == 'false' }}
       - run: docker logs mysqld_1
+        if: ${{ inputs.skip_test == 'false' }}
       - run: docker logs rest_1
+        if: ${{ inputs.skip_test == 'false' }}
       - run: docker logs bench_1
+        if: ${{ inputs.skip_test == 'false' }}
 
       # At this point we only know that one container has exited. We want to
       # check whether the bench container has exited with exit code 0. We need
       # both status and exit code to do so, since Docker reports exit code 0
       # for running containers.
       - name: Check Benchmarking Exit Code
+        if: ${{ inputs.skip_test == 'false' }}
         run: |
           if [ "$(docker inspect bench_1 --format='{{.State.Status}}')" != "exited" ]
           then
@@ -136,16 +151,11 @@ jobs:
           fi
 
       - name: Printing Sysbench results
+        if: ${{ inputs.skip_test == 'false' }}
         run: cat autogenerated_files/*/volumes/sysbench_single/final_result.txt
 
-  build-x86:
-    runs-on: ubuntu-latest
-    if: ${{ inputs.skip_test == 'true' }}
-    steps:
-      - uses: actions/checkout@v4
-
       - name: Build X86 image
-        if: github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
+        if: ${{ inputs.skip_test == 'true' }} && github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
         run: |
           VERSION="$(sed -e 's/^[[:space:]]*//' -e '/-SNAPSHOT$/s/.*/dev/' ./VERSION)"
           docker buildx build . \
@@ -154,36 +164,17 @@ jobs:
               --build-arg RONDB_TARBALL_LOCAL_REMOTE=remote \
               --build-arg RONDB_X86_TARBALL_URI=$BASE_DOWNLOAD_URL/${{ inputs.rondb_x86_tarball_name }}
 
-  # TODO: This doesn't have access to the images of the previous jobs
-  push-x86:
-    runs-on: ubuntu-latest
-    # It's always EITHER one or the other that will be run
-    # https://github.com/actions/runner/issues/491#issuecomment-850884422
-    needs: [check-git, integration-test-x86, build-x86]
-    if: |
-        always() &&
-        (needs.integration-test-x86.result == 'success' || needs.integration-test-x86.result == 'skipped') &&
-        (needs.build-x86.result == 'success' || needs.build-x86.result == 'skipped') &&
-        github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          username: hopsworks
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Push standard versioned image
+        if: github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
         run: |
           VERSION="$(sed -e 's/^[[:space:]]*//' -e '/-SNAPSHOT$/s/.*/dev/' ./VERSION)"
           IMAGE_NAME=hopsworks/$X86_IMAGE_NAME:${{ inputs.rondb_version }}-$VERSION
 
           docker tag rondb-standalone:${{ inputs.rondb_version }}-$VERSION $IMAGE_NAME
           docker push $IMAGE_NAME
 
-      # Our "latest" branch points to the latest *release* branch.
-      - name: Push with "latest" tag (omit rondb-docker version)
+      - name: Push with tag `<rondb-version>-latest`
+        # Our "latest" branch points to the latest *release* branch.
         if: needs.check-git.outputs.is_highest_release == 'true'
         run: |
           VERSION="$(sed -e 's/^[[:space:]]*//' -e '/-SNAPSHOT$/s/.*/dev/' ./VERSION)"
@@ -192,7 +183,7 @@ jobs:
           docker tag rondb-standalone:${{ inputs.rondb_version }}-$VERSION $IMAGE_NAME
           docker push $IMAGE_NAME
 
-      - name: Push with "latest" tag (also omit rondb version)
+      - name: Push with tag `latest`
         if: needs.check-git.outputs.is_highest_release == 'true' && ${{ inputs.is_latest_rondb_release == 'true' }}
         run: |
           VERSION="$(sed -e 's/^[[:space:]]*//' -e '/-SNAPSHOT$/s/.*/dev/' ./VERSION)"
@@ -201,7 +192,7 @@ jobs:
           docker tag rondb-standalone:${{ inputs.rondb_version }}-$VERSION $IMAGE_NAME
           docker push $IMAGE_NAME
 
-  build-and-push-ARM64:
+  build-push-arm64:
     runs-on: ubuntu-latest
     if: github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
     needs: [check-git]
@@ -247,7 +238,7 @@ jobs:
   make-multi-platform-image:
     runs-on: ubuntu-latest
     if: github.repository == 'logicalclocks/rondb-docker' && (startsWith(github.ref_name, 'release-') || github.ref_name == 'main')
-    needs: [check-git, push-x86, build-and-push-ARM64]
+    needs: [check-git, build-test-push-x86, build-push-arm64]
     steps:
       - uses: actions/checkout@v4