From bc2bbff6bcf16165583cc034be5693eda7fde4ec Mon Sep 17 00:00:00 2001 From: Andrew Crosby Date: Fri, 22 Feb 2019 00:54:02 -0500 Subject: [PATCH] Update galaxy cli metadata file templates (#51398) * Remove github_branch from galaxy meta file templates Signed-off-by: Andrew Crosby * Update galaxy meta license examples to valid SPDX IDs Signed-off-by: Andrew Crosby --- lib/ansible/cli/galaxy.py | 2 +- lib/ansible/galaxy/data/apb/meta/main.yml.j2 | 20 ++++++------------- .../galaxy/data/container/meta/main.yml.j2 | 20 ++++++------------- .../galaxy/data/default/meta/main.yml.j2 | 20 ++++++------------- .../galaxy/data/network/meta/main.yml.j2 | 20 ++++++------------- 5 files changed, 25 insertions(+), 57 deletions(-) diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py index f1837ad064..81b4924d64 100644 --- a/lib/ansible/cli/galaxy.py +++ b/lib/ansible/cli/galaxy.py @@ -210,7 +210,7 @@ class GalaxyCLI(CLI): author='your name', description='your description', company='your company (optional)', - license='license (GPLv2, CC-BY, etc)', + license='license (GPL-2.0-or-later, MIT, etc)', issue_tracker_url='http://example.com/issue/tracker', min_ansible_version='2.4', role_type=context.CLIARGS['role_type'] diff --git a/lib/ansible/galaxy/data/apb/meta/main.yml.j2 b/lib/ansible/galaxy/data/apb/meta/main.yml.j2 index ec42de2574..862f8ef8b4 100644 --- a/lib/ansible/galaxy/data/apb/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/apb/meta/main.yml.j2 @@ -7,23 +7,15 @@ galaxy_info: # next line and provide a value # issue_tracker_url: {{ issue_tracker_url }} - # Some suggested licenses: - # - BSD (default) + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 license: {{ license }} - # Optionally specify the branch Galaxy will use when accessing the GitHub - # repo for this role. During role install, if no tags are available, - # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If Travis integration is configured, only notifications for this - # branch will be accepted. Otherwise, in all cases, the repo's default branch - # (usually master) will be used. - #github_branch: - # # platforms is a list of platforms, and each platform has a name and a list of versions. # diff --git a/lib/ansible/galaxy/data/container/meta/main.yml.j2 b/lib/ansible/galaxy/data/container/meta/main.yml.j2 index 7ac7d89bb3..72fc9a22e8 100644 --- a/lib/ansible/galaxy/data/container/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/container/meta/main.yml.j2 @@ -7,13 +7,13 @@ galaxy_info: # next line and provide a value # issue_tracker_url: {{ issue_tracker_url }} - # Some suggested licenses: - # - BSD (default) + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 license: {{ license }} min_ansible_container_version: 0.2.0 @@ -21,14 +21,6 @@ galaxy_info: # If Ansible is required outside of the build container, provide the minimum version: # min_ansible_version: - # Optionally specify the branch Galaxy will use when accessing the GitHub - # repo for this role. During role install, if no tags are available, - # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If Travis integration is configured, only notifications for this - # branch will be accepted. Otherwise, in all cases, the repo's default branch - # (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'. diff --git a/lib/ansible/galaxy/data/default/meta/main.yml.j2 b/lib/ansible/galaxy/data/default/meta/main.yml.j2 index 262b85307f..9a22419fa7 100644 --- a/lib/ansible/galaxy/data/default/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/default/meta/main.yml.j2 @@ -7,13 +7,13 @@ galaxy_info: # next line and provide a value # issue_tracker_url: {{ issue_tracker_url }} - # Some suggested licenses: - # - BSD (default) + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 license: {{ license }} min_ansible_version: {{ min_ansible_version }} @@ -21,14 +21,6 @@ galaxy_info: # If this a Container Enabled role, provide the minimum Ansible Container version. # min_ansible_container_version: - # Optionally specify the branch Galaxy will use when accessing the GitHub - # repo for this role. During role install, if no tags are available, - # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If Travis integration is configured, only notifications for this - # branch will be accepted. Otherwise, in all cases, the repo's default branch - # (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'. diff --git a/lib/ansible/galaxy/data/network/meta/main.yml.j2 b/lib/ansible/galaxy/data/network/meta/main.yml.j2 index cdefce594e..d744bda78e 100644 --- a/lib/ansible/galaxy/data/network/meta/main.yml.j2 +++ b/lib/ansible/galaxy/data/network/meta/main.yml.j2 @@ -7,13 +7,13 @@ galaxy_info: # next line and provide a value # issue_tracker_url: {{ issue_tracker_url }} - # Some suggested licenses: - # - BSD (default) + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 license: {{ license }} min_ansible_version: {{ min_ansible_version }} @@ -21,14 +21,6 @@ galaxy_info: # If this a Container Enabled role, provide the minimum Ansible Container version. # min_ansible_container_version: - # Optionally specify the branch Galaxy will use when accessing the GitHub - # repo for this role. During role install, if no tags are available, - # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If Travis integration is configured, only notifications for this - # branch will be accepted. Otherwise, in all cases, the repo's default branch - # (usually master) will be used. - #github_branch: - # # platforms is a list of platforms, and each platform has a name and a list of versions. #