Skip to content

Commit 18d1893

Browse files
fix: resolves github deployment git ref when it differs from helm repo (#1276)
1 parent 9a79e3f commit 18d1893

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

.github/workflows/dispatch-integration.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ on:
77
description: The unique identifier of used in the deployment hostname.
88
required: true
99
type: string
10-
git-ref:
11-
description: Git ref
10+
camunda-helm-git-ref:
11+
description: Git ref of the helm chart repo
12+
required: false
13+
default: main
14+
type: string
15+
caller-git-ref:
16+
description: Git ref of the repo calling the template
1217
required: false
1318
default: main
1419
type: string
@@ -52,7 +57,8 @@ jobs:
5257
secrets: inherit
5358
with:
5459
identifier: ${{ github.event.inputs.identifier }}
55-
git-ref: ${{ github.event.inputs.git-ref }}
60+
caller-git-ref: ${{ github.event.inputs.caller-git-ref }}
61+
camunda-helm-git-ref: ${{ github.event.inputs.camunda-helm-git-ref }}
5662
persistent: ${{ github.event.inputs.persistent == 'true' }}
5763
platforms: ${{ github.event.inputs.platforms }}
5864
flows: ${{ github.event.inputs.flows }}

.github/workflows/test-integration-template.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ on:
77
description: The unique identifier of used in the deployment hostname.
88
required: true
99
type: string
10-
git-ref:
10+
camunda-helm-git-ref:
11+
required: false
12+
default: main
13+
type: string
14+
caller-git-ref:
1115
required: false
1216
default: main
1317
type: string
@@ -105,7 +109,7 @@ jobs:
105109
with:
106110
# This is needed to load repo GH composite actions if the workflow triggered by workflow_call.
107111
repository: camunda/camunda-platform-helm
108-
ref: ${{ inputs.git-ref }}
112+
ref: ${{ inputs.camunda-helm-git-ref }}
109113
# TODO: Later, find a way to abstract the auth for different platforms.
110114
- name: Authenticate to GKE
111115
if: matrix.distro.platform == 'gke'
@@ -158,7 +162,7 @@ jobs:
158162
step: start
159163
token: ${{ secrets.GITHUB_TOKEN }}
160164
env: ${{ steps.vars.outputs.identifier }}
161-
ref: ${{ inputs.git-ref }}
165+
ref: ${{ inputs.caller-git-ref }}
162166
- name: Pre setup
163167
timeout-minutes: 5
164168
env:
@@ -204,7 +208,7 @@ jobs:
204208
deployment_id: ${{ steps.deployment.outputs.deployment_id }}
205209
env_url: https://${{ steps.vars.outputs.ingress-host }}
206210
env: ${{ steps.vars.outputs.identifier }}
207-
ref: ${{ inputs.git-ref }}
211+
ref: ${{ inputs.caller-git-ref }}
208212
- name: ⭐️ Run Preflight TestSuite ⭐️
209213
if: inputs.test-enabled
210214
timeout-minutes: 10
@@ -228,7 +232,7 @@ jobs:
228232
step: deactivate-env
229233
token: ${{ secrets.GITHUB_TOKEN }}
230234
env: ${{ steps.vars.outputs.identifier }}
231-
ref: ${{ inputs.git-ref }}
235+
ref: ${{ inputs.caller-git-ref }}
232236
- name: Cleanup test namespace
233237
if: always() && (env.TEST_PERSISTENT == 'false' || matrix.distro.type != 'kubernetes')
234238
run: |
@@ -268,7 +272,7 @@ jobs:
268272
step: deactivate-env
269273
token: ${{ secrets.GITHUB_TOKEN }}
270274
env: ${{ steps.vars.outputs.identifier }}
271-
ref: ${{ inputs.git-ref }}
275+
ref: ${{ inputs.caller-git-ref }}
272276
- name: Cleanup test namespace
273277
if: always()
274278
run: |

.github/workflows/test-integration.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ jobs:
2828
persistent: "${{ contains(github.event.*.labels.*.name, 'test-persistent') }}"
2929
platforms: "gke,rosa"
3030
flows: "install,upgrade"
31-
git-ref: ${{ github.event.pull_request.head.sha }}
31+
caller-git-ref: ${{ github.event.pull_request.head.sha }}
32+
camunda-helm-git-ref: ${{ github.event.pull_request.head.sha }}

0 commit comments

Comments
 (0)