From d09fedaa869df8e5b2a77f3b9429d076b831775c Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Nava Date: Wed, 27 Nov 2024 19:01:47 +0100 Subject: [PATCH] Pin cifmw dependencies Till this commit we were not pinning the dependencies, resulting in break jobs as soon as a dependency changed underneath without notice. This commit pins all the dependencies to given known versions. --- common-requirements.txt | 16 +++++++--------- galaxy.yml | 28 ++++++++++++++-------------- requirements.yml | 13 +++++++++++++ test-requirements.txt | 40 ++++++++++++++++++++-------------------- 4 files changed, 54 insertions(+), 43 deletions(-) diff --git a/common-requirements.txt b/common-requirements.txt index 68e6bc2003..537afa78e0 100644 --- a/common-requirements.txt +++ b/common-requirements.txt @@ -1,9 +1,7 @@ -ansible-core>=2.14.0 -oauthlib>=3.2.0 # k8s lib that requires manual upgrade -kubernetes -kubernetes-validate -openstacksdk -jsonschema>=4.20.0 - -# Allows to unpin cryptography -pyOpenSSL>=22.1.0 +ansible-core==2.15.3 +oauthlib==3.2.2 +kubernetes==31.0.0 +kubernetes-validate==1.31.0 +openstacksdk==4.1.0 +jsonschema==4.23.0 +pyOpenSSL==24.2.1 diff --git a/galaxy.yml b/galaxy.yml index bd43289486..e7b205fb48 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -71,20 +71,20 @@ tags: # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version # range specifiers can be set and are separated by ',' dependencies: - 'git+https://github.com/containers/ansible-podman-collections': 'main' - 'git+https://github.com/ansible-collections/community.general': 'main' - 'git+https://github.com/ansible-collections/ansible.posix': 'main' - 'git+https://github.com/ansible-collections/ansible.utils': 'main' - 'git+https://github.com/ansible-collections/community.libvirt': 'main' - 'git+https://github.com/ansible-collections/community.crypto': 'main' - 'git+https://github.com/ansible-collections/kubernetes.core': 'main' - 'git+https://github.com/ansible-collections/ansible.netcommon': 'main' - 'git+https://github.com/openstack/ansible-config_template': 'master' - 'git+https://github.com/ansible-collections/junipernetworks.junos': 'main' - 'git+https://github.com/ansible-collections/cisco.ios': 'main' - 'git+https://github.com/ansible-collections/mellanox.onyx': 'master' - 'git+https://github.com/openshift/community.okd': 'main' - 'git+https://github.com/ovirt/ovirt-ansible-collection': 'master' + 'git+https://github.com/containers/ansible-podman-collections': '1.16.2' + 'git+https://github.com/ansible-collections/community.general': '10.0.1' + 'git+https://github.com/ansible-collections/ansible.posix': '1.6.2' + 'git+https://github.com/ansible-collections/ansible.utils': 'v5.1.2' + 'git+https://github.com/ansible-collections/community.libvirt': '1.3.0' + 'git+https://github.com/ansible-collections/community.crypto': '2.22.3' + 'git+https://github.com/ansible-collections/kubernetes.core': '5.0.0' + 'git+https://github.com/ansible-collections/ansible.netcommon': 'v7.1.0' + 'git+https://github.com/openstack/ansible-config_template': '2.1.1' + 'git+https://github.com/ansible-collections/junipernetworks.junos': 'v9.1.0' + 'git+https://github.com/ansible-collections/cisco.ios': 'v9.0.3' + 'git+https://github.com/ansible-collections/mellanox.onyx': 'master' # Unmaintained, no tags + 'git+https://github.com/openshift/community.okd': '4.0.0' + 'git+https://github.com/ovirt/ovirt-ansible-collection': '3.2.0-1' # The URL of the originating SCM repository repository: https://github.com/openstack-k8s-operators/ci-framework diff --git a/requirements.yml b/requirements.yml index 995e244dd0..22fece6f58 100644 --- a/requirements.yml +++ b/requirements.yml @@ -17,29 +17,42 @@ collections: - name: https://github.com/ansible-collections/ansible.posix type: git + version: "1.6.2" - name: https://github.com/ansible-collections/ansible.utils type: git + version: "v5.1.2" - name: https://github.com/ansible-collections/community.general type: git + version: "10.0.1" - name: https://github.com/ansible-collections/community.crypto type: git + version: "2.22.3" - name: https://github.com/containers/ansible-podman-collections type: git + version: "1.16.2" - name: https://github.com/ansible-collections/community.libvirt type: git + version: "1.3.0" - name: https://github.com/ansible-collections/kubernetes.core type: git + version: "5.0.0" - name: https://github.com/ansible-collections/ansible.netcommon type: git + version: "v7.1.0" - name: https://github.com/openstack/ansible-config_template type: git + version: "2.1.1" - name: https://github.com/ansible-collections/junipernetworks.junos type: git + version: "v9.1.0" - name: https://github.com/ansible-collections/cisco.ios type: git + version: "v9.0.3" - name: https://github.com/ansible-collections/mellanox.onyx type: git - name: https://github.com/openshift/community.okd type: git + version: "4.0.0" - name: https://github.com/ovirt/ovirt-ansible-collection type: git + version: "3.2.0-1" diff --git a/test-requirements.txt b/test-requirements.txt index dbfece1ca0..05be79a1c0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,28 +1,28 @@ -ansible-core>=2.14.0 +ansible-core==2.15.3 # Molecule Deps -molecule>=5.1.0,<6.0.0 -molecule-plugins[podman] -ruamel.yaml -ansi2html -dogpile.cache>=0.9.2 -jmespath # required by devscripts role -netaddr # required by libvirt_manager role -dnspython # required by community.general.dig +molecule==5.1.0 +molecule-plugins[podman]==23.5.0 +ruamel.yaml==0.18.6 +ansi2html==1.9.2 +dogpile.cache==1.3.3 +jmespath==1.0.1 # required by devscripts role +netaddr==1.3.0 # required by libvirt_manager role +dnspython==2.7.0 # required by community.general.dig # UT Deps -pytest -pytest-cov -pytest-html -pytest-testinfra -pytest-xdist -mock +pytest==8.3.3 +pytest-cov==6.0.0 +pytest-html==4.1.1 +pytest-testinfra==10.1.1 +pytest-xdist==3.6.1 +mock==5.1.0 # CI Deps -pre-commit # MIT -yamllint -pyspelling -mkdocs-pymdownx-material-extras +pre-commit==4.0.1 +yamllint==1.35.1 +pyspelling==2.10 +mkdocs-pymdownx-material-extras==2.6 # Common requirements -ansi2txt +ansi2txt==0.2.0