From bd8e91fce87ac6b10e1e9ed3781820aa81884b44 Mon Sep 17 00:00:00 2001 From: Michal Zegan Date: Wed, 5 Jun 2019 15:45:55 +0200 Subject: Use the original playbook in play-resources tests This commit includes the original resources.yml playbook by using import_playbook. Some modifications were needed mostly because of the way import_playbook works. Also moved the setup role call to prepare. Change-Id: I8745d5e43fd2050d47970c7d19bbbc4db8a5847f Issue-ID: OOM-1912 Signed-off-by: Michal Zegan --- .../test/play-resources/molecule/default/group_vars/all.yml | 7 ------- ansible/test/play-resources/molecule/default/playbook.yml | 10 ++++++---- ansible/test/play-resources/molecule/default/prepare.yml | 3 +++ ansible/test/play-resources/molecule/default/vars.yml | 7 +++++++ ansible/test/play-resources/molecule/nfs/molecule.yml | 5 ----- ansible/test/play-resources/molecule/nfs/playbook.yml | 12 ++++++------ ansible/test/play-resources/molecule/nfs/prepare.yml | 8 ++++---- ansible/test/play-resources/molecule/nfs/vars.yml | 7 +++++++ 8 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 ansible/test/play-resources/molecule/default/group_vars/all.yml create mode 100644 ansible/test/play-resources/molecule/default/vars.yml create mode 100644 ansible/test/play-resources/molecule/nfs/vars.yml (limited to 'ansible') diff --git a/ansible/test/play-resources/molecule/default/group_vars/all.yml b/ansible/test/play-resources/molecule/default/group_vars/all.yml deleted file mode 100644 index 558eacb2..00000000 --- a/ansible/test/play-resources/molecule/default/group_vars/all.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -app_data_path: /opt/myleculeapp -aux_data_path: "{{ app_data_path }}/runtime_images_source_dir" -resources_dir: /data -resources_filename: resources_package.tar -aux_resources_filename: aux_resources_package.tar -ansible_ssh_private_key_file: ~/.ssh/offline_ssh_key diff --git a/ansible/test/play-resources/molecule/default/playbook.yml b/ansible/test/play-resources/molecule/default/playbook.yml index 50ba233a..096077a2 100644 --- a/ansible/test/play-resources/molecule/default/playbook.yml +++ b/ansible/test/play-resources/molecule/default/playbook.yml @@ -1,6 +1,8 @@ --- -- name: Test resource transfer with ssh +- name: Initialize hosts: all - roles: - - setup - - resource-data + tasks: + - name: Include variables + include_vars: vars.yml + +- import_playbook: ../../../../resources.yml diff --git a/ansible/test/play-resources/molecule/default/prepare.yml b/ansible/test/play-resources/molecule/default/prepare.yml index a4436001..5c8ae654 100644 --- a/ansible/test/play-resources/molecule/default/prepare.yml +++ b/ansible/test/play-resources/molecule/default/prepare.yml @@ -2,4 +2,7 @@ - name: Prepare resource-data hosts: all roles: + - setup - prepare-resource-data + vars_files: + - vars.yml diff --git a/ansible/test/play-resources/molecule/default/vars.yml b/ansible/test/play-resources/molecule/default/vars.yml new file mode 100644 index 00000000..46ab3e04 --- /dev/null +++ b/ansible/test/play-resources/molecule/default/vars.yml @@ -0,0 +1,7 @@ +--- +app_data_path: /opt/moleculeapp +aux_data_path: "{{ app_data_path }}/runtime_images_source_dir" +resources_dir: /data +resources_filename: resources_package.tar +aux_resources_filename: aux_resources_package.tar +ansible_ssh_private_key_file: ~/.ssh/offline_ssh_key diff --git a/ansible/test/play-resources/molecule/nfs/molecule.yml b/ansible/test/play-resources/molecule/nfs/molecule.yml index 9cff6b8d..11726396 100644 --- a/ansible/test/play-resources/molecule/nfs/molecule.yml +++ b/ansible/test/play-resources/molecule/nfs/molecule.yml @@ -32,13 +32,8 @@ platforms: - name: resource-data provisioner: name: ansible - playbooks: - cleanup: ../default/cleanup.yml env: ANSIBLE_ROLES_PATH: ../../../../roles:../../../roles - inventory: - links: - group_vars: ../default/group_vars lint: name: ansible-lint verifier: diff --git a/ansible/test/play-resources/molecule/nfs/playbook.yml b/ansible/test/play-resources/molecule/nfs/playbook.yml index 88440116..096077a2 100644 --- a/ansible/test/play-resources/molecule/nfs/playbook.yml +++ b/ansible/test/play-resources/molecule/nfs/playbook.yml @@ -1,8 +1,8 @@ --- -- name: Test resource transfer with nfs +- name: Initialize hosts: all - roles: - - setup - - role: resource-data - vars: - resources_on_nfs: true + tasks: + - name: Include variables + include_vars: vars.yml + +- import_playbook: ../../../../resources.yml diff --git a/ansible/test/play-resources/molecule/nfs/prepare.yml b/ansible/test/play-resources/molecule/nfs/prepare.yml index d381ba77..2276f2e8 100644 --- a/ansible/test/play-resources/molecule/nfs/prepare.yml +++ b/ansible/test/play-resources/molecule/nfs/prepare.yml @@ -1,7 +1,7 @@ --- -- name: Prepare resource-data +- name: Prepare hosts: all roles: - - role: prepare-resource-data - vars: - resources_on_nfs: true + - prepare-resource-data + vars_files: + - vars.yml diff --git a/ansible/test/play-resources/molecule/nfs/vars.yml b/ansible/test/play-resources/molecule/nfs/vars.yml new file mode 100644 index 00000000..2cc4d258 --- /dev/null +++ b/ansible/test/play-resources/molecule/nfs/vars.yml @@ -0,0 +1,7 @@ +--- +app_data_path: /opt/moleculeapp +aux_data_path: "{{ app_data_path }}/runtime_images_source_dir" +resources_on_nfs: true +resources_dir: /data +resources_filename: resources_package.tar +aux_resources_filename: aux_resources_package.tar -- cgit 1.2.3-korg