From f97d867be3990943e1f532cd166df80e390ab3b5 Mon Sep 17 00:00:00 2001 From: Juanje Ojeda Date: Mon, 10 Aug 2020 19:55:57 +0100 Subject: [PATCH] playbooks: remove version specific playbooks as now all reuse the same files --- playbooks/fedora-31/pre-common.yaml | 12 --------- playbooks/fedora-31/setup-env.yaml | 25 ------------------ .../fedora-31/system-test-fedora-31.yaml | 21 --------------- playbooks/fedora-32/pre-common.yaml | 12 --------- playbooks/fedora-32/setup-env.yaml | 26 ------------------- .../fedora-32/system-test-fedora-32.yaml | 21 --------------- playbooks/fedora-rawhide/pre-common.yaml | 12 --------- playbooks/fedora-rawhide/setup-env.yaml | 26 ------------------- .../system-test-fedora-rawhide.yaml | 21 --------------- 9 files changed, 176 deletions(-) delete mode 100644 playbooks/fedora-31/pre-common.yaml delete mode 100644 playbooks/fedora-31/setup-env.yaml delete mode 100644 playbooks/fedora-31/system-test-fedora-31.yaml delete mode 100644 playbooks/fedora-32/pre-common.yaml delete mode 100644 playbooks/fedora-32/setup-env.yaml delete mode 100644 playbooks/fedora-32/system-test-fedora-32.yaml delete mode 100644 playbooks/fedora-rawhide/pre-common.yaml delete mode 100644 playbooks/fedora-rawhide/setup-env.yaml delete mode 100644 playbooks/fedora-rawhide/system-test-fedora-rawhide.yaml diff --git a/playbooks/fedora-31/pre-common.yaml b/playbooks/fedora-31/pre-common.yaml deleted file mode 100644 index 2bfedc447..000000000 --- a/playbooks/fedora-31/pre-common.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Install Bats' support library - git: - repo: https://github.com/ztombol/bats-support - dest: '{{ zuul.project.src_dir }}/test/system/libs/bats-support' - depth: 1 - -- name: Install Bats assert library - git: - repo: https://github.com/ztombol/bats-assert - dest: '{{ zuul.project.src_dir }}/test/system/libs/bats-assert' - depth: 1 diff --git a/playbooks/fedora-31/setup-env.yaml b/playbooks/fedora-31/setup-env.yaml deleted file mode 100644 index 563cc3a70..000000000 --- a/playbooks/fedora-31/setup-env.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -- hosts: all - tasks: - - name: Install requirements - become: yes - package: - name: - - golang - - golang-github-cpuguy83-md2man - - ninja-build - - meson - - flatpak-session-helper - - systemd - - bats - - bash-completion - - udisks2 - - podman - - - name: Setup environment (create missing /run/media) - command: sudo systemd-tmpfiles --create - - - name: Check versions of crucial packages - command: rpm -q golang podman crun conmon fuse-overlayfs flatpak-session-helper - - - include_tasks: ./pre-common.yaml diff --git a/playbooks/fedora-31/system-test-fedora-31.yaml b/playbooks/fedora-31/system-test-fedora-31.yaml deleted file mode 100644 index 12ad0fe5e..000000000 --- a/playbooks/fedora-31/system-test-fedora-31.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- hosts: ci-node-31 - 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 }}' diff --git a/playbooks/fedora-32/pre-common.yaml b/playbooks/fedora-32/pre-common.yaml deleted file mode 100644 index 2bfedc447..000000000 --- a/playbooks/fedora-32/pre-common.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Install Bats' support library - git: - repo: https://github.com/ztombol/bats-support - dest: '{{ zuul.project.src_dir }}/test/system/libs/bats-support' - depth: 1 - -- name: Install Bats assert library - git: - repo: https://github.com/ztombol/bats-assert - dest: '{{ zuul.project.src_dir }}/test/system/libs/bats-assert' - depth: 1 diff --git a/playbooks/fedora-32/setup-env.yaml b/playbooks/fedora-32/setup-env.yaml deleted file mode 100644 index 0a53542b0..000000000 --- a/playbooks/fedora-32/setup-env.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- hosts: all - tasks: - - name: Install requirements - become: yes - package: - use: dnf - name: - - golang - - golang-github-cpuguy83-md2man - - ninja-build - - meson - - flatpak-session-helper - - systemd - - bats - - bash-completion - - udisks2 - - podman - - - name: Setup environment (create missing /run/media) - command: sudo systemd-tmpfiles --create - - - name: Check versions of crucial packages - command: rpm -q golang podman crun conmon fuse-overlayfs flatpak-session-helper - - - include_tasks: ./pre-common.yaml diff --git a/playbooks/fedora-32/system-test-fedora-32.yaml b/playbooks/fedora-32/system-test-fedora-32.yaml deleted file mode 100644 index b4b7243c6..000000000 --- a/playbooks/fedora-32/system-test-fedora-32.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- hosts: ci-node-32 - 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 }}' diff --git a/playbooks/fedora-rawhide/pre-common.yaml b/playbooks/fedora-rawhide/pre-common.yaml deleted file mode 100644 index 2bfedc447..000000000 --- a/playbooks/fedora-rawhide/pre-common.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Install Bats' support library - git: - repo: https://github.com/ztombol/bats-support - dest: '{{ zuul.project.src_dir }}/test/system/libs/bats-support' - depth: 1 - -- name: Install Bats assert library - git: - repo: https://github.com/ztombol/bats-assert - dest: '{{ zuul.project.src_dir }}/test/system/libs/bats-assert' - depth: 1 diff --git a/playbooks/fedora-rawhide/setup-env.yaml b/playbooks/fedora-rawhide/setup-env.yaml deleted file mode 100644 index 0a53542b0..000000000 --- a/playbooks/fedora-rawhide/setup-env.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- hosts: all - tasks: - - name: Install requirements - become: yes - package: - use: dnf - name: - - golang - - golang-github-cpuguy83-md2man - - ninja-build - - meson - - flatpak-session-helper - - systemd - - bats - - bash-completion - - udisks2 - - podman - - - name: Setup environment (create missing /run/media) - command: sudo systemd-tmpfiles --create - - - name: Check versions of crucial packages - command: rpm -q golang podman crun conmon fuse-overlayfs flatpak-session-helper - - - include_tasks: ./pre-common.yaml diff --git a/playbooks/fedora-rawhide/system-test-fedora-rawhide.yaml b/playbooks/fedora-rawhide/system-test-fedora-rawhide.yaml deleted file mode 100644 index e42d27450..000000000 --- a/playbooks/fedora-rawhide/system-test-fedora-rawhide.yaml +++ /dev/null @@ -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 }}'