⚠️ CONFLICT! Lineage pull request for: skeleton

[cisagovbot]

Lineage Pull Request: CONFLICT

Lineage has created this pull request to incorporate new changes found in an upstream repository:

Upstream repository: https://github.com/cisagov/skeleton-packer.git
Remote branch: HEAD

Check the changes in this pull request to ensure they won't cause issues with your project.

The lineage/skeleton branch has one or more unresolved merge conflicts that you must resolve before merging this pull request!

How to resolve the conflicts

1. Take ownership of this pull request by removing any other assignees.

2. Clone the repository locally, and reapply the merge:

   git clone git@github.com:cisagov/freeipa-server-packer.git freeipa-server-packer
   cd freeipa-server-packer
   git remote add skeleton https://github.com/cisagov/skeleton-packer.git
   git remote set-url --push skeleton no_push
   git switch develop
   git switch --create lineage/skeleton --track origin/develop
   git pull skeleton HEAD
   git status

3. Review the changes displayed by the status command. Fix any conflicts and possibly incorrect auto-merges.

4. After resolving each of the conflicts, add your changes to the branch, commit, and push your changes:

   git add ansible/requirements.yml ansible/wazuh_agent.yml requirements.txt 
   git commit
   git push --force --set-upstream origin lineage/skeleton

   Note that you may append to the default merge commit message that git creates for you, but please do not delete the existing content. It provides useful information about the merge that is being performed.

5. Wait for all the automated tests to pass.

6. Confirm each item in the "Pre-approval checklist" below.

7. Remove any of the checklist items that do not apply.

8. Ensure every remaining checkbox has been checked.

9. Mark this draft pull request "Ready for review".

✅ Pre-approval checklist

• ✌️ The conflicts in this pull request have been resolved.
• All relevant type-of-change labels have been added.
• All new and existing tests pass.

---

Note

You are seeing this because one of this repository's maintainers has configured Lineage to open pull requests.

For more information:

🛠 Lineage configurations for this project are stored in .github/lineage.yml

📚 Read more about Lineage

[Copilot]

Pull request overview

This Lineage-generated sync PR pulls in upstream “skeleton” changes to keep this repository’s dependency/install plumbing aligned with the shared CISAGov template, particularly around Ansible collection usage.

Changes:

• Document boto3 as required due to use of amazon.aws.s3_object.
• Add required Ansible collections (amazon.aws, community.general) to ansible/requirements.yml.
• Update the GitHub Actions lint workflow to install both Ansible roles and collections.

Reviewed changes

Copilot reviewed 2 out of 3 changed files in this pull request and generated 4 comments.

File	Description
requirements.txt	Updates commentary explaining why boto3 is included.
ansible/requirements.yml	Introduces explicit Ansible collection requirements alongside roles.
.github/workflows/build.yml	Installs Ansible roles and collections during the lint job.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.