replace test dockerfile with docker run command in github workflow

openkim · Nov 2, 2023 · 61bd81a · 61bd81a
1 parent 89a53ae
commit 61bd81a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/docker-publish.yml → ...hub/workflows/docker-publish-and-test.yml b/.github/workflows/docker-publish.yml → ...hub/workflows/docker-publish-and-test.yml
@@ -1,4 +1,4 @@
-name: Docker publish
+name: Docker publish and test
 
 # This workflow uses actions that are not certified by GitHub.
 # They are provided by a third-party and are governed by
@@ -10,6 +10,7 @@ on:
     types: [ published ]
   pull_request:
     branches: [ main ]
+  push:
 
 env:
   REGISTRY: ghcr.io
@@ -185,7 +186,7 @@ jobs:
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
+        if: (github.event_name != 'pull_request') && (github.event_name != 'push')
         uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
         with:
           registry: ${{ env.REGISTRY }}
@@ -228,7 +229,7 @@ jobs:
         with:
           context: docker/${{ env.DOCKER_DIR_CONFIG }}
           file: docker/${{ env.DOCKER_DIR_CONFIG }}/${{ env.DOCKERFILE_NAME }}
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ (github.event_name != 'pull_request') && (github.event_name != 'push') }}
           build-args: |
             "IMAGE_INSTALL=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG_INSTALL }}"
           tags: |
@@ -246,6 +247,10 @@ jobs:
           rm -rf ${{ env.IMAGE_CACHE_DIR_SYS }}
           rm -rf ${{ env.IMAGE_CACHE_DIR_GIT }}
 
+      - name: Test minimal image
+        run: |
+          docker run --rm --mount type=bind,src=$PWD/test/test_scripts_and_data,target=/home/openkim/test_scripts_and_data --env LD_LIBRARY_PATH=:/usr/local/lib image_minimal /bin/bash -c 'cd /home/openkim/test_scripts_and_data && bash set_up_and_run_equilibriumcrystalstructure_sample.sh && python compare_dbs.py'
+
       # Finally, install additional packages to create the full image based on
       # the minimal image
       #
@@ -255,7 +260,7 @@ jobs:
         with:
           context: docker/${{ env.DOCKER_DIR_ADDITIONAL }}
           file: docker/${{ env.DOCKER_DIR_ADDITIONAL }}/${{ env.DOCKERFILE_NAME }}
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ (github.event_name != 'pull_request') && (github.event_name != 'push') }}
           build-args: |
             "IMAGE_MINIMAL=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}-minimal"
           tags: |

diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
diff --git a/...test/test_scripts_and_data/compare_dbs.py → test/test_scripts_and_data/compare_dbs.py b/...test/test_scripts_and_data/compare_dbs.py → test/test_scripts_and_data/compare_dbs.py
diff --git a/docker/test/test_scripts_and_data/data.json → test/test_scripts_and_data/data.json b/docker/test/test_scripts_and_data/data.json → test/test_scripts_and_data/data.json
diff --git a/...run_equilibriumcrystalstructure_sample.sh → ...run_equilibriumcrystalstructure_sample.sh b/...run_equilibriumcrystalstructure_sample.sh → ...run_equilibriumcrystalstructure_sample.sh
@@ -19,4 +19,4 @@ kimitems install -D Sim_LAMMPS_TersoffZBL_DevanathanDiazdelaRubiaWeber_1998_SiC_
 
 pipeline-database set local
 
-pipeline-run-matches \*_TE_\*
+pipeline-run-matches \*_TE_\*
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ kimitems install -D Sim_LAMMPS_TersoffZBL_DevanathanDiazdelaRubiaWeber_1998_SiC_

		pipeline-database set local

		pipeline-run-matches \_TE_\
		pipeline-run-matches \_TE_\