From 16cdac66fe01a2492e6737849d0fb81e812ee96b Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 8 Dec 2021 16:04:20 -0800 Subject: [PATCH] ansible-test - Use ansible-core for docs links. --- changelogs/fragments/ansible-test-links.yml | 2 ++ .../ansible_test/_internal/commands/integration/cloud/aws.py | 2 +- .../_internal/commands/sanity/integration_aliases.py | 2 +- test/lib/ansible_test/_internal/test.py | 2 +- .../_util/controller/sanity/code-smell/runtime-metadata.py | 2 +- .../controller/sanity/validate-modules/validate_modules/main.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/ansible-test-links.yml diff --git a/changelogs/fragments/ansible-test-links.yml b/changelogs/fragments/ansible-test-links.yml new file mode 100644 index 00000000000..045fa8e435b --- /dev/null +++ b/changelogs/fragments/ansible-test-links.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-test - Update help links to reference ``ansible-core`` instead of ``ansible``. diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/aws.py b/test/lib/ansible_test/_internal/commands/integration/cloud/aws.py index f449393330a..a34d714dd26 100644 --- a/test/lib/ansible_test/_internal/commands/integration/cloud/aws.py +++ b/test/lib/ansible_test/_internal/commands/integration/cloud/aws.py @@ -127,5 +127,5 @@ class AwsCloudEnvironment(CloudEnvironment): """Callback to run when an integration target fails.""" if not tries and self.managed: display.notice('If %s failed due to permissions, the IAM test policy may need to be updated. ' - 'https://docs.ansible.com/ansible/devel/dev_guide/platforms/aws_guidelines.html#aws-permissions-for-integration-tests.' + 'https://docs.ansible.com/ansible-core/devel/dev_guide/platforms/aws_guidelines.html#aws-permissions-for-integration-tests.' % target.name) diff --git a/test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py b/test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py index bc3ebc0d108..6d29968bf85 100644 --- a/test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py +++ b/test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py @@ -64,7 +64,7 @@ class IntegrationAliasesTest(SanitySingleVersion): UNSTABLE = 'unstable/' UNSUPPORTED = 'unsupported/' - EXPLAIN_URL = 'https://docs.ansible.com/ansible/devel/dev_guide/testing/sanity/integration-aliases.html' + EXPLAIN_URL = 'https://docs.ansible.com/ansible-core/devel/dev_guide/testing/sanity/integration-aliases.html' TEMPLATE_DISABLED = """ The following integration tests are **disabled** [[explain]({explain_url}#disabled)]: diff --git a/test/lib/ansible_test/_internal/test.py b/test/lib/ansible_test/_internal/test.py index af21cbd6022..b67addc3ecf 100644 --- a/test/lib/ansible_test/_internal/test.py +++ b/test/lib/ansible_test/_internal/test.py @@ -347,7 +347,7 @@ class TestFailure(TestResult): if re.search(r'^[0-9.]+$', ansible_version): url_version = '.'.join(ansible_version.split('.')[:2]) - testing_docs_url = 'https://docs.ansible.com/ansible/%s/dev_guide/testing' % url_version + testing_docs_url = 'https://docs.ansible.com/ansible-core/%s/dev_guide/testing' % url_version url = '%s/%s/' % (testing_docs_url, self.command) diff --git a/test/lib/ansible_test/_util/controller/sanity/code-smell/runtime-metadata.py b/test/lib/ansible_test/_util/controller/sanity/code-smell/runtime-metadata.py index cad82a5575f..929f371f7a2 100644 --- a/test/lib/ansible_test/_util/controller/sanity/code-smell/runtime-metadata.py +++ b/test/lib/ansible_test/_util/controller/sanity/code-smell/runtime-metadata.py @@ -141,7 +141,7 @@ def validate_metadata_file(path, is_ansible, check_deprecation_dates=False): current_version = get_collection_version() # Updates to schema MUST also be reflected in the documentation - # ~https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html + # ~https://docs.ansible.com/ansible-core/devel/dev_guide/developing_collections.html # plugin_routing schema diff --git a/test/lib/ansible_test/_util/controller/sanity/validate-modules/validate_modules/main.py b/test/lib/ansible_test/_util/controller/sanity/validate-modules/validate_modules/main.py index 278d57aecc3..5ab8f529267 100644 --- a/test/lib/ansible_test/_util/controller/sanity/validate-modules/validate_modules/main.py +++ b/test/lib/ansible_test/_util/controller/sanity/validate-modules/validate_modules/main.py @@ -487,7 +487,7 @@ class ModuleValidator(Validator): path=self.object_path, code='use-short-gplv3-license', msg='Found old style GPLv3 license header: ' - 'https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_documenting.html#copyright' + 'https://docs.ansible.com/ansible-core/devel/dev_guide/developing_modules_documenting.html#copyright' ) def _check_for_subprocess(self):