File tree 3 files changed +24
-3
lines changed
3 files changed +24
-3
lines changed Original file line number Diff line number Diff line change 6
6
description : " The pytest filter to use"
7
7
required : false
8
8
default : " post and ci and not multinode and not slow and not registry_ha"
9
+ EXTRA_FILTER :
10
+ description : " Extra pytest filter to add at the end"
11
+ required : false
12
+ default : " "
9
13
CONTROL_PLANE_INGRESS_VIP :
10
14
description : " Virtual IP to use to test to reconfigure the Control Plane Ingress"
11
15
required : false
37
41
export BOOTSTRAP_BACKUP_ARCHIVE=\"${{ inputs.BOOTSTRAP_BACKUP_ARCHIVE }}\"
38
42
export CONTROL_PLANE_INGRESS_VIP=\"${{ inputs.CONTROL_PLANE_INGRESS_VIP }}\"
39
43
export WORKLOAD_PLANE_INGRESS_VIPS=\"${{ inputs.WORKLOAD_PLANE_INGRESS_VIPS }}\"
40
- tox -e tests -- -m \"${{ inputs.PYTEST_FILTERS }}\"
44
+ tox -e tests -- -m \"${{ inputs.PYTEST_FILTERS }} ${{ inputs.EXTRA_FILTER }} \"
Original file line number Diff line number Diff line change @@ -169,10 +169,15 @@ jobs:
169
169
# NOTE: We add rocky-8 here even if it's already tested in pre-merge since
170
170
# we also test solution install + upgrade there
171
171
- rocky-8
172
+ setup-idp : [true]
173
+ include :
174
+ - os : rocky-8
175
+ setup-idp : false
172
176
with :
173
177
artifacts-url : ${{ needs.retrieve-info.outputs.artifacts-link }}
174
178
os : ${{ matrix.os }}
175
179
test-solution : true
180
+ setup-idp : ${{ matrix.setup-idp }}
176
181
177
182
write-final-failed-status :
178
183
runs-on : ubuntu-22.04
Original file line number Diff line number Diff line change 37
37
type : boolean
38
38
default : false
39
39
40
+ # Config information
41
+ setup-idp :
42
+ description : " Whether or not the internal IDP should be configured and tested"
43
+ required : false
44
+ type : boolean
45
+ default : true
46
+
40
47
# Solution information
41
48
solution-name :
42
49
description : " The solution name to install"
65
72
default : " 1.0.3"
66
73
67
74
env :
68
- NAME : single-node-${{ inputs.os }}
75
+ NAME : single-node-${{ inputs.os }}-${{ inputs.setup-idp && 'idp' || 'no-idp' }}
69
76
70
77
jobs :
71
78
single-node :
@@ -124,6 +131,8 @@ jobs:
124
131
SOURCE_FILE : " metalk8s.iso"
125
132
- name : Generate Bootstrap config
126
133
uses : ./.github/actions/generate-bootstrap
134
+ with :
135
+ DEX_ENABLED : ${{ inputs.setup-idp }}
127
136
- name : Mount MetalK8s ISO
128
137
uses : ./.github/actions/mount-iso
129
138
- name : Run Bootstrap
@@ -189,15 +198,18 @@ jobs:
189
198
- name : Prepare bastion to run tests
190
199
uses : ./.github/actions/prepare-bastion
191
200
with :
192
- UI_DEPS : " true "
201
+ UI_DEPS : ${{ inputs.setup-idp }}
193
202
- name : Run Solutions CLI tests from Bastion
194
203
if : inputs.test-solution
195
204
uses : ./.github/actions/bastion-tests
196
205
with :
197
206
PYTEST_FILTERS : " solution"
198
207
- name : Run tests from Bastion
199
208
uses : ./.github/actions/bastion-tests
209
+ with :
210
+ EXTRA_FILTER : ${{ inputs.setup-idp && ' ' || 'and not authentication' }}
200
211
- name : Run UI tests from Bastion
212
+ if : inputs.setup-idp
201
213
uses : ./.github/actions/bastion-ui-tests
202
214
# }}}
203
215
You can’t perform that action at this time.
0 commit comments