split up CPU and GPU docker builds

LSSTDESC · Feb 21, 2024 · 14d41ea · 14d41ea
1 parent f8ef6c5
commit 14d41ea
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/.github/workflows/td-env-docker-dev.yml b/.github/workflows/td-env-docker-dev.yml
@@ -1,4 +1,4 @@
-name: td_env docker dev
+name: td_env cpu docker dev
 
 on: 
  # push:
@@ -52,26 +52,20 @@ jobs:
         ls $GITHUB_WORKSPACE
         echo $GITHUB_WORKSPACE
         ls $GITHUB_WORKSPACE/conda
-        docker run -u root --label=lsstdesc.build=lsstdesc-test -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --name="install-mpich" lsstsqre/centos:7-stack-lsst_distrib-w_2022_32 /bin/bash /$GITHUB_WORKSPACE/docker/install-mpich.sh
+        docker run -u root -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE --name="install-mpich" lsstsqre/centos:7-stack-lsst_distrib-w_2022_32 /bin/bash /$GITHUB_WORKSPACE/docker/install-mpich.sh
         docker commit -m"initial testing" install-mpich lsstdesc/td-dev:mpich
-        docker rmi -f lsstsqre/centos:7-stack-lsst_distrib-w_2022_32
-        docker run -u lsst --label=lsstdesc.build=lsstdesc-step2 -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE -w $GITHUB_WORKSPACE/conda --name="td-test-env" lsstdesc/td-dev:mpich /bin/bash /$GITHUB_WORKSPACE/docker/update-docker.sh ${{env.LSST_TAG}}
+        docker run -u lsst -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE -w $GITHUB_WORKSPACE/conda --name="td-test-env" lsstdesc/td-dev:mpich /bin/bash /$GITHUB_WORKSPACE/docker/update-docker.sh ${{env.LSST_TAG}}
         docker commit -m"initial testing" td-test-env lsstdesc/td-dev:test
-        docker rmi -f lsstdesc/td-dev:mpich
-        docker image prune -f --filter "label=lsstdesc.build=lsstdesc=test"
-        docker run -u lsst -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE -w $GITHUB_WORKSPACE/conda --name="td-gpu-env" lsstdesc/td-dev:test /bin/bash /$GITHUB_WORKSPACE/docker/add-gpu-env.sh
-        docker commit -m"initial testing" td-gpu-env lsstdesc/td-dev:gpu
-        docker rmi -f lsstdesc/td-dev:test
-        docker image prune -f --filter "label=lsstdesc.build=lsstdesc-step2"
-        docker run -u lsst -w /opt/lsst/software/stack --name="td-setwd" lsstdesc/td-dev:gpu /bin/bash
-        docker commit -m"initial testing" td-setwd lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
-        docker rmi -f lsstdesc/td-dev:gpu
+#        docker run -u lsst -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE -w $GITHUB_WORKSPACE/conda --name="td-gpu-env" lsstdesc/td-dev:test /bin/bash /$GITHUB_WORKSPACE/docker/add-gpu-env.sh
+#        docker commit -m"initial testing" td-gpu-env lsstdesc/td-dev:gpu
+        docker run -u lsst -w /opt/lsst/software/stack --name="td-setwd" lsstdesc/td-dev:test /bin/bash
+        docker commit -m"initial testing" td-setwd lsstdesc/td-env-cpu:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
     - name: Test and push
       run: |
-        docker run --rm lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev /bin/bash -c "source /opt/lsst/software/stack/loadLSST.bash && setup lsst_distrib && python -c 'import coloredlogs'"
-        docker push lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
-        docker tag lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev lsstdesc/td-env:dev
-        docker push lsstdesc/td-env:dev
+        docker run --rm lsstdesc/td-env-cpu:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev /bin/bash -c "source /opt/lsst/software/stack/loadLSST.bash && setup lsst_distrib && python -c 'import coloredlogs'"
+        docker push lsstdesc/td-env-cpu:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
+        docker tag lsstdesc/td-env-cpu:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev lsstdesc/td-env-cpu:dev
+        docker push lsstdesc/td-env-cpu:dev
 #        mkdir -p /tmp/desc
 #        docker save lsstdesc/td-env:dev > /tmp/desc/lsstdesc-td-env-dev.tar
 #    - name: Upload docker tarball