Skip to content

Commit 1bdd1f2

Browse files
authored
Merge pull request #48 from averevki/add-dnstls-azure-task
Add dnstls-azure task to the nightly pipeline
2 parents 37b9726 + 20995c0 commit 1bdd1f2

File tree

4 files changed

+47
-1
lines changed

4 files changed

+47
-1
lines changed

main/pipeline.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ spec:
1919
description: Makefile target for tests
2020
name: make-target
2121
type: string
22+
- default: ""
23+
description: Pytest flags to use with Make (flags="${pytest-flags}" make kuadrant)
24+
name: pytest-flags
25+
type: string
2226
- default: pipeline-settings
2327
description: Config Map with settings for the testsuite
2428
name: settings-cm
@@ -59,6 +63,8 @@ spec:
5963
value: $(params.project)
6064
- name: make-target
6165
value: $(params.make-target)
66+
- name: pytest-flags
67+
value: $(params.pytest-flags)
6268
- name: settings-cm
6369
value: $(params.settings-cm)
6470
- name: additional-env

nightly/eventlistener.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ spec:
1313
value: kuadrant
1414
- name: make-target
1515
value: all
16+
- name: pytest-flags
17+
value: ""
1618
- name: settings-cm
1719
value: pipeline-settings
1820
- name: additional-env

nightly/pipeline.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ spec:
1919
description: Makefile target for tests (doesn't affect nightly pipeline, kept for compatibility)
2020
name: make-target
2121
type: string
22+
- default: ""
23+
description: Pytest flags to use with Make (flags="${pytest-flags}" make kuadrant)
24+
name: pytest-flags
25+
type: string
2226
- default: pipeline-settings
2327
description: Config Map with settings for the testsuite
2428
name: settings-cm
@@ -62,6 +66,8 @@ spec:
6266
value: $(params.project)
6367
- name: make-target
6468
value: kuadrant
69+
- name: pytest-flags
70+
value: $(params.pytest-flags)
6571
- name: settings-cm
6672
value: $(params.settings-cm)
6773
- name: additional-env
@@ -83,6 +89,8 @@ spec:
8389
value: $(params.project)
8490
- name: make-target
8591
value: authorino-standalone
92+
- name: pytest-flags
93+
value: $(params.pytest-flags)
8694
- name: settings-cm
8795
value: $(params.settings-cm)
8896
- name: additional-env
@@ -117,6 +125,8 @@ spec:
117125
value: $(params.settings-cm)
118126
- name: make-target
119127
value: multicluster
128+
- name: pytest-flags
129+
value: $(params.pytest-flags)
120130
- name: additional-env
121131
value: '$(params.additional-env) KUADRANT_CONTROL_PLANE__cluster2__kubeconfig_path=$(tasks.kubectl-login-second-cluster.results.kubeconfig-path)'
122132
- name: kubeconfig-path
@@ -137,6 +147,8 @@ spec:
137147
value: $(params.project)
138148
- name: make-target
139149
value: dnstls
150+
- name: pytest-flags
151+
value: "$(params.pytest-flags) --junitxml=$(workspaces.shared-workspace.path)/junit-dnstls-gcp.xml -o junit_suite_name=dnstls-gcp"
140152
- name: settings-cm
141153
value: $(params.settings-cm)
142154
- name: additional-env
@@ -150,6 +162,29 @@ spec:
150162
name: run-tests
151163
workspaces:
152164
- name: shared-workspace
165+
- name: run-tests-dnstls-azure
166+
params:
167+
- name: testsuite-image
168+
value: $(params.testsuite-image)
169+
- name: project
170+
value: $(params.project)
171+
- name: make-target
172+
value: dnstls
173+
- name: pytest-flags
174+
value: "$(params.pytest-flags) --junitxml=$(workspaces.shared-workspace.path)/junit-dnstls-azure.xml -o junit_suite_name=dnstls-azure"
175+
- name: settings-cm
176+
value: $(params.settings-cm)
177+
- name: additional-env
178+
value: "$(params.additional-env) KUADRANT_CONTROL_PLANE__provider_secret=azure-credentials"
179+
- name: kubeconfig-path
180+
value: $(tasks.kubectl-login.results.kubeconfig-path)
181+
runAfter:
182+
- run-tests-dnstls-gcp
183+
taskRef:
184+
kind: Task
185+
name: run-tests
186+
workspaces:
187+
- name: shared-workspace
153188
finally:
154189
- name: upload-results
155190
when:

tasks/run-tests-task.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ spec:
1313
- description: Makefile target for tests
1414
name: make-target
1515
type: string
16+
- description: Pytest flags to use with Make (flags="${pytest-flags}" make kuadrant)
17+
name: pytest-flags
18+
type: string
1619
- description: Config Map with settings for the testsuite
1720
name: settings-cm
1821
type: string
@@ -26,7 +29,7 @@ spec:
2629
- args:
2730
- >-
2831
cp /var/kuadrant-settings/settings.local.yaml /opt/workdir/kuadrant-testsuite/config &&
29-
export $(params.additional-env) &> /dev/null && (flags="-vv" make $(params.make-target) || true)
32+
export $(params.additional-env) &> /dev/null && (flags="-vv $(params.pytest-flags)" make $(params.make-target) || true)
3033
command:
3134
- /bin/bash
3235
- -cveo

0 commit comments

Comments
 (0)