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.

Sign up for GitHub

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

Jump to bottom

Get correct version of pulp-cli tests #604

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Get correct version of pulp-cli tests #604

merged 1 commit into from
Mar 5, 2024

Conversation

markafarrell
Copy link
Contributor

Fixes #603

@markafarrell markafarrell changed the title Get correct version of pulp-cli tests Draft: Get correct version of pulp-cli tests Feb 28, 2024
@markafarrell markafarrell force-pushed the fix/get-correct-pulp-cli-tests branch from e48524f to 17c6f8c Compare February 29, 2024 00:20
@markafarrell markafarrell changed the title Draft: Get correct version of pulp-cli tests Get correct version of pulp-cli tests Feb 29, 2024
@markafarrell markafarrell mentioned this pull request Feb 29, 2024
Closed
@markafarrell
Copy link
Contributor Author

We have an issue as CI is attempting to use pulp/pulp-web:3.48.0 but this does not exist on dockerhub.

Not sure how we resolve this.

@markafarrell markafarrell force-pushed the fix/get-correct-pulp-cli-tests branch 4 times, most recently from 126e756 to 17c6f8c Compare February 29, 2024 04:35
@markafarrell
Copy link
Contributor Author

We have an issue as CI is attempting to use pulp/pulp-web:3.48.0 but this does not exist on dockerhub.

Not sure how we resolve this.

Seems to have resolved itself.

😃

mdellweg
mdellweg reviewed Feb 29, 2024
View reviewed changes
images/s6_assets/pulp_tests.sh Outdated
print(Version(importlib.metadata.version("pulp-cli")))')

# Checkout git repo for pulp-cli at correct version to fetch tests
if [ ! -d pulp-cli ]; then
git clone --depth=1 https://github.com/pulp/pulp-cli.git
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
git clone --depth=1 https://github.com/pulp/pulp-cli.git
git clone --depth=1 https://github.com/pulp/pulp-cli.git -b "${PULP_CLI_VERSION}"

You should be able to clone that tag directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I have made the change

@markafarrell markafarrell force-pushed the fix/get-correct-pulp-cli-tests branch from 17c6f8c to e7ca1b2 Compare February 29, 2024 22:15
@markafarrell markafarrell force-pushed the fix/get-correct-pulp-cli-tests branch from e7ca1b2 to 7074ee5 Compare February 29, 2024 22:17
@mdellweg mdellweg merged commit b0dd452 into pulp:latest Mar 5, 2024
15 checks passed
@patchback Patchback
Copy link

patchback bot commented Mar 6, 2024 •
edited
Loading

Backport to 3.28: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply b0dd452 on top of patchback/backports/3.28/b0dd4529fca3ae5f1604fb6af3583384b2e5f197/pr-604

Backporting merged PR #604 into latest

  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/pulp/pulp-oci-images.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/3.28/b0dd4529fca3ae5f1604fb6af3583384b2e5f197/pr-604 upstream/3.28
  4. Now, cherry-pick PR Get correct version of pulp-cli tests #604 contents into that branch: 
    $ git cherry-pick -x b0dd4529fca3ae5f1604fb6af3583384b2e5f197
    If it'll yell at you with something like fatal: Commit b0dd4529fca3ae5f1604fb6af3583384b2e5f197 is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x b0dd4529fca3ae5f1604fb6af3583384b2e5f197
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Get correct version of pulp-cli tests #604 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/3.28/b0dd4529fca3ae5f1604fb6af3583384b2e5f197/pr-604
  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 Patchback
Copy link

patchback bot commented Mar 6, 2024 •
edited
Loading

Backport to 3.39: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.39/b0dd4529fca3ae5f1604fb6af3583384b2e5f197/pr-604

Backported as #608

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

@patchback Patchback
Copy link

patchback bot commented Mar 6, 2024 •
edited
Loading

Backport to 3.45: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.45/b0dd4529fca3ae5f1604fb6af3583384b2e5f197/pr-604

Backported as #609

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

This was referenced Mar 6, 2024
Merged
Merged
gerrod3 pushed a commit to gerrod3/pulp-oci-images that referenced this pull request Mar 6, 2024
@mdellweg @gerrod3
Merge pull request pulp#604 from markafarrell/fix/get-correct-pulp-cl…
ca1100a 
…i-tests

Get correct version of pulp-cli tests

(cherry picked from commit b0dd452)
gerrod3 pushed a commit to gerrod3/pulp-oci-images that referenced this pull request Mar 6, 2024
@markafarrell @gerrod3
Backport pulp#604 to 3.22
fc28c1e 
Get correct version of pulp-cli tests

(cherry picked from commit b0dd452)
gerrod3 pushed a commit to gerrod3/pulp-oci-images that referenced this pull request Mar 6, 2024
@markafarrell @gerrod3
Backport pulp#604 to 3.22
44ca543 
Get correct version of pulp-cli tests

(cherry picked from commit b0dd452)
[noissue]
mdellweg added a commit that referenced this pull request Mar 7, 2024
@mdellweg @patchback
Merge pull request #604 from markafarrell/fix/get-correct-pulp-cli-tests
82deef0 
Get correct version of pulp-cli tests

(cherry picked from commit b0dd452)
mdellweg added a commit that referenced this pull request Mar 7, 2024
@mdellweg
Merge pull request #609 from pulp/patchback/backports/3.45/b0dd4529fc…
37e0e61 
…a3ae5f1604fb6af3583384b2e5f197/pr-604

[PR #604/b0dd4529 backport][3.45] Get correct version of pulp-cli tests
mdellweg added a commit that referenced this pull request Mar 7, 2024
@mdellweg
Merge pull request #608 from pulp/patchback/backports/3.39/b0dd4529fc…
5f75f0a 
…a3ae5f1604fb6af3583384b2e5f197/pr-604

[PR #604/b0dd4529 backport][3.39] Get correct version of pulp-cli tests
gerrod3 pushed a commit to gerrod3/pulp-oci-images that referenced this pull request Mar 8, 2024
@mdellweg @gerrod3
Merge pull request pulp#604 from markafarrell/fix/get-correct-pulp-cl…
d40698a 
…i-tests

Get correct version of pulp-cli tests

(cherry picked from commit b0dd452)
ggainey added a commit that referenced this pull request Mar 11, 2024
@ggainey
Merge pull request #610 from gerrod3/patchback/backports/3.28/b0dd452…
2a8b4dd 
…9fca3ae5f1604fb6af3583384b2e5f197/pr-604

Backport #604 to 3.28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdellweg mdellweg mdellweg approved these changes

Assignees
No one assigned
Labels
backport-3.28 backport-3.39
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

OCI images cli tests keep failing.
3 participants
@markafarrell @mdellweg @gerrod3