From 5079a827f636436336d1c57fbd0ccdad6a55b6c5 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 22 May 2023 07:35:33 +0200 Subject: [PATCH 1/2] Switch to Ansible Galaxy compatible requirements files for tests (#1816) Switch to Ansible Galaxy compatible requirements files for tests SUMMARY See ansible-community/community-topics#230. ISSUE TYPE Test Pull Request COMPONENT NAME test requirements files Reviewed-by: Mark Chappell (cherry picked from commit e80bf933412ea5c7ab2a94af945170cb2ebd900f) --- changelogs/fragments/test-reqs.yml | 2 ++ tests/integration/requirements.yml | 6 ++++++ tests/requirements.yml | 7 ------- tests/unit/requirements.yml | 3 +++ 4 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 changelogs/fragments/test-reqs.yml create mode 100644 tests/integration/requirements.yml delete mode 100644 tests/requirements.yml create mode 100644 tests/unit/requirements.yml diff --git a/changelogs/fragments/test-reqs.yml b/changelogs/fragments/test-reqs.yml new file mode 100644 index 00000000000..11598f7ddb2 --- /dev/null +++ b/changelogs/fragments/test-reqs.yml @@ -0,0 +1,2 @@ +trivial: + - "Move Galaxy test requirements from old transitional format in tests/requirements.yml to standard Ansible Galaxy requirements files in tests/integration/requirements.yml and tests/unit/requirements.yml." diff --git a/tests/integration/requirements.yml b/tests/integration/requirements.yml new file mode 100644 index 00000000000..b2317d11da0 --- /dev/null +++ b/tests/integration/requirements.yml @@ -0,0 +1,6 @@ +--- +collections: +- amazon.aws >= 6.0.0 +- ansible.windows +- community.crypto +- community.general diff --git a/tests/requirements.yml b/tests/requirements.yml deleted file mode 100644 index 98b77a44496..00000000000 --- a/tests/requirements.yml +++ /dev/null @@ -1,7 +0,0 @@ -integration_tests_dependencies: -- amazon.aws >= 3.0.0 -- ansible.windows -- community.crypto -- community.general -unit_tests_dependencies: -- amazon.aws >= 3.0.0 diff --git a/tests/unit/requirements.yml b/tests/unit/requirements.yml new file mode 100644 index 00000000000..8becc2bc3f9 --- /dev/null +++ b/tests/unit/requirements.yml @@ -0,0 +1,3 @@ +--- +collections: +- amazon.aws >= 6.0.0 From e616e0fecd588bcde71527539ca9824be06edc74 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Mon, 22 May 2023 09:37:14 +0200 Subject: [PATCH 2/2] Base version on release --- tests/integration/requirements.yml | 2 +- tests/unit/requirements.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/requirements.yml b/tests/integration/requirements.yml index b2317d11da0..3fd863c94f9 100644 --- a/tests/integration/requirements.yml +++ b/tests/integration/requirements.yml @@ -1,6 +1,6 @@ --- collections: -- amazon.aws >= 6.0.0 +- amazon.aws >= 5.0.0 - ansible.windows - community.crypto - community.general diff --git a/tests/unit/requirements.yml b/tests/unit/requirements.yml index 8becc2bc3f9..7d8cc3231e6 100644 --- a/tests/unit/requirements.yml +++ b/tests/unit/requirements.yml @@ -1,3 +1,3 @@ --- collections: -- amazon.aws >= 6.0.0 +- amazon.aws >= 5.0.0