More CI fixes

.github/workflows/docker.yaml

@@ -4,6 +4,7 @@ on:
     branches: "main"
   pull_request:
   workflow_dispatch: # allows you to trigger manually
+  merge_group: # GitHub Merge Queue
 # concurrency:
 #   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
 #   cancel-in-progress: true
@@ -22,25 +23,19 @@ jobs:
       matrix:
         clustermanager:
           - htcondor
-          # - pbs
-          # - sge
-          # - slurm
+          - pbs
+          - sge
+          - slurm
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       - name: docker version
         run: |
           which -a docker
           docker version
           docker compose version
       - name: docker compose build
-        # shell: bash -l {0}
         run: |
           cd "./ci/${MATRIX_CLUSTERMANAGER:?}"
           cp ../environment.yml environment.yml
@@ -51,26 +46,28 @@ jobs:
         run: |
           docker ps -a
           docker images
-      # TODO: Docker login here
-      # echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-      # - name: docker push to GitHub Container Registry
-      #   if: github.event_name != 'pull_request' && matrix.clustermanager != 'htcondor'
-      #   run: |
-      #     docker push "daskdev/dask-clustermanager:${MATRIX_CLUSTERMANAGER:?}"
-      #     docker push ghcr.io/<your-GitHub-username>/store:latest
-      #     docker build . --tag ghcr.io/<your-GitHub-username>/store:latest
-      #   env:
-      #     MATRIX_CLUSTERMANAGER: ${{ matrix.clustermanager }}
-      # - name: Publish secondary SGE images to GitHub Container Registry
-      #   if: github.event_name != 'pull_request' && matrix.clustermanager == 'sge'
-      #   run: |
-      #     docker push daskdev/dask-clustermanager:${{ matrix.clustermanager }}-slave
-      - name: Publish HTCondor images to GitHub Container Registry
-        # HTCondor images have composed tags.
-        # if: github.event_name != 'pull_request' && matrix.clustermanager == 'htcondor'
+      - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish HTCondor images
+        if: matrix.clustermanager == 'htcondor' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
         run: |
           docker push "ghcr.io/${MY_GCR_NAMESPACE:?}/${MY_GCR_IMAGENAME:?}:${MATRIX_CLUSTERMANAGER:?}-submit"
           docker push "ghcr.io/${MY_GCR_NAMESPACE:?}/${MY_GCR_IMAGENAME:?}:${MATRIX_CLUSTERMANAGER:?}-execute"
         env:
           MATRIX_CLUSTERMANAGER: ${{ matrix.clustermanager }}
-
+      - name: Publish most images (but not HTCondor)
+        if: matrix.clustermanager != 'htcondor' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+        run: |
+          docker push "ghcr.io/${MY_GCR_NAMESPACE:?}/${MY_GCR_IMAGENAME:?}:${MATRIX_CLUSTERMANAGER:?}"
+        env:
+          MATRIX_CLUSTERMANAGER: ${{ matrix.clustermanager }}
+      - name: Publish secondary SGE images
+        if: matrix.clustermanager == 'sge' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+        run: |
+          docker push "ghcr.io/${MY_GCR_NAMESPACE:?}/${MY_GCR_IMAGENAME:?}:${MATRIX_CLUSTERMANAGER:?}-slave"
+        env:
+          MATRIX_CLUSTERMANAGER: ${{ matrix.clustermanager }}

ci/pbs/docker-compose.yml

@@ -3,7 +3,7 @@ version: "2"
 services:
 
   master:
-    image: daskdev/dask-jobqueue:pbs
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:pbs
     build: .
     container_name: pbs_master
     hostname: pbs_master
@@ -16,7 +16,7 @@ services:
     command: bash /run-master.sh
 
   slave_one:
-    image: daskdev/dask-jobqueue:pbs
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:pbs
     build: .
     container_name: pbs_slave_1
     hostname: pbs_slave_1
@@ -33,7 +33,7 @@ services:
       - master
 
   slave_two:
-    image: daskdev/dask-jobqueue:pbs
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:pbs
     build: .
     container_name: pbs_slave_2
     hostname: pbs_slave_2

ci/sge/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
 
   master:
-    image: daskdev/dask-jobqueue:sge
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:sge
     build:
       context: .
       target: master
@@ -19,7 +19,7 @@ services:
     command: bash /dask-jobqueue/ci/sge/run-master.sh
 
   slave-one:
-    image: daskdev/dask-jobqueue:sge-slave
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:sge-slave
     build:
       context: .
       target: slave
@@ -37,7 +37,7 @@ services:
       - master
 
   slave-two:
-    image: daskdev/dask-jobqueue:sge-slave
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:sge-slave
     build:
       context: .
       target: slave

ci/slurm/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       common-network:
 
   slurmdbd:
-    image: daskdev/dask-jobqueue:slurm
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:slurm
     build: .
     command: ["slurmdbd"]
     container_name: slurmdbd
@@ -33,7 +33,7 @@ services:
       common-network:
 
   slurmctld:
-    image: daskdev/dask-jobqueue:slurm
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:slurm
     build: .
     command: ["slurmctld"]
     container_name: slurmctld
@@ -58,7 +58,7 @@ services:
       - NET_ADMIN
 
   c1:
-    image: daskdev/dask-jobqueue:slurm
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:slurm
     build: .
     command: ["slurmd"]
     hostname: c1
@@ -81,7 +81,7 @@ services:
       - NET_ADMIN
 
   c2:
-    image: daskdev/dask-jobqueue:slurm
+    image: ghcr.io/juliaparallel/dask-jobqueue-ci-images:slurm
     build: .
     command: ["slurmd"]
     hostname: c2