Skip to content

Commit

Permalink
trying to fix CI (#24)
Browse files Browse the repository at this point in the history
* modified:   .github/workflows/pre-commit.yml

* modified:   .github/CONTRIBUTING.md

* modified:   .github/CONTRIBUTING.md

* modified:   playbooks/configure_controller.yml

* modified:   tests/playbooks/controller_rules_validation_filetree_read.yml

* modified:   tests/playbooks/controller_rules_validation_include.yml
  • Loading branch information
djdanielsson authored Nov 6, 2024
1 parent 645c995 commit 3866e96
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If you feel like getting your hands dirty, feel free to make the change yourself
1. Fork the repo on Github, and then clone it locally.
2. Create a branch named appropriately for the change you are going to make.
3. Make your code change.
4. If you are creating a new role, please add a test for it in our [testing playbook.](https://github.com/redhat-cop/aap_configuration_extended/blob/devel/tests/configure_controller.yml) by adding a new role entry and adding the appropriate yaml file with test data in the controller_configs directory.
4. If you are creating a new role, please add a test for it in our [testing](https://github.com/redhat-cop/aap_configuration_extended/blob/devel/tests/) by adding a new role entry and adding the appropriate yaml file with test data in the controller_configs directory.
5. Add a changelog fragment in `changelogs/fragments` as per <https://docs.ansible.com/ansible/latest/community/development_process.html#changelogs>
6. Push your code change up to your forked repo.
7. Open a Pull Request to merge your changes to this repo. The comment box will be filled in automatically via a template.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ jobs:
collection_name: aap_configuration_extended
collection_version: 1.0.0
collection_repo: https://github.com/redhat-cop/aap_configuration_extended/
collection_dependencies: awx.awx ansible.hub
collection_dependencies: awx.awx ansible.hub infra.aap_configuration
...
2 changes: 1 addition & 1 deletion playbooks/configure_controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@

- name: Call dispatch role
ansible.builtin.include_role:
name: infra.aap_configuration_extended.dispatch
name: infra.aap_configuration.dispatch
...
5 changes: 3 additions & 2 deletions tests/playbooks/controller_rules_validation_filetree_read.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
hosts: localhost
gather_facts: false
roles:
- role: infra.aap_controller_configuration_extended.filetree_read
- role: infra.aap_controller_configuration_extended.aap_rules_validation
- role: infra.aap_configuration_extended.filetree_read
- role: infra.aap_configuration_extended.aap_rules_validation
...
2 changes: 1 addition & 1 deletion tests/playbooks/controller_rules_validation_include.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
ansible.builtin.include_vars:
dir: ../configs/
roles:
- role: infra.aap_controller_configuration_extended.aap_rules_validation
- role: infra.aap_configuration_extended.aap_rules_validation
...

0 comments on commit 3866e96

Please sign in to comment.