From f3a15c60febb2875c101716d3c6adaf6ebb58f3f Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 31 Aug 2022 13:09:44 +0200 Subject: [PATCH] playbooks: Split out the post-configuration steps into a separate file A subsequent commit will introduce builds performed with the -Dmigration_path_for_coreos_toolbox option to the CI. It will be good to avoid duplicating the build and installation steps for builds with and without the -Dmigration_path_for_coreos_toolbox option. https://github.com/containers/toolbox/pull/1095 --- playbooks/build.yaml | 12 ++++++++++++ playbooks/setup-env.yaml | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 playbooks/build.yaml diff --git a/playbooks/build.yaml b/playbooks/build.yaml new file mode 100644 index 0000000..1866084 --- /dev/null +++ b/playbooks/build.yaml @@ -0,0 +1,12 @@ +- name: Build Toolbox + command: ninja -C builddir + args: + chdir: '{{ zuul.project.src_dir }}' + creates: builddir/src/toolbox + +- name: Install Toolbox + become: yes + command: ninja -C builddir install + args: + chdir: '{{ zuul.project.src_dir }}' + creates: /usr/local/bin/toolbox diff --git a/playbooks/setup-env.yaml b/playbooks/setup-env.yaml index 6ae4056..1031b55 100644 --- a/playbooks/setup-env.yaml +++ b/playbooks/setup-env.yaml @@ -8,15 +8,4 @@ args: chdir: '{{ zuul.project.src_dir }}' - - name: Build Toolbox - command: ninja -C builddir - args: - chdir: '{{ zuul.project.src_dir }}' - creates: builddir/src/toolbox - - - name: Install Toolbox - become: yes - command: ninja -C builddir install - args: - chdir: '{{ zuul.project.src_dir }}' - creates: /usr/local/bin/toolbox + - include_tasks: build.yaml