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.

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

Remove OCI Env #2445

Merged
merged 1 commit into from
Mar 8, 2025
Merged

Remove OCI Env #2445

merged 1 commit into from
Mar 8, 2025

Conversation

fao89
Copy link
Member

@fao89 fao89 commented Mar 7, 2025

Initial PR for removing OCI Env,
I'll start other PRs for improving the docs and makefile
Issue: AAP-32608

@fao89 fao89 marked this pull request as ready for review March 7, 2025 19:29
@fao89 fao89 force-pushed the AAP-32608 branch 2 times, most recently from 91292bc to dd9319c Compare March 7, 2025 20:25

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
@fao89 fao89 requested review from a team March 7, 2025 21:16
Copy link

sonarqubecloud bot commented Mar 7, 2025

@rochacbruno rochacbruno added backport-4.10 backport-4.9 This PR should be backported to stable-4.9 (2.4) labels Mar 7, 2025
@fao89 fao89 merged commit baaa371 into ansible:master Mar 8, 2025
17 of 19 checks passed
Copy link

patchback bot commented Mar 8, 2025

Backport to stable-4.9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply baaa371 on top of patchback/backports/stable-4.9/baaa3710d5b7bf705ea7a0c6a28741680d72e379/pr-2445

Backporting merged PR #2445 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/galaxy_ng.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.9/baaa3710d5b7bf705ea7a0c6a28741680d72e379/pr-2445 upstream/stable-4.9
  4. Now, cherry-pick PR Remove OCI Env #2445 contents into that branch:
    $ git cherry-pick -x baaa3710d5b7bf705ea7a0c6a28741680d72e379
    If it'll yell at you with something like fatal: Commit baaa3710d5b7bf705ea7a0c6a28741680d72e379 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x baaa3710d5b7bf705ea7a0c6a28741680d72e379
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove OCI Env #2445 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.9/baaa3710d5b7bf705ea7a0c6a28741680d72e379/pr-2445
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Mar 8, 2025

Backport to stable-4.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply baaa371 on top of patchback/backports/stable-4.10/baaa3710d5b7bf705ea7a0c6a28741680d72e379/pr-2445

Backporting merged PR #2445 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/galaxy_ng.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.10/baaa3710d5b7bf705ea7a0c6a28741680d72e379/pr-2445 upstream/stable-4.10
  4. Now, cherry-pick PR Remove OCI Env #2445 contents into that branch:
    $ git cherry-pick -x baaa3710d5b7bf705ea7a0c6a28741680d72e379
    If it'll yell at you with something like fatal: Commit baaa3710d5b7bf705ea7a0c6a28741680d72e379 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x baaa3710d5b7bf705ea7a0c6a28741680d72e379
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove OCI Env #2445 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.10/baaa3710d5b7bf705ea7a0c6a28741680d72e379/pr-2445
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

fao89 added a commit to fao89/ansible-hub-ui that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
ref: ansible/galaxy_ng#2445
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/ansible-hub-ui that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
ref: ansible/galaxy_ng#2445
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/ansible-hub-ui that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
ref: ansible/galaxy_ng#2445
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
rochacbruno pushed a commit to ansible/ansible-hub-ui that referenced this pull request Mar 10, 2025

Verified

This commit was created on github.com and signed with GitHub’s verified signature.
ref: ansible/galaxy_ng#2445
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
rochacbruno pushed a commit that referenced this pull request Mar 10, 2025

Verified

This commit was created on github.com and signed with GitHub’s verified signature.
Remove OCI Env (#2445)

Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
No-Issue
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit to fao89/galaxy_ng that referenced this pull request Mar 10, 2025

Verified

This commit was signed with the committer’s verified signature.
fao89 Fabricio Aguiar
Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
fao89 added a commit that referenced this pull request Mar 11, 2025

Verified

This commit was created on github.com and signed with GitHub’s verified signature.
Remove OCI Env (#2445)

Issue: AAP-32608
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

(cherry picked from commit baaa371)
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.9 This PR should be backported to stable-4.9 (2.4) backport-4.10 backported-4.9 backported-4.10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants