Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add py3.9 test jobs #1520

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions playbooks/ansible-cloud/py39/pre.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
- hosts: all
tasks:
- name: Ensure python3.9 is present (Red Hat)
become: true
package:
name:
- python3.9
- gcc
state: present
when: ansible_os_family == "RedHat"
58 changes: 52 additions & 6 deletions zuul.d/ansible-cloud-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@
semaphore: ansible-test-cloud-integration-vmware-rest

- job:
name: ansible-test-cloud-integration-vmware-rest-python38
name: ansible-test-cloud-integration-vmware-rest-python39
parent: ansible-test-cloud-integration-vmware-rest
vars:
ansible_test_python: 3.8
ansible_test_python: 3.9


##### units
Expand Down Expand Up @@ -253,7 +253,7 @@
timeout: 3600
vars:
ansible_test_command: integration
ansible_test_python: 3.8
ansible_test_python: 3.9
ansible_test_retry_on_error: true
ansible_test_requirement_files:
- requirements.txt
Expand Down Expand Up @@ -388,7 +388,7 @@
timeout: 3600
vars:
ansible_test_command: integration
ansible_test_python: 3.8
ansible_test_python: 3.9
ansible_test_integration_targets: ""
ansible_collections_repo: "{{ zuul.project.canonical_name }}"

Expand All @@ -408,17 +408,41 @@
ansible_test_constraint_files:
- tests/unit/constraints.txt

- job:
name: ansible-test-units-amazon-aws-python39
parent: ansible-test-units-base-python39
vars:
ansible_collections_repo: "{{ zuul.project.canonical_name }}"
ansible_test_requirement_files:
- requirements.txt
- test-requirements.txt
# Ansible-test picks up requirements and constraints from
# tests/unit when running in docker, mirror this
- tests/unit/requirements.txt
ansible_test_constraint_files:
- tests/unit/constraints.txt

- job:
name: ansible-test-units-amazon-cloud-python38
parent: ansible-test-units-base-python38
vars:
ansible_collections_repo: "{{ zuul.project.canonical_name }}"

- job:
name: ansible-test-units-amazon-cloud-python39
parent: ansible-test-units-base-python39
vars:
ansible_collections_repo: "{{ zuul.project.canonical_name }}"

# TODO(Gonéri): do we still need this flavor of the job?
- job:
name: ansible-test-units-community-aws-python38
parent: ansible-test-units-amazon-aws-python38

- job:
name: ansible-test-units-community-aws-python39
parent: ansible-test-units-amazon-aws-python39

#### sanity
- job:
name: ansible-test-sanity-aws-ansible-python38
Expand Down Expand Up @@ -451,6 +475,12 @@
vars:
ansible_collections_repo: "{{ zuul.project.canonical_name }}"

- job:
name: ansible-test-units-cloud-common-python39
parent: ansible-test-units-base-python39
vars:
ansible_collections_repo: "{{ zuul.project.canonical_name }}"

### Community OKD
- job:
name: ansible-test-units-community-okd-python38
Expand Down Expand Up @@ -534,6 +564,14 @@
- name: github.com/ansible/ansible
override-checkout: stable-2.13

- job:
name: ansible-test-units-community-okd-python39
parent: ansible-test-units-base-python39
required-projects:
- name: github.com/openshift/community.okd
vars:
ansible_collections_repo: github.com/openshift/community.okd

### Kubernetes Core
- job:
name: ansible-test-units-kubernetes-core-python38
Expand All @@ -545,13 +583,21 @@
vars:
ansible_collections_repo: github.com/ansible-collections/kubernetes.core

- job:
name: ansible-test-units-kubernetes-core-python39
parent: ansible-test-units-base-python39
required-projects:
- name: github.com/ansible-collections/kubernetes.core
vars:
ansible_collections_repo: github.com/ansible-collections/kubernetes.core

- job:
name: ansible-test-cloud-integration-kubernetes-core
dependencies:
- name: build-ansible-collection
- name: ansible-test-splitter
pre-run:
- playbooks/ansible-cloud/py38/pre.yaml
- playbooks/ansible-cloud/py39/pre.yaml
- playbooks/ansible-cloud/k8s/pre.yaml
run: playbooks/ansible-test-base/run.yaml
files:
Expand All @@ -564,7 +610,7 @@
nodeset: centos-8-stream-large
vars:
ansible_test_command: integration
ansible_test_python: 3.8
ansible_test_python: 3.9
ansible_test_retry_on_error: true
ansible_test_integration_targets: "{{ child.targets_to_test[zuul.job] }}"
ansible_collections_repo: "github.com/ansible-collections/{{ zuul.job.split('-')[1] }}"
Expand Down
17 changes: 17 additions & 0 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,15 @@
vars:
ansible_collections_repo: github.com/ansible-collections/ansible.posix

- job:
name: ansible-test-units-posix-python39
parent: ansible-test-units-base-python39
required-projects:
- name: github.com/ansible-collections/ansible.posix
timeout: 3600
vars:
ansible_collections_repo: github.com/ansible-collections/ansible.posix

- job:
name: ansible-test-units-base
parent: unittests
Expand All @@ -205,6 +214,14 @@
# NOTE(pabelanger): ansible_test_python to be removed
ansible_test_python: 3.8

- job:
name: ansible-test-units-base-python39
parent: ansible-test-units-base
nodeset: fedora-35-1vcpu
abstract: true
vars:
ansible_test_python: 3.9

- job:
name: ansible-test-units-base-python27
parent: ansible-test-units-base
Expand Down
13 changes: 9 additions & 4 deletions zuul.d/project-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
- ansible-test-sanity-aws-ansible-2.9-python38
- ansible-test-sanity-aws-ansible-2.11-python38
- ansible-test-units-amazon-aws-python38
- ansible-test-units-amazon-aws-python39
- build-ansible-collection:
required-projects:
- name: github.com/ansible-collections/ansible.utils
Expand Down Expand Up @@ -160,6 +161,7 @@
- ansible-test-sanity-docker-stable-2.11
- ansible-test-sanity-docker-stable-2.12
- ansible-test-units-community-aws-python38
- ansible-test-units-community-aws-python39
- build-ansible-collection:
required-projects:
- name: github.com/ansible-collections/amazon.aws
Expand Down Expand Up @@ -249,6 +251,7 @@
jobs: &ansible-collections-amazon-cloud-generator-jobs
- ansible-tox-linters
- ansible-tox-py38
- ansible-tox-py39
gate:
jobs: *ansible-collections-amazon-cloud-generator-jobs

Expand Down Expand Up @@ -569,6 +572,7 @@
- ansible-galaxy-importer:
voting: false
- ansible-test-units-community-okd-python38
- ansible-test-units-community-okd-python39
- ansible-test-sanity-okd-downstream-devel
- ansible-test-sanity-okd-downstream-milestone
- ansible-test-sanity-okd-downstream-stable-2.11
Expand All @@ -581,7 +585,7 @@
jobs: &ansible-collections-cloud-common-jobs
- ansible-test-sanity-docker-devel
- ansible-test-sanity-docker-milestone
- ansible-test-cloud-integration-vmware-rest-python38:
- ansible-test-cloud-integration-vmware-rest-python39:
required-projects:
- name: github.com/ansible-collections/vmware.vmware_rest
- build-ansible-collection:
Expand Down Expand Up @@ -642,7 +646,7 @@
name: ansible-collections-community-vmware-rest
check:
jobs: &ansible-collections-community-vmware-rest-jobs
- ansible-test-cloud-integration-vmware-rest-python38
- ansible-test-cloud-integration-vmware-rest-python39
- build-ansible-collection:
required-projects:
- name: github.com/ansible-collections/cloud.common
Expand All @@ -668,14 +672,14 @@
name: ansible-collections-community-vmware-rest-code-generator
check:
jobs:
- ansible-test-cloud-integration-vmware-rest-python38
- ansible-test-cloud-integration-vmware-rest-python39
- build-ansible-collection:
required-projects:
- name: github.com/ansible-collections/cloud.common
- name: github.com/ansible-collections/community.vmware
gate:
jobs:
- ansible-test-cloud-integration-vmware-rest-python38
- ansible-test-cloud-integration-vmware-rest-python39
- build-ansible-collection:
required-projects:
- name: github.com/ansible-collections/cloud.common
Expand Down Expand Up @@ -1235,6 +1239,7 @@
- ansible-test-sanity-docker-stable-2.11
- ansible-test-sanity-docker-stable-2.12
- ansible-test-units-posix
- ansible-test-units-posix-python39
gate:
jobs: *ansible-collections-ansible-posix-units-jobs

Expand Down