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

Switch CI from ubuntu-latest to ubuntu-20.04 to avoid problems with ansible-test from ansible-core 2.12, 2.13, 2.14 #138

Merged
merged 1 commit into from
Dec 1, 2022

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

This is necessary until ansible/ansible#78550 has been backported to stable-2.12, stable-2.13, and stable-2.14.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

GHA CI

…nsible-test from ansible-core 2.12, 2.13, 2.14.
@felixfontein felixfontein marked this pull request as ready for review December 1, 2022 21:41
@codecov
Copy link

codecov bot commented Dec 1, 2022

Codecov Report

Merging #138 (6ffb7c8) into main (4ed2fc8) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #138   +/-   ##
=======================================
  Coverage   87.54%   87.54%           
=======================================
  Files          28       28           
  Lines        3597     3597           
  Branches      638      638           
=======================================
  Hits         3149     3149           
  Misses        315      315           
  Partials      133      133           
Flag Coverage Δ
integration 66.86% <ø> (ø)
sanity 22.29% <ø> (ø)
units 87.58% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
plugins/modules/api_info.py 90.14% <0.00%> (ø)
plugins/modules/api_modify.py 79.09% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@felixfontein felixfontein merged commit 338a8f2 into ansible-collections:main Dec 1, 2022
@felixfontein felixfontein deleted the ci2 branch December 1, 2022 22:15
@patchback
Copy link

patchback bot commented Dec 1, 2022

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

❌ Failed to cleanly apply 338a8f2 on top of patchback/backports/stable-1/338a8f2cd68c2729df290f9ace064ac84eb0b579/pr-138

Backporting merged PR #138 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/ansible-collections/community.routeros.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-1/338a8f2cd68c2729df290f9ace064ac84eb0b579/pr-138 upstream/stable-1
  4. Now, cherry-pick PR Switch CI from ubuntu-latest to ubuntu-20.04 to avoid problems with ansible-test from ansible-core 2.12, 2.13, 2.14 #138 contents into that branch:
    $ git cherry-pick -x 338a8f2cd68c2729df290f9ace064ac84eb0b579
    If it'll yell at you with something like fatal: Commit 338a8f2cd68c2729df290f9ace064ac84eb0b579 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 338a8f2cd68c2729df290f9ace064ac84eb0b579
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Switch CI from ubuntu-latest to ubuntu-20.04 to avoid problems with ansible-test from ansible-core 2.12, 2.13, 2.14 #138 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/338a8f2cd68c2729df290f9ace064ac84eb0b579/pr-138
  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.

felixfontein added a commit that referenced this pull request Dec 1, 2022
…nsible-test from ansible-core 2.12, 2.13, 2.14. (#138)

(cherry picked from commit 338a8f2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant