-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert vyos jobs to ansible-test (#1742)
Revert vyos jobs to ansible-test Also add ansible versions up to 2.14 and drop 2.10/2.11 Reviewed-by: Jill R <None>
- Loading branch information
Showing
3 changed files
with
128 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,82 +1,127 @@ | ||
| --- | ||
| # ============================================================================= | ||
| # ansible-ee | ||
| - job: | ||
| name: ansible-ee-integration-vyos-latest | ||
| parent: ansible-ee-tests | ||
| pre-run: | ||
| - playbooks/ansible-ee/integration/pre.yaml | ||
| # Ensure we install the bindeps | ||
| - playbooks/ansible-network-appliance-base/pre.yaml | ||
| - playbooks/ansible-network-vyos-appliance/pre.yaml | ||
| - playbooks/ansible-ee/vyos-vyos/pre.yaml | ||
| run: playbooks/ansible-ee/integration/run.yaml | ||
| vars: | ||
| ansible_runner_container_version: latest | ||
| container_image_tests: | ||
| - integration | ||
| test_ansible_network_cli_ssh_type: paramiko | ||
| test_ansible_ssh_private_key_file: ~/.ssh/id_rsa | ||
| test_ansible_python_interpreter: /usr/bin/python3.9 | ||
| test_ansible_skip_tags: local | ||
| ansible_test_python: 3.9 | ||
| # NOTE(pabelanger): We can only use RSA ssh keys for vyos. | ||
| test_fips_mode: false | ||
| name: ansible-network-vyos-appliance | ||
| parent: ansible-network-appliance-base | ||
| pre-run: playbooks/ansible-network-vyos-appliance/pre.yaml | ||
| run: playbooks/ansible-network-vyos-appliance/run.yaml | ||
| host-vars: | ||
| vyos: | ||
| ansible_network_os: vyos | ||
| required-projects: | ||
| - name: github.com/ansible/ansible-zuul-jobs | ||
| nodeset: vyos-1.1 | ||
|
|
||
| - job: | ||
| name: ansible-test-network-integration-vyos | ||
| abstract: true | ||
| dependencies: | ||
| - name: build-ansible-collection | ||
| soft: true | ||
| parent: ansible-network-vyos-appliance | ||
| pre-run: | ||
| - playbooks/ansible-test-base/pre.yaml | ||
| - playbooks/ansible-test-network-integration-base/pre.yaml | ||
| run: playbooks/ansible-test-base/run.yaml | ||
| post-run: | ||
| - playbooks/ansible-test-network-integration-base/post.yaml | ||
| - playbooks/ansible-test-base/post.yaml | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| - name: github.com/ansible-collections/vyos.vyos | ||
| timeout: 10800 | ||
| vars: | ||
| ansible_collections_repo: github.com/ansible-collections/vyos.vyos | ||
| ansible_test_command: network-integration | ||
| ansible_test_integration_targets: "vyos_.*" | ||
| ansible_test_python: 3.9 | ||
| # NOTE(pabelanger): We can only use RSA ssh keys for vyos. | ||
| test_fips_mode: false | ||
| files: | ||
| - ^plugins/.*$ | ||
| - ^tests/integration/.*$ | ||
| - ^requirements.txt | ||
| - ^bindep.txt | ||
|
|
||
| # paramiko | ||
| - job: | ||
| name: ansible-ee-integration-vyos-stable-2.12 | ||
| parent: ansible-ee-integration-vyos-latest | ||
| name: ansible-test-network-integration-vyos-paramiko | ||
| parent: ansible-test-network-integration-vyos | ||
| abstract: true | ||
| vars: | ||
| ansible_runner_container_version: stable-2.12-devel | ||
| ansible_test_network_cli_ssh_type: paramiko | ||
|
|
||
| - job: | ||
| name: ansible-ee-integration-vyos-stable-2.11 | ||
| parent: ansible-ee-integration-vyos-latest | ||
| name: ansible-test-network-integration-vyos-paramiko-python36-stable29 | ||
| parent: ansible-test-network-integration-vyos-paramiko | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.9 | ||
| vars: | ||
| ansible_runner_container_version: stable-2.11-devel | ||
| ansible_test_python: 3.6 | ||
|
|
||
| - job: | ||
| name: ansible-ee-integration-vyos-stable-2.9 | ||
| parent: ansible-ee-integration-vyos-latest | ||
| vars: | ||
| test_ansible_python_interpreter: /usr/bin/python3.8 | ||
| ansible_runner_container_version: stable-2.9-devel | ||
| test_ansible_skip_tags: "" | ||
| name: ansible-test-network-integration-vyos-paramiko-python39-stable212 | ||
| parent: ansible-test-network-integration-vyos-paramiko | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.12 | ||
|
|
||
| - job: | ||
| name: ansible-test-network-integration-vyos-paramiko-python39-stable213 | ||
| parent: ansible-test-network-integration-vyos-paramiko | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.13 | ||
|
|
||
| - job: | ||
| name: ansible-test-network-integration-vyos-paramiko-python39-stable214 | ||
| parent: ansible-test-network-integration-vyos-paramiko | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.14 | ||
|
|
||
| - job: | ||
| name: ansible-test-network-integration-vyos-paramiko-python39-devel | ||
| parent: ansible-test-network-integration-vyos-paramiko | ||
|
|
||
| # libssh | ||
| - job: | ||
| name: ansible-ee-integration-vyos-libssh-latest | ||
| parent: ansible-ee-integration-vyos-latest | ||
| name: ansible-test-network-integration-vyos-libssh | ||
| parent: ansible-test-network-integration-vyos | ||
| abstract: true | ||
| vars: | ||
| test_ansible_network_cli_ssh_type: libssh | ||
| ansible_test_network_cli_ssh_type: libssh | ||
|
|
||
| - job: | ||
| name: ansible-ee-integration-vyos-libssh-stable-2.12 | ||
| parent: ansible-ee-integration-vyos-libssh-latest | ||
| name: ansible-test-network-integration-vyos-libssh-python36-stable29 | ||
| parent: ansible-test-network-integration-vyos-libssh | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.9 | ||
| vars: | ||
| ansible_runner_container_version: stable-2.12-devel | ||
| ansible_test_python: 3.6 | ||
|
|
||
| - job: | ||
| name: ansible-ee-integration-vyos-libssh-stable-2.11 | ||
| parent: ansible-ee-integration-vyos-libssh-latest | ||
| vars: | ||
| ansible_runner_container_version: stable-2.11-devel | ||
| name: ansible-test-network-integration-vyos-libssh-python39-stable212 | ||
| parent: ansible-test-network-integration-vyos-libssh | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.12 | ||
|
|
||
| - job: | ||
| name: ansible-ee-integration-vyos-libssh-stable-2.9 | ||
| parent: ansible-ee-integration-vyos-libssh-latest | ||
| vars: | ||
| test_ansible_python_interpreter: /usr/bin/python3.8 | ||
| ansible_runner_container_version: stable-2.9-devel | ||
| name: ansible-test-network-integration-vyos-libssh-python39-stable213 | ||
| parent: ansible-test-network-integration-vyos-libssh | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.13 | ||
|
|
||
| - job: | ||
| name: ansible-test-network-integration-vyos-libssh-python39-stable214 | ||
| parent: ansible-test-network-integration-vyos-libssh | ||
| required-projects: | ||
| - name: github.com/ansible/ansible | ||
| override-checkout: stable-2.14 | ||
|
|
||
| - job: | ||
| name: ansible-test-network-integration-vyos-libssh-python39-devel | ||
| parent: ansible-test-network-integration-vyos-libssh |