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

snap_alias: fix regex expression when listing aliases #6361

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Apr 18, 2023

SUMMARY

While testing integration tests for ubuntu bumped into an error because the regular expression expected snap names to match [\w-]+ but in Ubuntu there comes one named lxd.lxc. Replacing with \S+.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

snap_alias

@ansibullbot ansibullbot added bug This issue/PR relates to a bug integration tests/integration module module os packaging plugins plugin (any type) tests tests labels Apr 18, 2023
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-5 labels Apr 18, 2023
@felixfontein
Copy link
Collaborator

This needs a changelog fragment.

@Andersson007
Copy link
Contributor

bot_status

@ansibullbot
Copy link
Collaborator

Components

changelogs/fragments/6361-snap-alias-regex-bugfix.yml
support: community
maintainers:

plugins/modules/snap_alias.py
support: community
maintainers: russoz

tests/integration/targets/snap_alias/aliases
support: community
maintainers:

Metadata

waiting_on: maintainer
changes_requested_by: null
needs_info: False
needs_revision: False
needs_rebase: False
merge_commits: []
too many files or commits: False
mergeable_state: clean
ci_status: success
maintainer_shipits (module maintainers): 1
community_shipits (namespace maintainers): 0
ansible_shipits (core team members): 0
shipit_actors (maintainers or core team members): russoz
shipit_actors_other: []
automerge: automerge shipit test failed

click here for bot help

@felixfontein felixfontein merged commit 4171418 into ansible-collections:main Apr 20, 2023
@patchback
Copy link

patchback bot commented Apr 20, 2023

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

❌ Failed to cleanly apply 4171418 on top of patchback/backports/stable-5/4171418e37d9eeab4fa0005528f8ee12008949de/pr-6361

Backporting merged PR #6361 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.general.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-5/4171418e37d9eeab4fa0005528f8ee12008949de/pr-6361 upstream/stable-5
  4. Now, cherry-pick PR snap_alias: fix regex expression when listing aliases #6361 contents into that branch:
    $ git cherry-pick -x 4171418e37d9eeab4fa0005528f8ee12008949de
    If it'll yell at you with something like fatal: Commit 4171418e37d9eeab4fa0005528f8ee12008949de is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 4171418e37d9eeab4fa0005528f8ee12008949de
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR snap_alias: fix regex expression when listing aliases #6361 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-5/4171418e37d9eeab4fa0005528f8ee12008949de/pr-6361
  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 felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Apr 20, 2023
@patchback
Copy link

patchback bot commented Apr 20, 2023

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/4171418e37d9eeab4fa0005528f8ee12008949de/pr-6361

Backported as #6378

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

@felixfontein
Copy link
Collaborator

@russoz thanks for your contribution!

patchback bot pushed a commit that referenced this pull request Apr 20, 2023
* snap_alias: fix regex expression when listing aliases

* simplify regex, add changelog

(cherry picked from commit 4171418)
felixfontein pushed a commit that referenced this pull request Apr 20, 2023
…on when listing aliases (#6378)

snap_alias: fix regex expression when listing aliases (#6361)

* snap_alias: fix regex expression when listing aliases

* simplify regex, add changelog

(cherry picked from commit 4171418)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
@russoz russoz deleted the snap_alias-bugfix branch April 20, 2023 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug integration tests/integration module module os packaging plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants