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/Makefile.am | |
| 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/Makefile.am')
| -rw-r--r-- | controller/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/controller/Makefile.am b/controller/Makefile.am index e271af9..b35357c 100644 --- a/controller/Makefile.am +++ b/controller/Makefile.am @@ -26,7 +26,7 @@ ansibleplaybooksdir = $(pkgdatadir)/ansible/playbooks ansiblevars_DATA = share/dtf-controller/ansible/vars/generated-vars.yml dtfplaybookdir = $(pkgdatadir)/ansible/playbooks -ansibleplaybooks_DATA = $(srcdir)/share/dtf-controller/ansible/playbooks/fedora.yml +ansibleplaybooks_DATA = $(srcdir)/share/dtf-controller/ansible/playbooks/default.yml resulttemplatedir = $(pkgdatadir)/results-stats-templates resulttemplate_DATA = $(srcdir)/share/dtf-controller/results-stats-templates/html.tmpl @@ -83,9 +83,8 @@ CONTROLLERDATA = \ $(srcdir)/share/dtf-controller/ansible/run_include \ $(srcdir)/share/dtf-controller/ansible/playbooks/include/beakerlib.yml \ $(srcdir)/share/dtf-controller/ansible/playbooks/include/additional-packages.yml \ - $(srcdir)/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml \ $(srcdir)/share/dtf-controller/ansible/playbooks/include/download-results.yml \ - $(srcdir)/share/dtf-controller/ansible/playbooks/fedora.yml \ + $(srcdir)/share/dtf-controller/ansible/playbooks/default.yml \ $(srcdir)/share/dtf-controller/ansible/dummy-wrapper.yml |