diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index c59a2adbb..292e7a90f 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -185,9 +185,6 @@ jobs: - release environment: test runs-on: ubuntu-22.04 - env: - ZONE: test - NR_SPAR_BACKEND_VERSION: ${{ needs.release.outputs.version }} strategy: matrix: name: [ init, database, backend ] @@ -201,7 +198,7 @@ jobs: - name: backend file: backend/openshift.deploy.yml overwrite: true - parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2 -p BUILD=test-${{ env.NR_SPAR_BACKEND_VERSION }} + parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2 -p BUILD=test-${{ needs.release.outputs.version }} steps: - uses: bcgov-nr/action-deployer-openshift@v1.0.1 with: @@ -260,10 +257,6 @@ jobs: - api-tests environment: prod runs-on: ubuntu-22.04 - env: - ZONE: prod - PREV: test - NR_SPAR_BACKEND_VERSION: ${{ needs.release.outputs.version }} strategy: matrix: name: [ init, database, backend ] @@ -277,7 +270,7 @@ jobs: - name: backend file: backend/openshift.deploy.yml overwrite: true - parameters: -p BUILD=test-${{ env.NR_SPAR_BACKEND_VERSION }} + parameters: -p BUILD=prod-${{ needs.release.outputs.version }} steps: - uses: bcgov-nr/action-deployer-openshift@v1.0.1 with: @@ -298,5 +291,5 @@ jobs: with: registry: ${{ env.REGISTRY }} repository: ${{ github.repository }} - target: backend:${{ env.PREV }} - tags: ${{ env.ZONE }} + target: backend:test + tags: prod