diff options
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 |