Skip to content

Commit

Permalink
Don't gather all facts in molecule tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rabi committed Sep 26, 2024
1 parent 91825f1 commit 1df8ea8
Show file tree
Hide file tree
Showing 133 changed files with 319 additions and 21 deletions.
1 change: 0 additions & 1 deletion molecule/common/test_deps/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

test_deps_extra_packages: []
test_deps_setup_edpm: false
test_deps_repo_version: "{{ ansible_facts['distribution'] | lower }}{{ ansible_facts['distribution_major_version'] }}-master"
test_deps_mirrors_file_path: /etc/ci/mirror_info.sh
test_deps_setup_stream: true
test_deps_setup_ceph: false
4 changes: 0 additions & 4 deletions molecule/common/test_deps/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ argument_specs:
type: bool
default: false

test_deps_repo_version:
type: str
default: "{{ ansible_facts['distribution'] | lower }}{{ ansible_facts['distribution_major_version'] }}-master"

test_deps_mirrors_file_path:
type: str
default: /etc/ci/mirror_info.sh
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_bootstrap/molecule/default/converge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
- name: Converge
hosts: all
gather_facts: false
tasks:
- name: "Download required role packages"
ansible.builtin.include_role:
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_bootstrap/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_extra_packages:
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_ceph_client_files/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Converge
hosts: all
gather_facts: false
tasks:
- name: "Include edpm_ceph_client_files"
ansible.builtin.include_role:
Expand Down
2 changes: 2 additions & 0 deletions roles/edpm_ceph_client_files/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
- name: Prepare
hosts: all
gather_facts: false
roles:
- role: osp.edpm.env_data
2 changes: 2 additions & 0 deletions roles/edpm_ceph_hci_pre/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@

- name: Converge defaults
hosts: all
gather_facts: false
roles:
- role: "edpm_ceph_hci_pre"

- name: Converge overrides
hosts: all
gather_facts: false
vars:
edpm_ceph_hci_pre_firewall_yaml_file: /var/lib/edpm-config/firewall/ceph-networks-overrides.yaml
edpm_ceph_hci_pre_storage_ranges: [172.18.0.0/24]
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_ceph_hci_pre/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@

- name: Prepare
hosts: all
gather_facts: false
roles:
- role: osp.edpm.env_data
1 change: 1 addition & 0 deletions roles/edpm_ceph_hci_pre/molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

- name: Verify
hosts: all
gather_facts: false
tasks:
- name: Read generated file from defaults
command: cat /var/lib/edpm-config/firewall/ceph-networks.yaml
Expand Down
2 changes: 2 additions & 0 deletions roles/edpm_container_manage/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_extra_packages:
- podman
- name: Prepare
hosts: all
gather_facts: false
become: true
roles:
- role: osp.edpm.env_data
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_container_rm/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- name: Converge
become: true
hosts: all
gather_facts: false
roles:
- role: osp.edpm.edpm_container_rm
edpm_container_cli: podman
Expand Down
3 changes: 2 additions & 1 deletion roles/edpm_container_rm/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_extra_packages:
- podman
- name: Prepare
hosts: all
become: true
gather_facts: true
gather_facts: false
roles:
- role: osp.edpm.env_data
post_tasks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- name: Converge
become: true
hosts: all
gather_facts: false
roles:
- role: osp.edpm.edpm_container_rm
edpm_container_cli: podman
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_extra_packages:
Expand All @@ -23,7 +24,7 @@
- name: Prepare
hosts: all
become: true
gather_facts: true
gather_facts: false
roles:
- role: osp.edpm.env_data
post_tasks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Converge
hosts: all
gather_facts: false
vars:
edpm_container_standalone_service: test
edpm_container_standalone_container_defs:
Expand Down
2 changes: 2 additions & 0 deletions roles/edpm_container_standalone/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_extra_packages:
- podman
- name: Prepare
hosts: all
gather_facts: false
become: true
roles:
- role: osp.edpm.env_data
1 change: 1 addition & 0 deletions roles/edpm_ddp_package/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- name: Converge
become: true
hosts: all
gather_facts: false
vars:
edpm_ddp_package_path: "{{lookup('env', 'MOLECULE_SCENARIO_DIRECTORY')}}/test-data"
ddp_packages:
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_ddp_package/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_setup_edpm: true
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_ddp_package/molecule/default/verify.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
- name: Verify
hosts: all
gather_facts: false
vars:
ddp_module_file: "{{ lookup('env', 'MOLECULE_SCENARIO_DIRECTORY') }}/test-data/ddp/ice.pkg"
tasks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@
- name: Converge
become: true
hosts: all
gather_facts: false
pre_tasks:
- name: Gather user fact
ansible.builtin.setup:
gather_subset:
- "!all"
- "!min"
- "user"

- name: set basic user fact
set_fact:
ansible_user: "{{ ansible_user_id | default(lookup('env', 'USER'))}}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_setup_edpm: true
Expand All @@ -25,7 +26,15 @@

- name: Setup user details
hosts: all
gather_facts: false
pre_tasks:
- name: Gather user fact
ansible.builtin.setup:
gather_subset:
- "!all"
- "!min"
- "user"

- name: set basic user fact
set_fact:
ansible_user: "{{ ansible_user_id | default(lookup('env', 'USER'))}}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
- name: Verify
hosts: all
gather_facts: false
tasks:
- name: Verify derive pci device spec file exists
become: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@
msg: "List of sriov device_spec cannot be empty - edpm_derive_sriov_device_spec_list"
when: edpm_derive_sriov_device_spec_list | length == 0

- name: Gather user fact
ansible.builtin.setup:
gather_subset:
- "!all"
- "!min"
- "user"
when:
- ansible_user is undefined

- name: Create neutron-sriov-agent directories
become: true
ansible.builtin.file:
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_download_cache/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Converge
hosts: all
gather_facts: false
vars:
edpm_services:
- bootstrap
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_download_cache/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_setup_edpm: true
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_extra_mounts/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Converge
hosts: all
gather_facts: false
tasks:
- name: "Include edpm_users with non default config"
ansible.builtin.include_role:
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_extra_mounts/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Prepare
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
- role: env_data
8 changes: 8 additions & 0 deletions roles/edpm_extra_mounts/tasks/extra_mounts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
- name: Gather user fact
ansible.builtin.setup:
gather_subset:
- "!all"
- "!min"
- "user"
when:
- ansible_user is undefined

- name: Create host directories for edpm_default_mounts
become: true
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_frr/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- name: Converge
hosts: all
become: true
gather_facts: false
vars:
edpm_download_cache_podman_auth_file: "" # Override since the file doesn't exist
pre_tasks:
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_frr/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_extra_packages:
Expand Down
8 changes: 8 additions & 0 deletions roles/edpm_frr/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
- name: Gather user fact
ansible.builtin.setup:
gather_subset:
- "!all"
- "!min"
- "user"
when:
- ansible_user is undefined

- name: Create persistent directories
become: true
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_growvols/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@

- name: Converge
hosts: all
gather_facts: false
roles:
- role: "edpm_growvols"
2 changes: 2 additions & 0 deletions roles/edpm_growvols/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
- name: Prepare
hosts: all
gather_facts: false
roles:
- role: osp.edpm.env_data
1 change: 1 addition & 0 deletions roles/edpm_iscsid/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Converge
hosts: all
gather_facts: false
become: true
tasks:
- name: Install iscsid
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_iscsid/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
test_deps_extra_packages:
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_kernel/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Converge
hosts: all
gather_facts: false
pre_tasks:
- name: Backing up /etc/default/grub
import_tasks: ../../resources/molecule/backup_grub.yml
Expand Down
1 change: 1 addition & 0 deletions roles/edpm_kernel/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
# under the License.
- name: Prepare test_deps
hosts: all
gather_facts: false
roles:
- role: ../../../../molecule/common/test_deps
1 change: 1 addition & 0 deletions roles/edpm_kernel/molecule/extra/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

- name: Converge
hosts: all
gather_facts: false
pre_tasks:
- name: Backing up /etc/default/grub
ansible.builtin.import_tasks: ../../resources/molecule/backup_grub.yml
Expand Down
Loading

0 comments on commit 1df8ea8

Please sign in to comment.