Skip to content

Pass credentials conditionally for controller projects #156

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

Merged
merged 3 commits into from
Apr 11, 2025

Conversation

abhikdps
Copy link
Contributor

@abhikdps abhikdps commented Apr 8, 2025

  • This PR adds a credential field under controller project which can be used to pass a SCM credential when creating a project on AAP.
  • This field will be omitted if no credential is passed.
  • This is to provide support to create a pattern template from a private repository in Ansible Portal.

@abhikdps abhikdps marked this pull request as ready for review April 8, 2025 08:49
@hakbailey
Copy link
Collaborator

@abhikdps Could you please add a changelog fragment for this?

@abhikdps
Copy link
Contributor Author

@hakbailey Added the changelog fragment

@abhikdps
Copy link
Contributor Author

@hakbailey @alinabuzachis Can one of you please merge the PR since I don't have access to merge to this repository?

@GomathiselviS GomathiselviS merged commit 62bd419 into redhat-cop:main Apr 11, 2025
25 of 27 checks passed
@mandar242 mandar242 added the backport-2.0 PR should be backported to the stable-2.0 branch label Apr 18, 2025
Copy link

patchback bot commented Apr 18, 2025

Backport to stable-2: 💔 cherry-picking failed — target branch does not exist

❌ Failed to find branch stable-2

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

@mandar242 mandar242 added backport-2.0 PR should be backported to the stable-2.0 branch and removed backport-2.0 PR should be backported to the stable-2.0 branch labels Apr 18, 2025
Copy link

patchback bot commented Apr 18, 2025

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

❌ Failed to cleanly apply 62bd419 on top of patchback/backports/stable-2.0/62bd4195630f1b0cd52ab47b22e1b6b4be716cb1/pr-156

Backporting merged PR #156 into main

  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/redhat-cop/cloud.aws_ops.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-2.0/62bd4195630f1b0cd52ab47b22e1b6b4be716cb1/pr-156 upstream/stable-2.0
  4. Now, cherry-pick PR Pass credentials conditionally for controller projects #156 contents into that branch:
    $ git cherry-pick -x 62bd4195630f1b0cd52ab47b22e1b6b4be716cb1
    If it'll yell at you with something like fatal: Commit 62bd4195630f1b0cd52ab47b22e1b6b4be716cb1 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 62bd4195630f1b0cd52ab47b22e1b6b4be716cb1
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Pass credentials conditionally for controller projects #156 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.0/62bd4195630f1b0cd52ab47b22e1b6b4be716cb1/pr-156
  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.

mandar242 pushed a commit to mandar242/cloud.aws_ops that referenced this pull request Apr 18, 2025
…ential

Pass credentials conditionally for controller projects

(cherry picked from commit 62bd419)
@mandar242 mandar242 added backport-3 and removed backport-2.0 PR should be backported to the stable-2.0 branch labels Apr 21, 2025
Copy link

patchback bot commented Apr 21, 2025

Backport to stable-3: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-3/62bd4195630f1b0cd52ab47b22e1b6b4be716cb1/pr-156

Backported as #157

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

patchback bot pushed a commit that referenced this pull request Apr 21, 2025
Pass credentials conditionally for controller projects

(cherry picked from commit 62bd419)
mandar242 pushed a commit that referenced this pull request Apr 22, 2025
Pass credentials conditionally for controller projects

(cherry picked from commit 62bd419)

Co-authored-by: GomathiselviS <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants