Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@
nodes:
- name: centos-9-stream
label: cloud-centos-9-stream
pre-run: playbooks/setup-env-migration-path-for-coreos-toolbox.yaml
pre-run: playbooks/setup-env.yaml
run: playbooks/unit-test.yaml
vars:
dependencies_playbook: dependencies-centos-9-stream.yaml
meson_setup_args: -Dmigration_path_for_coreos_toolbox=true

- job:
name: unit-test-restricted
Expand All @@ -47,8 +50,10 @@
nodes:
- name: fedora-rawhide
label: cloud-fedora-rawhide
pre-run: playbooks/setup-env-restricted.yaml
pre-run: playbooks/setup-env.yaml
run: playbooks/unit-test.yaml
vars:
dependencies_playbook: dependencies-fedora-restricted.yaml

- job:
name: system-test-fedora-rawhide-commands-options
Expand Down
25 changes: 0 additions & 25 deletions playbooks/setup-env-migration-path-for-coreos-toolbox.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions playbooks/setup-env-restricted.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions playbooks/setup-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
---
- hosts: all
tasks:
- include_tasks: dependencies-fedora.yaml
- include_tasks: "{{ dependencies_playbook | default('dependencies-fedora.yaml') }}"

- name: Set up build directory
command: meson setup builddir
command: meson setup {{ meson_setup_args | default('') }} builddir
args:
chdir: '{{ zuul.project.src_dir }}'
Loading