Skip to content

Commit aa4aa09

Browse files
Merge pull request #80 from Tompage1994/add-changelogs
Add Changelogs and release cycle for changelog
2 parents 78b5c55 + b48baba commit aa4aa09

File tree

11 files changed

+142
-6
lines changed

11 files changed

+142
-6
lines changed

.github/CONTRIBUTING.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ If you feel like getting your hands dirty, feel free to make the change yourself
2929
2. Create a branch named appropriately for the change you are going to make.
3030
3. Make your code change.
3131
4. If you are creating a new role, please add a test for it in our [testing playbook.](https://github.com/redhat-cop/tower_configuration/blob/devel/playbooks/example_with_yaml/configure_tower.yml) by adding a new role entry and adding the appropriate yaml file with test data in the tower_configs directory.
32-
5. Push your code change up to your forked repo.
33-
6. Open a Pull Request to merge your changes to this repo. The comment box will be filled in automatically via a template.
34-
7. All Pull Requests will be subject to Ansible and Yaml Linting checks. Please make sure that your code complies and fix any warnings that arise. These are Checks that apear at the bottom of your Pull Request.
35-
8. All Pull requests are subject to Testing against being used in tower. As above there is a check at the bottom of your pull request for this named integration.
32+
5. Add a changelog fragment in `changelogs/fragments` as per https://docs.ansible.com/ansible/latest/community/development_process.html#changelogs
33+
6. Push your code change up to your forked repo.
34+
7. Open a Pull Request to merge your changes to this repo. The comment box will be filled in automatically via a template.
35+
8. All Pull Requests will be subject to Ansible and Yaml Linting checks. Please make sure that your code complies and fix any warnings that arise. These are Checks that apear at the bottom of your Pull Request.
36+
9. All Pull requests are subject to Testing against being used in tower. As above there is a check at the bottom of your pull request for this named integration.
3637

3738
See [Using Pull Requests](https://help.github.com/articles/using-pull-requests/) got more information on how to use GitHub PRs.
3839

.github/workflow-config/release.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
src: "{{ repo_base_dir }}/galaxy.yml.j2"
1818
dest: "{{ repo_base_dir }}/galaxy.yml"
1919

20+
- name: Update changelog
21+
command:
22+
cmd: antsibull-changelog release --version {{ collection_version }}
23+
chdir: "{{ repo_base_dir }}"
24+
2025
- name: build collection
2126
command:
2227
cmd: ansible-galaxy collection build
@@ -36,6 +41,16 @@
3641
chdir: "{{ repo_base_dir }}"
3742
tags: publish
3843

44+
- name: Set git config
45+
shell:
46+
cmd: "git config user.name 'redhat-cop-ci-bot' && git config user.email 'action@github.com'"
47+
chdir: "{{ repo_base_dir }}"
48+
49+
- name: push changelogs to devel
50+
shell:
51+
cmd: "git add changelogs CHANGELOG.rst && git commit -m 'add changelog {{ collection_version }}'"
52+
chdir: "{{ repo_base_dir }}"
53+
3954
- name: git cleanup
4055
command:
4156
cmd: git reset --hard

.github/workflows/galaxy-release.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ jobs:
1313
steps:
1414
- name: Check out code
1515
uses: actions/checkout@v1
16+
with:
17+
persist-credentials: false
18+
fetch-depth: 0
1619

1720
- name: Set up Python 3.8
1821
uses: actions/setup-python@v1
1922
with:
2023
python-version: 3.8
2124

22-
- name: Install ansible-base
23-
run: pip install ansible
25+
- name: Install ansible-base and changelog
26+
run: pip install ansible antsibull-changelog
2427

2528
- name: Publish to galaxy
2629
run: ansible-playbook .github/workflow-config/release.yml
@@ -29,3 +32,9 @@ jobs:
2932
-e api_key=${{ secrets.ANSIBLE_GALAXY_APIKEY }}
3033
-e collection_repo=https://github.com/${{ github.repository }}
3134
--skip-tags=install,cleanup
35+
36+
- name: Push changes
37+
uses: ad-m/github-push-action@master
38+
with:
39+
branch: devel
40+
github_token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.rst

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
=============================================================
2+
redhat_cop.tower_configuration Release Notes
3+
=============================================================
4+
5+
.. contents:: Topics
6+
7+
8+
v0.1.0
9+
======
10+
11+
Major Changes
12+
-------------
13+
14+
- Groups role - Added groups role to the collection
15+
- Labels role - Added labels role to the collection
16+
- Notifications role - Added many options to notifications role
17+
- Workflow Job Templates role - Added many options to WJT role
18+
19+
Minor Changes
20+
-------------
21+
22+
- GitHub Workflows - Added workflows to run automated linting and integration tests against the codebase
23+
- Hosts role - Added new_name and enabled options to hosts role
24+
- Housekeeping - Added CONTRIBUTING guide and pull request template
25+
- Inventory Sources role - Added notification_templates_started, success, and error options. Also added verbosity and source_regions options.
26+
- Teams role - Added new_name option to teams role
27+
- Test Configs - Added full range of test objects for integration testing
28+
29+
Bugfixes
30+
--------
31+
32+
- Fixed an issue where tower_validate_certs and validate_certs were both used as vars. Now changed to tower_validate_certs

changelogs/.plugin-cache.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
plugins:
2+
become: {}
3+
cache: {}
4+
callback: {}
5+
cliconf: {}
6+
connection: {}
7+
httpapi: {}
8+
inventory: {}
9+
lookup: {}
10+
module: {}
11+
netconf: {}
12+
shell: {}
13+
strategy: {}
14+
vars: {}
15+
version: 0.1.0

changelogs/changelog.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
ancestor: null
2+
releases:
3+
0.1.0:
4+
changes:
5+
bugfixes:
6+
- Fixed an issue where tower_validate_certs and validate_certs were both used
7+
as vars. Now changed to tower_validate_certs
8+
major_changes:
9+
- Groups role - Added groups role to the collection
10+
- Labels role - Added labels role to the collection
11+
- Notifications role - Added many options to notifications role
12+
- Workflow Job Templates role - Added many options to WJT role
13+
minor_changes:
14+
- GitHub Workflows - Added workflows to run automated linting and integration
15+
tests against the codebase
16+
- Hosts role - Added new_name and enabled options to hosts role
17+
- Housekeeping - Added CONTRIBUTING guide and pull request template
18+
- Inventory Sources role - Added notification_templates_started, success, and
19+
error options. Also added verbosity and source_regions options.
20+
- Teams role - Added new_name option to teams role
21+
- Test Configs - Added full range of test objects for integration testing
22+
fragments:
23+
- housekeeping.yaml
24+
- new_roles.yaml
25+
- workflows.yaml
26+
release_date: '2020-08-04'

changelogs/config.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
changelog_filename_template: ../CHANGELOG.rst
2+
changelog_filename_version_depth: 0
3+
changes_file: changelog.yaml
4+
changes_format: combined
5+
ignore_other_fragment_extensions: true
6+
keep_fragments: false
7+
mention_ancestor: true
8+
new_plugins_after_name: removed_features
9+
notesdir: fragments
10+
prelude_section_name: release_summary
11+
prelude_section_title: Release Summary
12+
sanitize_changelog: true
13+
sections:
14+
- - major_changes
15+
- Major Changes
16+
- - minor_changes
17+
- Minor Changes
18+
- - breaking_changes
19+
- Breaking Changes / Porting Guide
20+
- - deprecated_features
21+
- Deprecated Features
22+
- - removed_features
23+
- Removed Features (previously deprecated)
24+
- - security_fixes
25+
- Security Fixes
26+
- - bugfixes
27+
- Bugfixes
28+
- - known_issues
29+
- Known Issues
30+
title: redhat_cop.tower_configuration
31+
trivial_section_name: trivial
32+
use_fqcn: true

changelogs/fragments/.gitkeep

Whitespace-only changes.

changelogs/fragments/72-defaults.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bugfixes:
2+
- Removed defaulted objects for all roles so that they were not always run if using a conditional against the variable. (see https://github.com/redhat-cop/tower_configuration/issues/68)

changelogs/fragments/73-readmes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
minor_changes:
2+
- Standardised and corrected all READMEs
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
minor_changes:
2+
- Added pre-commit hook for local development and automated testing purposes

0 commit comments

Comments
 (0)