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

Update integration test guide docker flag usage #1731

Merged
merged 2 commits into from
Aug 7, 2024

Point users to the right section in ansible-test integration --help

9c4c9f4
Select commit
Loading
Failed to load commit list.
Merged

Update integration test guide docker flag usage #1731

Point users to the right section in ansible-test integration --help
9c4c9f4
Select commit
Loading
Failed to load commit list.
Patchback / Backport to stable-2.15 completed Aug 7, 2024 in 18s

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

❌ Failed to cleanly apply e2137b1 on top of patchback/backports/stable-2.15/e2137b19a5bbc9cc7406fb5f45af4b3f1a75b421/pr-1731

Details

Backporting merged PR #1731 into devel

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