Skip to content

Commit

Permalink
Clean up and COP GitHub actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Hervé Quatremain committed Aug 2, 2024
1 parent 6a98232 commit 4d135ca
Show file tree
Hide file tree
Showing 46 changed files with 135 additions and 138 deletions.
3 changes: 2 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
exclude_paths:
- tests/sample_manual_test.yml
- changelogs
supported_ansible_also:
- "2.14"
32 changes: 0 additions & 32 deletions .github/actions/fix-crun/action.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/files/galaxy.yml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
namespace: {{ collection_namespace }}
name: {{ collection_name }}
version: {{ collection_version }}
readme: README.md
authors:
- Hervé Quatremain <herve[email protected]>
- Tom Page <tpage@redhat.com>
description: Ansible modules to manage Quay Container Registry installations
license:
- GPL-3.0-or-later
tags:
- application
- quay
- registry
repository: {{ collection_repo }}

# The URL to any online docs
documentation: {{ collection_repo }}

# The URL to the home page of the collection/project
homepage: {{ collection_repo }}

# The URL to the collection issue tracker
issues: {{ collection_repo }}/issues
...
2 changes: 1 addition & 1 deletion .github/workflows/ansible-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
--group-by version
working-directory: ./ansible_collections/infra/quay_configuration

# See the repots at https://codecov.io/gh/infra/quay_configuration
# See the reports at https://codecov.io/gh/infra/quay_configuration
- uses: codecov/codecov-action@v4
with:
fail_ci_if_error: false
Expand Down
41 changes: 0 additions & 41 deletions .github/workflows/ansible-sanity.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/doc-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Linting Collection Documentation

on:
push:
branches:
- main
pull_request:

jobs:
documentation-linting:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install required packages
run: pip install -Iv ansible-core antsibull-docs

- uses: actions/checkout@v4

- name: Lint documentation
run: antsibull-docs lint-collection-docs --plugin-docs .
...
22 changes: 22 additions & 0 deletions .github/workflows/pre-commit-sanity.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
# This workflow runs pre-commit, which executes Ansible and YAML linting.
# See .pre-commit-config.yaml for more details.
# The workflow also runs Ansible sanity tests
name: Pre-commit and Sanity Tests

on:
push:
branches:
- main
pull_request:

jobs:
pre-commit_and_sanity:
uses:
redhat-cop/ansible_collections_tooling/.github/workflows/pre_commit_and_sanity.yml@main
with:
collection_namespace: infra
collection_name: quay_configuration
collection_version: 2.0.0
collection_repo: https://github.com/redhat-cop/quay_configuration
...
26 changes: 0 additions & 26 deletions .github/workflows/pre-commit.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/update-pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Update pre-commit Configuration

on:
schedule:
- cron: "4 2 * * 0"

jobs:
pre-commit:
uses:
redhat-cop/ansible_collections_tooling/.github/workflows/update_precommit.yml@main
with:
github_actor: ${{ github.actor }}
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
...
6 changes: 6 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,10 @@ rules:
- 'on'
- 'true'
- 'false'
comments:
min-spaces-from-content: 1
comments-indentation: disable
octal-values:
forbid-implicit-octal: true
forbid-explicit-octal: true
...
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Quay Container Registry Collection for Ansible

[![Code Linting](https://github.com/redhat-cop/quay_configuration/actions/workflows/pre-commit.yml/badge.svg)](https://github.com/redhat-cop/quay_configuration/actions/workflows/pre-commit.yml)
[![Sanity Test](https://github.com/redhat-cop/quay_configuration/actions/workflows/ansible-sanity.yml/badge.svg)](https://github.com/redhat-cop/quay_configuration/actions/workflows/ansible-sanity.yml)
[![Sanity Test](https://github.com/redhat-cop/quay_configuration/actions/workflows/pre-commit-sanity.yml/badge.svg)](https://github.com/redhat-cop/quay_configuration/actions/workflows/pre-commit-sanity.yml)
[![Integration Test](https://github.com/redhat-cop/quay_configuration/actions/workflows/ansible-integration.yml/badge.svg)](https://github.com/redhat-cop/quay_configuration/actions/workflows/ansible-integration.yml)


Expand Down
3 changes: 2 additions & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: quay_configuration
version: 2.1.0
readme: README.md
authors:
- Hervé Quatremain <[email protected]>
- Hervé Quatremain <[email protected]>
- Tom Page <[email protected]>
description: Ansible modules to manage Quay Container Registry installations
license:
Expand All @@ -23,3 +23,4 @@ homepage: https://github.com/redhat-cop/quay_configuration

# The URL to the collection issue tracker
issues: https://github.com/redhat-cop/quay_configuration/issues
...
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
requires_ansible: ">=2.15.0"
requires_ansible: ">=2.14.0"
action_groups:
quay:
- quay_application
Expand Down
2 changes: 1 addition & 1 deletion plugins/doc_fragments/auth.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

from __future__ import absolute_import, division, print_function
Expand Down
2 changes: 1 addition & 1 deletion plugins/doc_fragments/autoprune.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

# Copyright: (c) 2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

from __future__ import absolute_import, division, print_function
Expand Down
2 changes: 1 addition & 1 deletion plugins/filter/quay.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

# Copyright: (c) 2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

from __future__ import annotations
Expand Down
2 changes: 1 addition & 1 deletion plugins/filter/quay_docker_config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# Copyright: (c) 2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or
# https://www.gnu.org/licenses/gpl-3.0.txt)
DOCUMENTATION:
Expand Down
2 changes: 1 addition & 1 deletion plugins/module_utils/api_module.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright: (c) 2021-2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2021-2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)


Expand Down
2 changes: 1 addition & 1 deletion plugins/module_utils/quay_image.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright: (c) 2022, Herve Quatremain <[email protected]>
# Copyright: (c) 2022, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)


Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_api_token.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_application.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2021-2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2021-2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_default_perm.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_docker_token.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_first_user.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_layer_info.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_manifest_label.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_manifest_label_info.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2022-2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_message.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# Copyright: (c) 2021, 2022, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_notification.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2021, 2022, 2024 Herve Quatremain <[email protected]>
# Copyright: (c) 2021, 2022, 2024 Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/quay_organization.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-

# Copyright: (c) 2021-2024, Herve Quatremain <[email protected]>
# Copyright: (c) 2021-2024, Herve Quatremain <[email protected]>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

# For accessing the API documentation from a running system, use the swagger-ui
Expand Down
Loading

0 comments on commit 4d135ca

Please sign in to comment.