Skip to content

Commit

Permalink
Revert "Allow specifying python and ansible versions per component (#21
Browse files Browse the repository at this point in the history
…)"

This reverts commit 66bf915.
  • Loading branch information
dometto committed Sep 17, 2024
1 parent a79ca86 commit 1cb7c30
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 73 deletions.
25 changes: 0 additions & 25 deletions _run_component.yml

This file was deleted.

41 changes: 0 additions & 41 deletions _setup_ansible.yml

This file was deleted.

14 changes: 11 additions & 3 deletions converge.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
---
- name: Converge
hosts: all
gather_facts: true
gather_facts: false
tasks:
- name: Debug -- list all components to be executed
ansible.builtin.debug:
msg: "{{ item.name }}"
with_items: "{{ lookup('env', 'components') }}"

- name: Run component
ansible.builtin.include_tasks: _run_component.yml
- name: Test the component by executing it using ansible on the workspace

Check warning on line 11 in converge.yml

View workflow job for this annotation

GitHub Actions / Ansible Lint

jinja[spacing]

Jinja2 spacing could be improved: ansible-playbook -c local -v -b {{ remote_plugin.arguments }} --extra-vars='{{ remote_plugin.parameters }}' /rsc/plugins/{{ item.name}}/{{ item.path }}
ansible.builtin.command: >
ansible-playbook -c local -v -b {{ remote_plugin.arguments }} --extra-vars='{{ remote_plugin.parameters }}' /rsc/plugins/{{ item.name}}/{{ item.path }}
register: ansible_on_workspace
changed_when: "ansible_on_workspace.stdout_lines is not defined or 'changed=0' not in ansible_on_workspace.stdout_lines[-1]"
vars:
remote_plugin:
script_type: Ansible PlayBook
arguments: -i 127.0.0.1, --skip-tags {{ ansible_skip_tags | join(',') }}
parameters: "{{ item.parameters | default({}) | to_json }}"
with_items: "{{ lookup('env', 'components') }}"
8 changes: 4 additions & 4 deletions prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
ssh_connection_multiplexing: true
with_items: "{{ lookup('env', 'components') }}"

- name: Install dependencies
# Apt cache is normally updated at deploy time by the SRC-OS component.
# Make sure it is fresh so our tests use recent apt repo information.
- name: Update apt cache
ansible.builtin.apt:
pkg:
- dirmngr
update_cache: true
when: ansible_pkg_mgr == 'apt'
when: ansible_os_family == 'Debian'

- name: Set extra_preparations var
ansible.builtin.set_fact:
Expand Down

0 comments on commit 1cb7c30

Please sign in to comment.