diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-11-20 09:45:15 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2014-11-20 09:45:15 +0100 |
| commit | 5268c1ed3fb9816022618ef02995300a6221d98e (patch) | |
| tree | 419a0202369123a4a97347f46fa5b0421a8ad2ca /controller/share/dtf-controller/ansible | |
| parent | 16009ef5ac761b2d21ebf3618c1cedfa75b046d8 (diff) | |
| download | postgresql-setup-tests-5268c1ed3fb9816022618ef02995300a6221d98e.tar.gz postgresql-setup-tests-5268c1ed3fb9816022618ef02995300a6221d98e.tar.xz postgresql-setup-tests-5268c1ed3fb9816022618ef02995300a6221d98e.zip | |
controller: make the system setup configurable
Add the --setup-playbook option for dtf-run-remote which allows us
to submit configuration (or any) playbook which will be included
into the default one, executed before actual testing.
* controller/Makefile.am: s/fedora.yml/default.yml/.
* controller/bin/dtf-controller.in: Call dtf-remote-run with
--setup-playbook option.
* controller/bin/dtf-run-remote.in: Fix the option parsing. Add
new option --setup-playbook.
(error): New function.
(die): Use '$*' instead of '*@'.
* controller/share/dtf-controller/ansible/playbooks/fedora.yml:
Rename to default.yml.
* controller/share/dtf-controller/ansible/playbooks/default.yml:
Moved from fedora.yml.
* controller/share/--/--/playbooks/include/prepare-testenv.yml:
Removed hard-wired configuration.
Diffstat (limited to 'controller/share/dtf-controller/ansible')
| -rw-r--r-- | controller/share/dtf-controller/ansible/playbooks/default.yml (renamed from controller/share/dtf-controller/ansible/playbooks/fedora.yml) | 5 | ||||
| -rw-r--r-- | controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/controller/share/dtf-controller/ansible/playbooks/fedora.yml b/controller/share/dtf-controller/ansible/playbooks/default.yml index ea39e70..825ee46 100644 --- a/controller/share/dtf-controller/ansible/playbooks/fedora.yml +++ b/controller/share/dtf-controller/ansible/playbooks/default.yml @@ -32,13 +32,14 @@ vars_files: - "{{ opt_generated_vars }}" tasks: + - include: "{{ opt_setup_playbook }}" + when: opt_setup_playbook is defined + - copy: src={{ opt_workdir }}/{{ opt_testsuite_name }}.tar.gz dest=/root/{{ opt_testsuite_name }}.tar.gz - include: "{{ config_ansibleplaybooksdir }}/include/beakerlib.yml" - - include: "{{ config_ansibleplaybooksdir }}/include/prepare-testenv.yml" - - include: "{{ config_ansibleplaybooksdir }}/include/additional-packages.yml" when: dtf_rpm_files_list is defined diff --git a/controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml b/controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml deleted file mode 100644 index a63e51a..0000000 --- a/controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml +++ /dev/null @@ -1,3 +0,0 @@ -- yum: state=present name=postgresql-server - -- yum: state=present name=postgresql-upgrade |