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

Ensure that container remotes exclude source images by default. #1238

Merged
merged 2 commits into from
May 3, 2022

Conversation

newswangerd
Copy link
Member

@newswangerd newswangerd commented Apr 29, 2022

Issue: AAH-1557

Description 🛠

Fixes: https://issues.redhat.com/browse/AAH-1557

This makes it so that all new container remotes exclude image tags matching "*-source" by default.

Reviewer Checklists 👀

Developer reviewer:

  • Code looks sound, good architectural decisions, no code smells
  • There is a Jira issue associated (note that "No-Issue" should be rarely used)
  • Tests are included in galaxy_ng/tests/integration or galaxy_ng/tests/functional, and they fully cover necessary test scenarios… or tests not needed

QE reviewer (exceptions):

  • Tests are included in galaxy_ng/tests/integration or galaxy_ng/tests/functional, and they fully cover necessary test scenarios… or tests not needed
  • PR meets applicable Acceptance Criteria for associated Jira issue

Note: when merging, include the Jira issue link in the squashed commit

@netlify
Copy link

netlify bot commented Apr 29, 2022

Deploy Preview for galaxyng ready!

Name Link
🔨 Latest commit 1c291d6
🔍 Latest deploy log https://app.netlify.com/sites/galaxyng/deploys/626c2e447a7a9e0008720fef
😎 Deploy Preview https://deploy-preview-1238--galaxyng.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@newswangerd newswangerd added backported-4.3 This PR has been backported to stable-4.3 (2.0) backported-4.4 This PR has been backported to stable-4.4 (2.1) labels Apr 29, 2022
@newswangerd
Copy link
Member Author

@ipanova how does this look?

@ipanova
Copy link

ipanova commented May 2, 2022

@ipanova how does this look?

Looks good.

@newswangerd newswangerd merged commit 6e8148b into ansible:master May 3, 2022
@newswangerd newswangerd added backport-4.3 This PR should be backported to stable-4.3 (2.0) backport-4.4 This PR should be backported to stable-4.4 (2.1) and removed backported-4.3 This PR has been backported to stable-4.3 (2.0) backported-4.4 This PR has been backported to stable-4.4 (2.1) labels May 3, 2022
@patchback
Copy link

patchback bot commented May 3, 2022

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

❌ Failed to cleanly apply 6e8148b on top of patchback/backports/stable-4.3/6e8148b71dc2ea6c14658581166474e93c44e8b5/pr-1238

Backporting merged PR #1238 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.3/6e8148b71dc2ea6c14658581166474e93c44e8b5/pr-1238 upstream/stable-4.3
  4. Now, cherry-pick PR Ensure that container remotes exclude source images by default. #1238 contents into that branch:
    $ git cherry-pick -x 6e8148b71dc2ea6c14658581166474e93c44e8b5
    If it'll yell at you with something like fatal: Commit 6e8148b71dc2ea6c14658581166474e93c44e8b5 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 6e8148b71dc2ea6c14658581166474e93c44e8b5
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Ensure that container remotes exclude source images by default. #1238 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.3/6e8148b71dc2ea6c14658581166474e93c44e8b5/pr-1238
  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.

@patchback
Copy link

patchback bot commented May 3, 2022

Backport to stable-4.4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4.4/6e8148b71dc2ea6c14658581166474e93c44e8b5/pr-1238

Backported as #1241

🤖 @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 May 3, 2022
* Ensure that container remotes exclude source images by default.

Issue: AAH-1557

* Flake8

(cherry picked from commit 6e8148b)
@newswangerd newswangerd added backport-4.5 This PR should be backported to stable-4.5 (2.2) and removed backport-4.3 This PR should be backported to stable-4.3 (2.0) labels May 3, 2022
@patchback
Copy link

patchback bot commented May 3, 2022

Backport to stable-4.5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4.5/6e8148b71dc2ea6c14658581166474e93c44e8b5/pr-1238

Backported as #1243

🤖 @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 May 3, 2022
* Ensure that container remotes exclude source images by default.

Issue: AAH-1557

* Flake8

(cherry picked from commit 6e8148b)
newswangerd added a commit that referenced this pull request May 3, 2022
… (#1241)

* Ensure that container remotes exclude source images by default.

Issue: AAH-1557

* Flake8

(cherry picked from commit 6e8148b)

Co-authored-by: David Newswanger <dnewswan@redhat.com>
@github-actions github-actions bot added the backported-4.4 This PR has been backported to stable-4.4 (2.1) label May 3, 2022
newswangerd added a commit that referenced this pull request May 4, 2022
… (#1243)

* Ensure that container remotes exclude source images by default.

Issue: AAH-1557

* Flake8

(cherry picked from commit 6e8148b)

Co-authored-by: David Newswanger <dnewswan@redhat.com>
@github-actions github-actions bot added the backported-4.5 This PR has been backported to stable-4.5 (2.2) label May 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.4 This PR should be backported to stable-4.4 (2.1) backport-4.5 This PR should be backported to stable-4.5 (2.2) backported-4.4 This PR has been backported to stable-4.4 (2.1) backported-4.5 This PR has been backported to stable-4.5 (2.2)
Projects
None yet
3 participants