From 478e139195a4657713c35f5419d4f1adc47a0846 Mon Sep 17 00:00:00 2001 From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:15:12 -0400 Subject: [PATCH] remove nonexistent url from role templates (#82933) * Remove obsolete v1 link for role platforms from the role templates * Delete platforms block entirely --- .../rm-obsolete-url-role-template.yml | 2 ++ .../galaxy/data/container/meta/main.yml.j2 | 18 ------------------ .../galaxy/data/default/role/meta/main.yml.j2 | 18 ------------------ .../test_data/role_skeleton/meta/main.yml.j2 | 18 ------------------ 4 files changed, 2 insertions(+), 54 deletions(-) create mode 100644 changelogs/fragments/rm-obsolete-url-role-template.yml diff --git a/changelogs/fragments/rm-obsolete-url-role-template.yml b/changelogs/fragments/rm-obsolete-url-role-template.yml new file mode 100644 index 00000000000..ea86003535a --- /dev/null +++ b/changelogs/fragments/rm-obsolete-url-role-template.yml @@ -0,0 +1,2 @@ +bugfixes: + - Remove the galaxy_info field ``platforms`` from the role templates (https://github.com/ansible/ansible/issues/82453). diff --git a/lib/ansible/galaxy/data/container/meta/main.yml.j2 b/lib/ansible/galaxy/data/container/meta/main.yml.j2 index 72fc9a22e8a..8a6a382f291 100644 --- a/lib/ansible/galaxy/data/container/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/meta/main.yml.j2 @@ -21,24 +21,6 @@ galaxy_info: # If Ansible is required outside of the build container, provide the minimum version: # min_ansible_version: - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - galaxy_tags: - container # List tags for your role here, one per line. A tag is a keyword that describes diff --git a/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 b/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 index 4891a68b490..47abff98bb7 100644 --- a/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/role/meta/main.yml.j2 @@ -21,24 +21,6 @@ galaxy_info: # If this a Container Enabled role, provide the minimum Ansible Container version. # min_ansible_container_version: - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is a keyword that describes # and categorizes the role. Users find roles by searching for tags. Be sure to diff --git a/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 b/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 index 2fc53cbe4ec..b2d1ee6f98e 100644 --- a/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 +++ b/test/units/cli/test_data/role_skeleton/meta/main.yml.j2 @@ -26,24 +26,6 @@ galaxy_info: # (usually master) will be used. #github_branch: - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - galaxy_tags: [] # List tags for your role here, one per line. A tag is # a keyword that describes and categorizes the role.