Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 2109697: Port to ansible-core #12397

Merged
merged 2 commits into from Jul 21, 2022
Merged

Bug 2109697: Port to ansible-core #12397

merged 2 commits into from Jul 21, 2022

Conversation

yselkowitz
Copy link
Contributor

@yselkowitz yselkowitz commented Jun 23, 2022 •
edited

Ansible Engine 2.9 is going out of support, and being replaced by ansible-core in RHEL AppStream. Therefore, openshift-ansible needs to migrate. Since this requires modules which are no longer builtin the core but provided through collections -- seboolean and sysctl from ansible.posix, and ini_file from community.general -- those need to be either bundled or their collections packaged as RPMs.

/cc @patrickdillon @barbacbd

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 23, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 23, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

This was referenced Jun 23, 2022
Closed
Closed
@yselkowitz yselkowitz force-pushed the ansible-core-2-12 branch 4 times, most recently from 475da2a to 7829b85 Compare June 24, 2022 16:25
barbacbd
barbacbd reviewed Jul 6, 2022
View reviewed changes
Copy link
Contributor

@barbacbd barbacbd left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2022
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 18, 2022
@yselkowitz
Copy link
Contributor Author

/test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 18, 2022
@yselkowitz
Copy link
Contributor Author

/test all

@yselkowitz
Copy link
Contributor Author

/test all

@yselkowitz
Copy link
Contributor Author

/test e2e-aws-workers-rhel8

@yselkowitz
Copy link
Contributor Author

/test e2e-aws-workers-rhel8

1 similar comment
@yselkowitz
Copy link
Contributor Author

/test e2e-aws-workers-rhel8

@yselkowitz
Copy link
Contributor Author

/test e2e-aws-workers-rhel8

barbacbd
barbacbd reviewed Jul 19, 2022
View reviewed changes
requirements.txt Outdated Show resolved Hide resolved
@yselkowitz yselkowitz changed the title WIP: Port to ansible-core+collections Port to ansible-core Jul 19, 2022
@yselkowitz yselkowitz marked this pull request as ready for review July 19, 2022 22:05
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 19, 2022
@yselkowitz
Copy link
Contributor Author

/retest

@yselkowitz yselkowitz force-pushed the ansible-core-2-12 branch 2 times, most recently from 41d3692 to d1a4c1e Compare July 20, 2022 03:19
@yselkowitz
Copy link
Contributor Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 20, 2022

@yselkowitz: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@yselkowitz
Copy link
Contributor Author

This is a big one, so if need be let's discuss further.
/assign @patrickdillon @barbacbd

@patrickdillon
Copy link
Contributor

those need to be either bundled or their collections packaged as RPMs.

Would you mind elaborating a little bit more on these options? I think we should try to get together for a meeting soon (I will send an invite)--I will try to educate myself on this in the meantime.

Are the .py files you added for each of these dependencies a temporary workaround or are these expected to be merged?

@yselkowitz
Copy link
Contributor Author

The patch in its current state represents the "bundled" option, in which case the .py files are the dependencies, and barring a much more complicated path to extract these from their collection tarballs in the spec file, would be added here.

barbacbd
barbacbd reviewed Jul 21, 2022
View reviewed changes
Copy link
Contributor

@barbacbd barbacbd left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 21, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 21, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: barbacbd, yselkowitz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit b8061f6 into openshift:master Jul 21, 2022
@yselkowitz
Copy link
Contributor Author

/cherry-pick release-4.11

@yselkowitz yselkowitz deleted the ansible-core-2-12 branch July 21, 2022 20:34
@openshift-cherrypick-robot
Copy link

@yselkowitz: #12397 failed to apply on top of branch "release-4.11":

Applying: Bundle non-core modules
Applying: Port to ansible-core
Using index info to reconstruct a base tree...
M	images/installer/Dockerfile
M	openshift-ansible.spec
Falling back to patching base and 3-way merge...
Auto-merging openshift-ansible.spec
CONFLICT (content): Merge conflict in openshift-ansible.spec
Auto-merging images/installer/Dockerfile
CONFLICT (content): Merge conflict in images/installer/Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Port to ansible-core
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@yselkowitz
Copy link
Contributor Author

cherry-pick depends on CI backport #12412

@yselkowitz yselkowitz changed the title Port to ansible-core Bug 2109697: Port to ansible-core Jul 21, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 21, 2022

@yselkowitz: All pull requests linked via external trackers have merged:

Bugzilla bug 2109697 has been moved to the MODIFIED state.

In response to this:

Bug 2109697: Port to ansible-core

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@yselkowitz
Copy link
Contributor Author

/cherry-pick release-4.11

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 10, 2022
Merged
@openshift-cherrypick-robot
Copy link

@yselkowitz: new pull request created: #12416

In response to this:

/cherry-pick release-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barbacbd barbacbd barbacbd left review comments

@patrickdillon patrickdillon Awaiting requested review from patrickdillon

Assignees

@patrickdillon patrickdillon

@barbacbd barbacbd

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@yselkowitz @patrickdillon @openshift-cherrypick-robot @barbacbd @openshift-merge-robot