diff options
| author | Sam Doran <sdoran@redhat.com> | 2021-06-28 17:25:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-28 14:25:52 -0700 |
| commit | 60c03e8af42c9a9b8c2e4cf78f457780811af8ce (patch) | |
| tree | 43f1194aceafa837c64d0c42d020513a254e823d | |
| parent | 39cae91b023e3a2077bdcc3697e95376f3768174 (diff) | |
| download | ansible-60c03e8af42c9a9b8c2e4cf78f457780811af8ce.tar.gz | |
Add constraints for new ruamel release (#75134)
Newer releases of ruamel.yaml and ruamel.yaml.clib require newer Python versions.
3 files changed, 16 insertions, 0 deletions
diff --git a/test/integration/targets/inventory_kubevirt_conformance/constraints.txt b/test/integration/targets/inventory_kubevirt_conformance/constraints.txt index c44f44e9de..93d3255d16 100644 --- a/test/integration/targets/inventory_kubevirt_conformance/constraints.txt +++ b/test/integration/targets/inventory_kubevirt_conformance/constraints.txt @@ -1 +1,3 @@ setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later +ruamel.yaml < 0.17 ; python_version <= '2.7' # ruamel.yaml 0.17 and later are not tested with Python 2.7 +ruamel.yaml.clib <= 0.2.2 ; python_version < '3.5' # ruamel.yaml.clib 0.2.3 and later requires Python 3.5 or later diff --git a/test/integration/targets/k8s/files/constraints.txt b/test/integration/targets/k8s/files/constraints.txt new file mode 100644 index 0000000000..c4cebb93a9 --- /dev/null +++ b/test/integration/targets/k8s/files/constraints.txt @@ -0,0 +1,2 @@ +ruamel.yaml < 0.17 ; python_version <= '2.7' # ruamel.yaml 0.17 and later are not tested with Python 2.7 +ruamel.yaml.clib <= 0.2.2 ; python_version < '3.5' # ruamel.yaml.clib 0.2.3 and later requires Python 3.5 or later diff --git a/test/integration/targets/k8s/tasks/main.yml b/test/integration/targets/k8s/tasks/main.yml index 60c0850acb..1c91534864 100644 --- a/test/integration/targets/k8s/tasks/main.yml +++ b/test/integration/targets/k8s/tasks/main.yml @@ -17,6 +17,8 @@ virtualenv: "{{ virtualenv }}" virtualenv_command: "{{ virtualenv_command }}" virtualenv_site_packages: no + extra_args: + -c {{ role_path }}/files/constraints.txt - include_tasks: validate_not_installed.yml vars: @@ -37,6 +39,8 @@ virtualenv: "{{ virtualenv }}" virtualenv_command: "{{ virtualenv_command }}" virtualenv_site_packages: no + extra_args: + -c {{ role_path }}/files/constraints.txt - include_tasks: validate_installed.yml vars: @@ -58,6 +62,8 @@ virtualenv: "{{ virtualenv }}" virtualenv_command: "{{ virtualenv_command }}" virtualenv_site_packages: no + extra_args: + -c {{ role_path }}/files/constraints.txt - include_tasks: older_openshift_fail.yml vars: @@ -80,6 +86,8 @@ virtualenv: "{{ virtualenv }}" virtualenv_command: "{{ virtualenv_command }}" virtualenv_site_packages: no + extra_args: + -c {{ role_path }}/files/constraints.txt - include_tasks: basic_validation.yml @@ -96,6 +104,8 @@ virtualenv: "{{ virtualenv }}" virtualenv_command: "{{ virtualenv_command }}" virtualenv_site_packages: no + extra_args: + -c {{ role_path }}/files/constraints.txt - include_tasks: basic_validation.yml @@ -113,6 +123,8 @@ virtualenv: "{{ virtualenv }}" virtualenv_command: "{{ virtualenv_command }}" virtualenv_site_packages: no + extra_args: + -c {{ role_path }}/files/constraints.txt - include_tasks: full_test.yml vars: |