diff --git a/playbooks/ansible-network-asa-appliance/pre.yaml b/playbooks/ansible-network-asa-appliance/pre.yaml index bc3170734..f6a5726c8 100644 --- a/playbooks/ansible-network-asa-appliance/pre.yaml +++ b/playbooks/ansible-network-asa-appliance/pre.yaml @@ -1,5 +1,6 @@ --- - hosts: controller + gather_facts: true tasks: - name: Ensure tox include_role: diff --git a/zuul.d/cisco-asa-jobs.yaml b/zuul.d/cisco-asa-jobs.yaml index 934ed4b1d..f6bccd796 100644 --- a/zuul.d/cisco-asa-jobs.yaml +++ b/zuul.d/cisco-asa-jobs.yaml @@ -38,8 +38,8 @@ ansible_test_integration_targets: "asa_.*" - job: - name: ansible-test-units-asa-python27 - parent: ansible-test-units-base-python27 + name: ansible-test-units-asa-python39 + parent: ansible-test-units-base-python39 required-projects: - name: github.com/ansible-collections/cisco.asa vars: @@ -62,46 +62,18 @@ ansible_collections_repo: github.com/ansible-collections/cisco.asa - job: - name: ansible-test-network-integration-asa-python27 + name: ansible-test-network-integration-asa-python39 parent: ansible-test-network-integration-asa nodeset: asav9-12-3 vars: - ansible_test_python: 2.7 + ansible_test_python: 3.9 - job: - name: ansible-test-network-integration-asa-python27-stable211 - parent: ansible-test-network-integration-asa - nodeset: asav9-12-3 - required-projects: - - name: github.com/ansible/ansible - override-checkout: stable-2.11 - vars: - ansible_test_python: 2.7 - -- job: - name: ansible-test-network-integration-asa-python27-stable29 - parent: ansible-test-network-integration-asa - nodeset: asav9-12-3 - required-projects: - - name: github.com/ansible/ansible - override-checkout: stable-2.9 - vars: - ansible_test_python: 2.7 - -- job: - name: ansible-test-network-integration-asa-python38 - parent: ansible-test-network-integration-asa - nodeset: asav9-12-3 - vars: - ansible_test_python: 3.8 - -- job: - name: ansible-test-network-integration-asa-libssh-python38 - parent: ansible-test-network-integration-asa-python38 + name: ansible-test-network-integration-asa-libssh-python39 + parent: ansible-test-network-integration-asa-python39 vars: ansible_test_network_cli_ssh_type: libssh - - job: name: ansible-test-network-integration-asa-python38-stable212 parent: ansible-test-network-integration-asa @@ -142,6 +114,7 @@ - name: github.com/ansible/ansible override-checkout: stable-2.9 vars: + test_ansible_python_interpreter: /usr/bin/python3.8 ansible_test_python: 3.8 - job: @@ -149,3 +122,4 @@ parent: ansible-test-network-integration-asa-python38-stable29 vars: ansible_test_network_cli_ssh_type: libssh + test_ansible_python_interpreter: /usr/bin/python3.8 diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 58639f28d..36dedce7e 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -321,7 +321,7 @@ - ansible-test-sanity-docker-stable-2.10 - ansible-test-sanity-docker-stable-2.11 - ansible-test-sanity-docker-stable-2.12 - - ansible-test-units-asa-python27 + - ansible-test-units-asa-python39 - ansible-test-units-asa-python36 - ansible-test-units-asa-python37 gate: @@ -332,16 +332,19 @@ name: ansible-collections-cisco-asa check: jobs: &ansible-collections-cisco-asa-jobs - - ansible-test-network-integration-asa-python27-stable211 - - ansible-test-network-integration-asa-python27-stable29 - - ansible-test-network-integration-asa-python38 - - ansible-test-network-integration-asa-python38-stable212 - - ansible-test-network-integration-asa-python38-stable211 - - ansible-test-network-integration-asa-python38-stable29 - - ansible-test-network-integration-asa-libssh-python38 + - ansible-test-network-integration-asa-python39: + voting: false + - ansible-test-network-integration-asa-python38-stable212: + voting: false + - ansible-test-network-integration-asa-python38-stable211: + voting: false + - ansible-test-network-integration-asa-python38-stable29: + voting: false + - ansible-test-network-integration-asa-libssh-python39 - ansible-test-network-integration-asa-libssh-python38-stable212 - ansible-test-network-integration-asa-libssh-python38-stable211 - - ansible-test-network-integration-asa-libssh-python38-stable29 + - ansible-test-network-integration-asa-libssh-python38-stable29: + voting: false - build-ansible-collection: required-projects: - name: github.com/ansible-collections/ansible.netcommon