Skip to content

Commit 45f45ef

Browse files
anvialanvial
authored
Merge pull request #239 from anvial/rename-manual-to-unmanaged-in-4
feat: remove manual from 4.0, introduce umnaaged
2 parents 4a7f6f8 + 2e3f522 commit 45f45ef

File tree

9 files changed

+2632
-54
lines changed

9 files changed

+2632
-54
lines changed

‎jobs/ci-run/integration/gen/test-cloud_gce.yml‎

Lines changed: 153 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,92 @@
2828
- multijob:
2929
name: 'IntegrationTests-cloud_gce'
3030
projects:
31+
- name: 'test-cloud_gce-test-create-storage-pool-google'
32+
current-parameters: true
3133
- name: 'test-cloud_gce-test-deploy-gpu-instance-google'
3234
current-parameters: true
3335
- name: 'test-cloud_gce-test-pro-images-google'
3436
current-parameters: true
37+
- name: 'test-cloud_gce-test-serviceaccount-credential-google'
38+
current-parameters: true
39+
40+
- job:
41+
name: test-cloud_gce-test-create-storage-pool-google
42+
node: ephemeral-noble-small-amd64
43+
concurrent: true
44+
description: |-
45+
Test test_create_storage_pool in cloud_gce suite on google
46+
parameters:
47+
- validating-string:
48+
name: SHORT_GIT_COMMIT
49+
description: 'Enable sub job to be run individually.'
50+
regex: ^\S{{7}}$
51+
msg: Enter a valid 7 char git sha
52+
- choice:
53+
default: 'amd64'
54+
description: 'Build arch used to download the build tar.gz.'
55+
name: BUILD_ARCH
56+
choices:
57+
- amd64
58+
- arm64
59+
- s390x
60+
- ppc64el
61+
- choice:
62+
default: ''
63+
description: 'Arch used to boostrap controller.'
64+
name: BOOTSTRAP_ARCH
65+
choices:
66+
- amd64
67+
- arm64
68+
- s390x
69+
- ppc64el
70+
- choice:
71+
default: ''
72+
description: 'Arch used for hosted models.'
73+
name: MODEL_ARCH
74+
choices:
75+
- amd64
76+
- arm64
77+
- s390x
78+
- ppc64el
79+
- string:
80+
default: 'google'
81+
description: 'Cloud to use when bootstrapping Juju'
82+
name: BOOTSTRAP_CLOUD
83+
- string:
84+
default: 'gce'
85+
description: 'Provider to use when bootstrapping Juju'
86+
name: BOOTSTRAP_PROVIDER
87+
- string:
88+
default: 'us-east1'
89+
description: 'Cloud Region to use when bootstrapping Juju'
90+
name: BOOTSTRAP_REGION
91+
wrappers:
92+
- default-integration-test-wrapper
93+
- timeout:
94+
timeout: 30
95+
fail: true
96+
type: absolute
97+
builders:
98+
- common
99+
- select-oci-registry
100+
- prepare-integration-test
101+
- conditional-step:
102+
# Only run on regexp version match.
103+
# Accounts for tests which do not exist
104+
# until a given Juju version.
105+
condition-kind: regex-match
106+
regex: "^[4-9].*|^3\\.([6-9]|\\d{{2,}})(\\.|-).*"
107+
label: "${{JUJU_VERSION}}"
108+
on-evaluation-failure: "dont-run"
109+
steps:
110+
- run-integration-test:
111+
test_name: 'cloud_gce'
112+
setup_steps: ''
113+
task_name: 'test_create_storage_pool'
114+
skip_tasks: 'test_deploy_gpu_instance,test_pro_images,test_serviceaccount_credential'
115+
publishers:
116+
- integration-artifacts
35117

36118
- job:
37119
name: test-cloud_gce-test-deploy-gpu-instance-google
@@ -107,7 +189,7 @@
107189
test_name: 'cloud_gce'
108190
setup_steps: ''
109191
task_name: 'test_deploy_gpu_instance'
110-
skip_tasks: 'test_pro_images'
192+
skip_tasks: 'test_create_storage_pool,test_pro_images,test_serviceaccount_credential'
111193
publishers:
112194
- integration-artifacts
113195

@@ -176,6 +258,75 @@
176258
test_name: 'cloud_gce'
177259
setup_steps: ''
178260
task_name: 'test_pro_images'
179-
skip_tasks: 'test_deploy_gpu_instance'
261+
skip_tasks: 'test_create_storage_pool,test_deploy_gpu_instance,test_serviceaccount_credential'
262+
publishers:
263+
- integration-artifacts
264+
265+
- job:
266+
name: test-cloud_gce-test-serviceaccount-credential-google
267+
node: ephemeral-noble-small-amd64
268+
concurrent: true
269+
description: |-
270+
Test test_serviceaccount_credential in cloud_gce suite on google
271+
parameters:
272+
- validating-string:
273+
name: SHORT_GIT_COMMIT
274+
description: 'Enable sub job to be run individually.'
275+
regex: ^\S{{7}}$
276+
msg: Enter a valid 7 char git sha
277+
- choice:
278+
default: 'amd64'
279+
description: 'Build arch used to download the build tar.gz.'
280+
name: BUILD_ARCH
281+
choices:
282+
- amd64
283+
- arm64
284+
- s390x
285+
- ppc64el
286+
- choice:
287+
default: ''
288+
description: 'Arch used to boostrap controller.'
289+
name: BOOTSTRAP_ARCH
290+
choices:
291+
- amd64
292+
- arm64
293+
- s390x
294+
- ppc64el
295+
- choice:
296+
default: ''
297+
description: 'Arch used for hosted models.'
298+
name: MODEL_ARCH
299+
choices:
300+
- amd64
301+
- arm64
302+
- s390x
303+
- ppc64el
304+
- string:
305+
default: 'google'
306+
description: 'Cloud to use when bootstrapping Juju'
307+
name: BOOTSTRAP_CLOUD
308+
- string:
309+
default: 'gce'
310+
description: 'Provider to use when bootstrapping Juju'
311+
name: BOOTSTRAP_PROVIDER
312+
- string:
313+
default: 'us-east1'
314+
description: 'Cloud Region to use when bootstrapping Juju'
315+
name: BOOTSTRAP_REGION
316+
wrappers:
317+
- default-integration-test-wrapper
318+
- timeout:
319+
timeout: 30
320+
fail: true
321+
type: absolute
322+
builders:
323+
- common
324+
- select-oci-registry
325+
- prepare-integration-test
326+
- run-integration-test:
327+
test_name: 'cloud_gce'
328+
setup_steps: ''
329+
task_name: 'test_serviceaccount_credential'
330+
skip_tasks: 'test_create_storage_pool,test_deploy_gpu_instance,test_pro_images'
180331
publishers:
181332
- integration-artifacts

‎jobs/ci-run/integration/gen/test-manual.yml‎

Lines changed: 64 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,22 @@
9898
- common
9999
- select-oci-registry
100100
- prepare-integration-test
101-
- run-integration-test:
102-
test_name: 'manual'
103-
setup_steps: ''
104-
task_name: 'test_deploy_manual'
105-
skip_tasks: 'test_spaces_manual'
101+
- conditional-step:
102+
# Do not run on regexp version match.
103+
# Accounts for tests which do not exist
104+
# in later Juju versions.
105+
condition-kind: not
106+
condition-operand:
107+
condition-kind: regex-match
108+
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
109+
label: "${{JUJU_VERSION}}"
110+
on-evaluation-failure: "dont-run"
111+
steps:
112+
- run-integration-test:
113+
test_name: 'manual'
114+
setup_steps: ''
115+
task_name: 'test_deploy_manual'
116+
skip_tasks: 'test_spaces_manual'
106117
publishers:
107118
- integration-artifacts
108119

@@ -163,11 +174,22 @@
163174
- common
164175
- select-oci-registry
165176
- prepare-integration-test
166-
- run-integration-test:
167-
test_name: 'manual'
168-
setup_steps: ''
169-
task_name: 'test_deploy_manual'
170-
skip_tasks: 'test_spaces_manual'
177+
- conditional-step:
178+
# Do not run on regexp version match.
179+
# Accounts for tests which do not exist
180+
# in later Juju versions.
181+
condition-kind: not
182+
condition-operand:
183+
condition-kind: regex-match
184+
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
185+
label: "${{JUJU_VERSION}}"
186+
on-evaluation-failure: "dont-run"
187+
steps:
188+
- run-integration-test:
189+
test_name: 'manual'
190+
setup_steps: ''
191+
task_name: 'test_deploy_manual'
192+
skip_tasks: 'test_spaces_manual'
171193
publishers:
172194
- integration-artifacts
173195

@@ -232,11 +254,22 @@
232254
- common
233255
- select-oci-registry
234256
- prepare-integration-test
235-
- run-integration-test:
236-
test_name: 'manual'
237-
setup_steps: ''
238-
task_name: 'test_spaces_manual'
239-
skip_tasks: 'test_deploy_manual'
257+
- conditional-step:
258+
# Do not run on regexp version match.
259+
# Accounts for tests which do not exist
260+
# in later Juju versions.
261+
condition-kind: not
262+
condition-operand:
263+
condition-kind: regex-match
264+
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
265+
label: "${{JUJU_VERSION}}"
266+
on-evaluation-failure: "dont-run"
267+
steps:
268+
- run-integration-test:
269+
test_name: 'manual'
270+
setup_steps: ''
271+
task_name: 'test_spaces_manual'
272+
skip_tasks: 'test_deploy_manual'
240273
publishers:
241274
- integration-artifacts
242275

@@ -297,10 +330,21 @@
297330
- common
298331
- select-oci-registry
299332
- prepare-integration-test
300-
- run-integration-test:
301-
test_name: 'manual'
302-
setup_steps: ''
303-
task_name: 'test_spaces_manual'
304-
skip_tasks: 'test_deploy_manual'
333+
- conditional-step:
334+
# Do not run on regexp version match.
335+
# Accounts for tests which do not exist
336+
# in later Juju versions.
337+
condition-kind: not
338+
condition-operand:
339+
condition-kind: regex-match
340+
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
341+
label: "${{JUJU_VERSION}}"
342+
on-evaluation-failure: "dont-run"
343+
steps:
344+
- run-integration-test:
345+
test_name: 'manual'
346+
setup_steps: ''
347+
task_name: 'test_spaces_manual'
348+
skip_tasks: 'test_deploy_manual'
305349
publishers:
306350
- integration-artifacts

0 commit comments

Comments
 (0)