Skip to content

manually back ported some enhacements from infra.aap_configuration_extended#15

Merged
djdanielsson merged 6 commits intoredhat-cop:develfrom
automationiberia:aap_configuration_extended_issue50_backport
Dec 18, 2024
Merged

manually back ported some enhacements from infra.aap_configuration_extended#15
djdanielsson merged 6 commits intoredhat-cop:develfrom
automationiberia:aap_configuration_extended_issue50_backport

Conversation

@ivarmu
Copy link
Contributor

@ivarmu ivarmu commented Dec 17, 2024

What does this PR do?

Manually backport some enhancements from the infra.aap_configuration_extended that can be usefull for AAP <=2.4

How should this be tested?

Manually tested

Is there a relevant Issue open for this?

resolves redhat-cop/aap_configuration_extended#50

Other Relevant info, PRs, etc

redhat-cop/aap_configuration_extended#50

@djdanielsson
Copy link
Contributor

Have you tested it to ensure it is working?

@ivarmu
Copy link
Contributor Author

ivarmu commented Dec 18, 2024

Have you tested it to ensure it is working?

Yes for AAP2.4! And detected and fixed some minor errors with the surveys (corrected for both streams, but only PR to the 2.4 by now, as still not tested for 2.5)

Copy link
Contributor

@djdanielsson djdanielsson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@djdanielsson djdanielsson merged commit 870f24b into redhat-cop:devel Dec 18, 2024
8 of 13 checks passed
ivarmu pushed a commit that referenced this pull request Mar 18, 2025
* modified:   .github/CONTRIBUTING.md
	modified:   .github/workflows/ci_standalone_versioned.yml
	deleted:    .github/workflows/office-hours-issue.yml
	modified:   .github/workflows/pre-commit.yml
	modified:   .github/workflows/release.yml
	modified:   .github/workflows/release_manual.yml
	modified:   README.md
	modified:   changelogs/changelog.yaml
	modified:   docs/aap_config_as_code_public_meeting.ics
	modified:   galaxy.yml
	modified:   roles/filetree_create/automatetheautomation.md
	modified:   tests/playbooks/README.md
	modified:   tests/templates/vars/controller_credential_types.yml
	modified:   tests/templates/vars/controller_credentials.yml
	modified:   tests/templates/vars/controller_execution_environments.yml
	modified:   tests/templates/vars/controller_groups.yml
	modified:   tests/templates/vars/controller_hosts.yml
	modified:   tests/templates/vars/controller_instance_groups.yml
	modified:   tests/templates/vars/controller_inventories.yml
	modified:   tests/templates/vars/controller_inventory_sources.yml
	modified:   tests/templates/vars/controller_job_templates.yml
	modified:   tests/templates/vars/controller_labels.yml
	modified:   tests/templates/vars/controller_ldap_configuration.json
	modified:   tests/templates/vars/controller_notification_templates.yml
	modified:   tests/templates/vars/controller_organizations.yml
	modified:   tests/templates/vars/controller_organizations_with_hub.yml
	modified:   tests/templates/vars/controller_projects.yml
	modified:   tests/templates/vars/controller_roles.yml
	modified:   tests/templates/vars/controller_schedules.yml
	modified:   tests/templates/vars/controller_teams.yml
	modified:   tests/templates/vars/controller_users.yml
	modified:   tests/templates/vars/controller_workflows.yml

* modified:   CODEOWNERS

* modified:   .github/CONTRIBUTING.md
	modified:   .github/files/galaxy.yml.j2
	modified:   .github/workflows/ci_standalone_versioned.yml
	modified:   .github/workflows/pre-commit.yml
	modified:   .github/workflows/release.yml
	modified:   .github/workflows/release_manual.yml
	modified:   CHANGELOG.rst
	modified:   README.md
	modified:   changelogs/config.yaml
	modified:   docs/CONVERSION_GUIDE.md
	modified:   galaxy.yml
	modified:   playbooks/configure_controller.yml
	modified:   playbooks/flatten_filetree_create_output.yaml
	modified:   plugins/lookup/controller_object_diff.py
	modified:   plugins/modules/controller_export_diff.py

* modified:   .github/workflows/ci_standalone_versioned.yml
	modified:   .github/workflows/pre-commit.yml
	modified:   roles/object_diff/tasks/main.yml

* modified:   README.md
	deleted:    docs/aap_config_as_code_public_meeting.ics

* modified:   galaxy.yml
	modified:   roles/filetree_create/README.md
	modified:   roles/filetree_create/tests/filetree_create.yml
	modified:   roles/filetree_read/README.md
	modified:   roles/filetree_read/tests/config-controller-filetree.yml
	modified:   roles/object_diff/README.md
	modified:   roles/object_diff/tests/drop_diff.yml
	modified:   roles/object_diff/tests/object_diff.yml
	modified:   tests/configure_controller_export_model.yml
	modified:   tests/playbooks/README.md
	modified:   tests/playbooks/cd_gitlab_webhook_trigger.yml
@ivarmu ivarmu deleted the aap_configuration_extended_issue50_backport branch January 7, 2026 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

back porting some updates to infra.controller_configuration

2 participants