further fixes in workflow

Author: Obada Haddad

.github/workflows/build_cw_image-branch.yml

@@ -10,24 +10,18 @@ on:
       - Dockerfile.compute_worker
       - compute_worker/**
 jobs:
-  build:
-    name: Build Docker Images
+  build_push_image:
+    name: Build Docker Image then Push it to Docker.io
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
         uses: actions/checkout@v5
       - name: Build Image
         run: docker build -t codalab/competitions-v2-compute-worker:${{ github.ref_name }} -f Dockerfile.compute_worker .
-
-  push:
-    name: Push image to Dockerhub
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-        - name: Login to Docker Hub
-          uses: docker/login-action@v3
-          with:
-            username: ${{ vars.DOCKERHUB_USERNAME }}
-            password: ${{ secrets.DOCKERHUB_TOKEN }}
-        - name: Push image with branch name as tag
-          run: docker push codalab/competitions-v2-compute-worker:${{ github.ref_name }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Push image with branch name as tag
+        run: docker push codalab/competitions-v2-compute-worker:${{ github.ref_name }}

.github/workflows/build_cw_image-dev.yml

@@ -15,16 +15,10 @@ jobs:
         uses: actions/checkout@v5
       - name: Build Image
         run: docker build -t codalab/competitions-v2-compute-worker:test -f Dockerfile.compute_worker .
-
-  push:
-    name: Push image to Dockerhub
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-        - name: Login to Docker Hub
-          uses: docker/login-action@v3
-          with:
-            username: ${{ vars.DOCKERHUB_USERNAME }}
-            password: ${{ secrets.DOCKERHUB_TOKEN }}
-        - name: Push image with test tag
-          run: docker push codalab/competitions-v2-compute-worker:test
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Push image with test tag
+        run: docker push codalab/competitions-v2-compute-worker:test

.github/workflows/build_cw_image-prod.yml

@@ -15,21 +15,14 @@ jobs:
         uses: actions/checkout@v5
       - name: Build Image
         run: docker build -t codalab/competitions-v2-compute-worker:${{ github.ref_name }} -f Dockerfile.compute_worker .
-
-  push:
-    name: Push image to Dockerhub
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-        - name: Login to Docker Hub
-          uses: docker/login-action@v3
-          with:
-            username: ${{ vars.DOCKERHUB_USERNAME }}
-            password: ${{ secrets.DOCKERHUB_TOKEN }}
-        - name: Push image with prod release tag
-          run: docker push codalab/competitions-v2-compute-worker:${{ github.ref_name }}
-        - name: Change tag to latest
-          run: |
-            docker tag codalab/competitions-v2-compute-worker:${{ github.ref_name }} codalab/competitions-v2-compute-worker:latest
-            docker push codalab/competitions-v2-compute-worker:latest
-        
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Push image with prod release tag
+        run: docker push codalab/competitions-v2-compute-worker:${{ github.ref_name }}
+      - name: Change tag to latest
+        run: |
+          docker tag codalab/competitions-v2-compute-worker:${{ github.ref_name }} codalab/competitions-v2-compute-worker:latest
+          docker push codalab/competitions-v2-compute-worker:latest

compute_worker/compute_worker.py

@@ -436,6 +436,7 @@ async def send_detailed_results(self, file_path):
         )
         websocket_url = f"{self.websocket_url}?kind=detailed_results"
         logger.info(f"Connecting to {websocket_url} for detailed results")
+        # Wrap this with a Try ... Except otherwise a failure here will make the submission get stuck on Running 
         try:
             websocket = await asyncio.wait_for(
                 websockets.connect(websocket_url), timeout=5.0