.zuul, playbooks: Unify the system-test*.yaml for all Fedora versions

The playbooks were too fragmented and were hard to maintain. With this
the number of files is significantly lowered.

https://github.com/containers/toolbox/pull/517
https://github.com/containers/toolbox/pull/702
This commit is contained in:
Juanje Ojeda 2021-02-19 18:47:08 +01:00 committed by Debarshi Ray
parent 2a2fd5baa5
commit e654f20d58
5 changed files with 5 additions and 68 deletions

View File

@ -18,7 +18,7 @@
- name: ci-node-32
label: cloud-fedora-32-small
pre-run: playbooks/setup-env.yaml
run: playbooks/fedora-32/system-test-fedora-32.yaml
run: playbooks/system-test.yaml
- job:
name: system-test-fedora-33
@ -29,7 +29,7 @@
- name: ci-node-33
label: cloud-fedora-33-small
pre-run: playbooks/setup-env.yaml
run: playbooks/fedora-33/system-test-fedora-33.yaml
run: playbooks/system-test.yaml
- job:
name: system-test-fedora-34
@ -40,7 +40,7 @@
- name: ci-node-34
label: cloud-fedora-34-small
pre-run: playbooks/setup-env.yaml
run: playbooks/fedora-34/system-test-fedora-34.yaml
run: playbooks/system-test.yaml
- job:
name: system-test-fedora-rawhide
@ -51,7 +51,7 @@
- name: ci-node-rawhide
label: cloud-fedora-rawhide-small
pre-run: playbooks/setup-env.yaml
run: playbooks/fedora-rawhide/system-test-fedora-rawhide.yaml
run: playbooks/system-test.yaml
- project:
periodic:

View File

@ -1,21 +0,0 @@
---
- hosts: ci-node-33
tasks:
- name: Build toolbox
command: meson builddir
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Install toolbox
become: yes
command: ninja -C builddir install
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Run system tests
command: bats ./test/system
environment:
PODMAN: '/usr/bin/podman'
TOOLBOX: '/usr/local/bin/toolbox'
args:
chdir: '{{ zuul.project.src_dir }}'

View File

@ -1,21 +0,0 @@
---
- hosts: ci-node-34
tasks:
- name: Build toolbox
command: meson builddir
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Install toolbox
become: yes
command: ninja -C builddir install
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Run system tests
command: bats ./test/system
environment:
PODMAN: '/usr/bin/podman'
TOOLBOX: '/usr/local/bin/toolbox'
args:
chdir: '{{ zuul.project.src_dir }}'

View File

@ -1,21 +0,0 @@
---
- hosts: ci-node-rawhide
tasks:
- name: Build toolbox
command: meson builddir
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Install toolbox
become: yes
command: ninja -C builddir install
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Run system tests
command: bats ./test/system
environment:
PODMAN: '/usr/bin/podman'
TOOLBOX: '/usr/local/bin/toolbox'
args:
chdir: '{{ zuul.project.src_dir }}'

View File

@ -1,5 +1,5 @@
---
- hosts: ci-node-32
- hosts: all
tasks:
- name: Build toolbox
command: meson builddir