Skip to content

Commit

Permalink
DBC22-2081:Fix test workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
wmuldergov committed Apr 24, 2024
1 parent 9e897d2 commit 8ef4c2c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ jobs:
password: ${{ env.REGISTRY_PASSWORD }}

build-logprocessing:
needs: [build-pre]
runs-on: ubuntu-latest
name: Build & Push Docker Log-Processing Image
environment: test
Expand All @@ -201,7 +202,7 @@ jobs:
tags: latest latest-test ${{ github.sha }}
labels: |
app=drivebc
containerfiles: ./compose/logprocessing/Dockerfile
containerfiles: ./compose/logprocessing/DockerFile

- name: Push to Github Packages
uses: redhat-actions/[email protected]
Expand Down Expand Up @@ -236,4 +237,4 @@ jobs:
- name: Helm upgrade on OpenShift Environment
run: |
helm dependency update ./infrastructure/main
helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }} --set logprocessing.image.tag="${{ needs.build-pre.outputs.tag }}"
helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }}" --set logprocessing.image.tag="${{ needs.build-pre.outputs.tag }}"
9 changes: 5 additions & 4 deletions .github/workflows/test_manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,10 @@ jobs:
password: ${{ env.REGISTRY_PASSWORD }}

build-logprocessing:
needs: [build-pre]
runs-on: ubuntu-latest
name: Build & Push Docker Log-Processing Image
environment: dev
environment: test

steps:
- name: Checkout Code
Expand All @@ -177,10 +178,10 @@ jobs:
uses: redhat-actions/[email protected]
with:
image: drivebc-logprocessing
tags: latest latest-dev ${{ github.sha }}
tags: latest latest-test ${{ github.sha }}
labels: |
app=drivebc
containerfiles: ./compose/logprocessing/Dockerfile
containerfiles: ./compose/logprocessing/DockerFile

- name: Push to Github Packages
uses: redhat-actions/[email protected]
Expand Down Expand Up @@ -215,4 +216,4 @@ jobs:
- name: Helm upgrade on OpenShift Environment
run: |
helm dependency update ./infrastructure/main
helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }}"
helm upgrade test-drivebc -f ./infrastructure/main/values-test.yaml ./infrastructure/main --set django.image.tag="${{ needs.build-pre.outputs.tag }}" --set image-caching.image.tag="${{ needs.build-pre.outputs.tag }}" --set redis.image.tag="${{ needs.build-pre.outputs.tag }}" --set static.image.tag="${{ needs.build-pre.outputs.tag }}" --set tasks.image.tag="${{ needs.build-pre.outputs.tag }}" --set logprocessing.image.tag="${{ needs.build-pre.outputs.tag }}"

0 comments on commit 8ef4c2c

Please sign in to comment.