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

Fix ci tests #906

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Fix ci tests #906

merged 2 commits into from
Oct 2, 2023

Conversation

hstct
Copy link
Contributor

@hstct hstct commented Sep 28, 2023

Due to some recent pulpcore changes we needed to adapt some tests in order to fix the CI pipelines.

See: pulp/pulpcore#4477 pulp/pulpcore#4494

The pulpcore webserver fixtures now avoid automatic encoding
which was the reason for some of the artifacts missing. We can
now use the correct amount again.

See pulpcore#4494

[noissue]
@quba42
Copy link
Collaborator

quba42 commented Oct 2, 2023

I added a backport 3.0 label, do we need further backports?

@quba42 quba42 merged commit 1d887ea into pulp:main Oct 2, 2023
8 checks passed
@patchback
Copy link

patchback bot commented Oct 2, 2023

Backport to 3.0: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.0/1d887ea2ea22b91b67d1c09db2bc6c3ce2897454/pr-906

Backported as #907

🤖 @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 Oct 2, 2023
Fix ci tests

(cherry picked from commit 1d887ea)
@quba42
Copy link
Collaborator

quba42 commented Oct 2, 2023

I decided to go ahead and merge this, since broken tests are blocking everything.

@quba42 quba42 deleted the fix-ci-tests branch October 2, 2023 08:30
quba42 added a commit that referenced this pull request Oct 2, 2023
…2b91b67d1c09db2bc6c3ce2897454/pr-906

[PR #906/1d887ea2 backport][3.0] Fix ci tests
@patchback
Copy link

patchback bot commented Oct 16, 2023

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

❌ Failed to cleanly apply 1d887ea on top of patchback/backports/2.21/1d887ea2ea22b91b67d1c09db2bc6c3ce2897454/pr-906

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

@hstct
Copy link
Contributor Author

hstct commented Oct 16, 2023

We are still using the old tests for 2.21 therefore we can't cherry-pick this commit. Here is a manual change #917

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.

2 participants