Skip to content

Commit 606f816

Browse files
committed
extend Zuul scripting to include kaas job
Signed-off-by: Matthias Büchse <[email protected]>
1 parent e6d412a commit 606f816

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-1
lines changed

.zuul.d/config.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,27 @@
3030
nodeset: pod-fedora-40
3131
vars:
3232
preset: default
33+
do_provision: false
34+
do_cleanup: true
3335
pre-run:
3436
- playbooks/pre.yaml
3537
- playbooks/pre_cloud.yaml
3638
run: playbooks/compliance_check.yaml
39+
post-run:
40+
- playbooks/post_cloud.yaml
3741
- job:
3842
name: scs-check-scs2-main
3943
parent: scs-check-scs2
4044
branches: main
4145
- job:
42-
name: scs-check-all
46+
name: scs-check-iaas
4347
parent: scs-check-scs2-main
4448
vars:
4549
preset: all
50+
- job:
51+
name: scs-check-kaas
52+
parent: scs-check-scs2-main
53+
vars:
54+
preset: kaas
55+
do_provision: true
56+
do_cleanup: false

playbooks/post_cloud.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
- name: Potentially cleanup cloud after run
3+
hosts: all
4+
tasks:
5+
- name: Clean up any lingering resources
6+
ansible.builtin.command:
7+
cmd: python3 Tests/scs-test-runner.py --config Tests/config.toml --debug cleanup --preset {{ preset }}
8+
chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
9+
changed_when: true
10+
when: '{{ do_cleanup }}'
11+
12+
- name: Unprovision clusters
13+
ansible.builtin.command:
14+
cmd: python3 Tests/scs-test-runner.py --config Tests/config.toml --debug unprovision --preset {{ preset }}
15+
chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
16+
changed_when: true
17+
when: '{{ do_provision }}'

playbooks/pre_cloud.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,11 @@
4545
cmd: python3 Tests/scs-test-runner.py --config Tests/config.toml --debug cleanup --preset {{ preset }}
4646
chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
4747
changed_when: true
48+
when: '{{ do_cleanup }}'
49+
50+
- name: Provision necessary clusters
51+
ansible.builtin.command:
52+
cmd: python3 Tests/scs-test-runner.py --config Tests/config.toml --debug provision --preset {{ preset }}
53+
chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
54+
changed_when: true
55+
when: '{{ do_provision }}'

0 commit comments

Comments
 (0)