diff --git a/.zuul.yaml b/.zuul.yaml index bed28aa5..af60f13e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -256,7 +256,7 @@ - job: name: ansible-collections-openstack-release - parent: base + parent: openstack-tox-linters-ansible run: ci/publish/publish_collection.yml secrets: - ansible_galaxy_info diff --git a/ci/publish/publish_collection.yml b/ci/publish/publish_collection.yml index 5e8adf60..62905add 100644 --- a/ci/publish/publish_collection.yml +++ b/ci/publish/publish_collection.yml @@ -3,7 +3,8 @@ vars: collection_path: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" build_collection_path: /tmp/collection_built/ - ansible_galaxy_path: "~/.local/bin/ansible-galaxy" + ansible_virtualenv_path: /tmp/ansible_venv + ansible_galaxy_path: "{{ ansible_virtualenv_path }}/bin/ansible-galaxy" tasks: @@ -11,9 +12,15 @@ include_role: name: ensure-pip - - name: Install ansible + - name: Install Ansible in virtualenv pip: - name: ansible-core<2.12 + name: ansible-core<2.19 + virtualenv: "{{ ansible_virtualenv_path }}" + virtualenv_command: "{{ ensure_pip_virtualenv_command }}" + + - name: Detect ansible version + command: "{{ ansible_virtualenv_path }}/bin/ansible --version" + register: ansible_version - name: Discover tag version set_fact: