Skip to content

Commit c24a4c7

Browse files
cognifloydcognifloyd
committed
add extra_hooks job to existing tests
1 parent e4ec61f commit c24a4c7

File tree

8 files changed

+77
-9
lines changed

8 files changed

+77
-9
lines changed

‎tests/unit/custom_annotations_test.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,19 @@ tests:
153153
annotations:
154154
foo: bar
155155
answer: "42"
156+
extra_hooks:
157+
- name: upgrade-warning
158+
hook: pre-upgrade, pre-rollback
159+
hook_weight: -5
160+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
156161
asserts:
157162
- hasDocuments:
158-
count: 4
163+
count: 5
159164
# job-st2-apply-rbac-defintions
160165
# job-st2-apikey-load
161166
# job-st2-key-load
162167
# job-st2-register-content
168+
# extra_hooks job
163169

164170
# job annotations
165171
- isNotNull:

‎tests/unit/dns_test.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ tests:
2626
st2:
2727
packs: { sensors: [] } # ensure only 1 sensor
2828
rbac: { enabled: true } # enable rbac job
29+
jobs:
30+
extra_hooks: &jobs_extra_hooks
31+
- name: upgrade-warning
32+
hook: pre-upgrade, pre-rollback
33+
hook_weight: -5
34+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
2935
asserts:
3036
- isNull:
3137
path: spec.template.spec.dnsPolicy
@@ -51,6 +57,8 @@ tests:
5157
st2:
5258
packs: { sensors: [] } # ensure only 1 sensor
5359
rbac: { enabled: true } # enable rbac job
60+
jobs:
61+
extra_hooks: *jobs_extra_hooks
5462
asserts:
5563
- equal:
5664
path: spec.template.spec.dnsPolicy

‎tests/unit/env_test.yaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,15 @@ tests:
6666
set:
6767
st2:
6868
rbac: { enabled: true } # enable rbac job
69+
jobs:
70+
extra_hooks: &extra_hooks_jobs
71+
- name: upgrade-warning
72+
hook: pre-upgrade, pre-rollback
73+
hook_weight: -5
74+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
6975
asserts:
7076
- hasDocuments:
71-
count: 4
77+
count: 5
7278
- isNull: *is_null_env
7379

7480
- it: Deployments accept custom env
@@ -121,9 +127,10 @@ tests:
121127
rbac: { enabled: true } # enable rbac job
122128
jobs:
123129
env: *env
130+
extra_hooks: *extra_hooks_jobs
124131
asserts:
125132
- hasDocuments:
126-
count: 4
133+
count: 5
127134

128135
- contains: *contains_env
129136

@@ -156,11 +163,13 @@ tests:
156163
set:
157164
st2:
158165
rbac: { enabled: true } # enable rbac job
166+
jobs:
167+
extra_hooks: *extra_hooks_jobs
159168
release:
160169
name: st2ha
161170
asserts:
162171
- hasDocuments:
163-
count: 4
172+
count: 5
164173

165174
- contains: *contains_st2_urls
166175
documentIndex: 1
@@ -215,6 +224,7 @@ tests:
215224
rbac: { enabled: true } # enable rbac job
216225
jobs:
217226
envFromSecrets: *envFromSecrets
227+
extra_hooks: *extra_hooks_jobs
218228
asserts:
219229
- contains: *contains_external_secret1
220230
- contains: *contains_external_secret2

‎tests/unit/image_pull_test.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ tests:
4444
# job-st2-apikey-load
4545
# job-st2-key-load
4646
# job-st2-register-content
47+
# extra_hooks job
4748
set:
4849
# image.pullPolicy defaults to IfNotPresent
4950
# image.pullSecret defaults to None
@@ -56,6 +57,12 @@ tests:
5657
packs: { sensors: [] } # ensure only 1 sensor
5758
st2chatops:
5859
enabled: true
60+
jobs:
61+
extra_hooks: &jobs_extra_hooks
62+
- name: upgrade-warning
63+
hook: pre-upgrade, pre-rollback
64+
hook_weight: -5
65+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
5966
asserts:
6067
- isNull:
6168
path: spec.template.spec.imagePullSecrets
@@ -84,6 +91,8 @@ tests:
8491
packs: { sensors: [] } # ensure only 1 sensor
8592
st2chatops:
8693
enabled: true
94+
jobs:
95+
extra_hooks: *jobs_extra_hooks
8796
asserts:
8897
- equal:
8998
path: spec.template.spec.imagePullSecrets[0].name

‎tests/unit/labels_test.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,20 @@ tests:
101101
st2:
102102
rbac:
103103
enabled: true # enable rbac job
104+
jobs:
105+
extra_hooks:
106+
- name: upgrade-warning
107+
hook: pre-upgrade, pre-rollback
108+
hook_weight: -5
109+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
104110
asserts:
105111
- hasDocuments:
106-
count: 4
112+
count: 5
107113
# job-st2-apply-rbac-defintions
108114
# job-st2-apikey-load
109115
# job-st2-key-load
110116
# job-st2-register-content
117+
# extra_hooks job
111118

112119
# unlike deployments, jobs should not have selector.matchLabels
113120

‎tests/unit/packs_volumes_test.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,17 @@ tests:
140140
volumes:
141141
enabled: false
142142
configs: {} # has one core.yaml config file by default (dicts get merged)
143+
jobs:
144+
extra_hooks: &extra_hooks_jobs
145+
- name: upgrade-warning
146+
hook: pre-upgrade, pre-rollback
147+
hook_weight: -5
148+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
143149
release:
144150
name: st2ha
145151
asserts:
146152
- hasDocuments:
147-
count: 4
153+
count: 5
148154

149155
- notContains: *packs_vol
150156
- notContains: *venvs_vol
@@ -393,11 +399,13 @@ tests:
393399
volumes:
394400
enabled: false
395401
configs: {} # has one core.yaml config file by default (dicts get merged)
402+
jobs:
403+
extra_hooks: *extra_hooks_jobs
396404
release:
397405
name: st2ha
398406
asserts:
399407
- hasDocuments:
400-
count: 4
408+
count: 5
401409

402410
- contains: *packs_vol
403411
documentIndex: 3 # register_content
@@ -687,11 +695,13 @@ tests:
687695
virtualenvs: *nfs_venvs_volume
688696
configs: *nfs_pack_configs_volume
689697
configs: {} # has one core.yaml config file by default (dicts get merged)
698+
jobs:
699+
extra_hooks: *extra_hooks_jobs
690700
release:
691701
name: st2ha
692702
asserts:
693703
- hasDocuments:
694-
count: 4
704+
count: 5
695705

696706
- contains: *nfs_packs_vol
697707
documentIndex: 3 # register_content
@@ -960,11 +970,13 @@ tests:
960970
virtualenvs: *nfs_venvs_volume
961971
configs: *nfs_pack_configs_volume
962972
configs: {} # has one core.yaml config file by default (dicts get merged)
973+
jobs:
974+
extra_hooks: *extra_hooks_jobs
963975
release:
964976
name: st2ha
965977
asserts:
966978
- hasDocuments:
967-
count: 4
979+
count: 5
968980

969981
- contains: *nfs_packs_vol
970982
documentIndex: 3 # register_content

‎tests/unit/placement_test.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ tests:
3939
packs: { sensors: [] } # ensure only 1 sensor
4040
st2chatops:
4141
enabled: true
42+
jobs:
43+
extra_hooks: &jobs_extra_hooks
44+
- name: upgrade-warning
45+
hook: pre-upgrade, pre-rollback
46+
hook_weight: -5
47+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
4248
asserts:
4349
- isNull:
4450
path: spec.template.spec.nodeSelector
@@ -157,6 +163,7 @@ tests:
157163
nodeSelector: *custom_nodeSelector
158164
tolerations: *custom_tolerations
159165
affinity: *custom_affinity
166+
extra_hooks: *jobs_extra_hooks
160167
asserts:
161168
- equal:
162169
path: spec.template.spec.nodeSelector

‎tests/unit/security_context_test.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,19 @@ tests:
3333
# job-st2-apikey-load
3434
# job-st2-key-load
3535
# job-st2-register-content
36+
# extra_hooks job
3637
set:
3738
st2chatops:
3839
enabled: true
3940
st2:
4041
packs: { sensors: [] } # ensure only 1 sensor
4142
rbac: { enabled: true } # enable rbac job
43+
jobs:
44+
extra_hooks: &jobs_extra_hooks
45+
- name: upgrade-warning
46+
hook: pre-upgrade, pre-rollback
47+
hook_weight: -5
48+
command: ["st2", "run", "--tail", "custom_pack.warn_about_upgrade"]
4249

4350
podSecurityContext: {}
4451
securityContext: {}
@@ -75,6 +82,8 @@ tests:
7582
st2:
7683
packs: { sensors: [] } # ensure only 1 sensor
7784
rbac: { enabled: true } # enable rbac job
85+
jobs:
86+
extra_hooks: *jobs_extra_hooks
7887

7988
podSecurityContext: &global_pod_security_context
8089
fsGroup: 1234

0 commit comments

Comments
 (0)