Skip to content

Commit

Permalink
Merge pull request #765 from gonuke/change_tmp_image_branch
Browse files Browse the repository at this point in the history
change tmp tag of docker images during testing
  • Loading branch information
bam241 authored Jul 22, 2021
2 parents f64b44b + 17a4052 commit 2e95ddd
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
context: .
build-args: |
UBUNTU_VERSION=${{ matrix.ubuntu_versions }}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}:ci_testing

build-housekeeping-img:
needs: build-base-img
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
build-args: |
OWNER=${{ github.repository_owner }}
UBUNTU_VERSION=${{ matrix.ubuntu_versions }}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-housekeeping
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-housekeeping:ci_testing


build-deps-img:
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
OWNER=${{ github.repository_owner }}
UBUNTU_VERSION=${{ matrix.ubuntu_versions }}
COMPILER=${{ matrix.compiler }}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext:ci_testing

- name: Build and export Dockerfile_2_hdf5
uses: docker/build-push-action@v2
Expand All @@ -134,7 +134,7 @@ jobs:
UBUNTU_VERSION=${{ matrix.ubuntu_versions }}
COMPILER=${{ matrix.compiler }}
HDF5=${{ matrix.hdf5_versions }}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}:ci_testing

build-moab-img:
needs: build-deps-img
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
COMPILER=${{ matrix.compiler }}
HDF5=${{ matrix.hdf5_versions }}
MOAB=${{ matrix.moab_versions }}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}
tags: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:ci_testing

housekeeping:
if: ${{ github.repository_owner != 'svalinn' || github.event_name == 'pull_request' }}
Expand All @@ -201,7 +201,7 @@ jobs:
strategy:
matrix:
ubuntu_versions : [18.04,]
container: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-housekeeping:latest
container: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-housekeeping:ci_testing

name: Running Housekeeping scrips
steps:
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
develop,
master,
]
container: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:latest
container: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:ci_testing

name: Installing and Testing DAGMC
steps:
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
- name: Push Image to stable img
uses: akhilerm/tag-push-action@v1.0.0
with:
src: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-housekeeping:latest
src: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-housekeeping:ci_testing
dst: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-housekeeping:stable

pushing_test_stable_img:
Expand Down Expand Up @@ -348,5 +348,5 @@ jobs:
- name: Push Image to stable img
uses: akhilerm/tag-push-action@v1.0.0
with:
src: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:latest
src: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:ci_testing
dst: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-ext-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}:stable
13 changes: 13 additions & 0 deletions news/PR-0765.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
**Added:** None

**Changed:** None

* change tag on temporary docker images during testing

**Deprecated:** None

**Removed:** None

**Fixed:** None

**Security:** None

0 comments on commit 2e95ddd

Please sign in to comment.