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

Remove drpm test and fix borked CI #3323

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Conversation

dralley
Copy link
Contributor

@dralley dralley commented Nov 21, 2023

No description provided.

@github-actions github-actions bot added the multi-commit Added when a PR consists of more than one commit label Nov 21, 2023
@dralley dralley removed the multi-commit Added when a PR consists of more than one commit label Nov 21, 2023
@dralley dralley requested a review from ipanova November 21, 2023 03:16
@dralley dralley marked this pull request as draft November 21, 2023 04:03
@github-actions github-actions bot added the multi-commit Added when a PR consists of more than one commit label Nov 22, 2023
@dralley dralley removed the multi-commit Added when a PR consists of more than one commit label Nov 22, 2023
@@ -870,7 +872,8 @@ def test_complete_mirror_with_delta_metadata_fails(init_and_sync):
Otherwise we would be mirroring the metadata without mirroring the DRPM packages.
"""
with pytest.raises(PulpTaskError) as exc:
init_and_sync(url=DRPM_UNSIGNED_FIXTURE_URL, sync_policy="mirror_complete")
pass
# init_and_sync(url=DRPM_UNSIGNED_FIXTURE_URL, sync_policy="mirror_complete")
Copy link
Member

Choose a reason for hiding this comment

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

can you remove this commented out line instead?
you anyway deleted this from constants

Copy link
Contributor Author

@dralley dralley Nov 27, 2023

Choose a reason for hiding this comment

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

The intention is to bring it back in a mostly-identical form, does it make sense to delete the whole line? I'd rather it be obvious what this was doing before it was disabled.

Actually the only reason it's commented at all is because the constant was deleted, otherwise I'd just leave it intact but disabled.

@github-actions github-actions bot added the multi-commit Added when a PR consists of more than one commit label Nov 25, 2023
@dralley dralley force-pushed the remove-drpm-test branch 5 times, most recently from ff075ee to 19b3fd1 Compare November 28, 2023 03:03
It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.

[noissue]
@dralley dralley force-pushed the remove-drpm-test branch 3 times, most recently from 870ece5 to 9c38f5b Compare November 28, 2023 04:03
@dralley dralley changed the title Remove drpm test Remove drpm test and fix borked CI Nov 28, 2023
@dralley dralley force-pushed the remove-drpm-test branch 3 times, most recently from bc0fa93 to c2ef297 Compare November 28, 2023 06:09
@dralley dralley marked this pull request as ready for review November 28, 2023 06:48
@dralley dralley requested a review from ipanova November 28, 2023 06:49
@dralley dralley marked this pull request as draft November 28, 2023 06:49
@dralley
Copy link
Contributor Author

dralley commented Nov 28, 2023

We need to backport all of this, but of course patchback won't help us with multiple commits. @ipanova Should we squash and merge, or should I submit parts of this as independent PRs (like commit 3)?

@dralley dralley marked this pull request as ready for review November 28, 2023 14:23
@ipanova
Copy link
Member

ipanova commented Nov 28, 2023

I'd squash it. Leave in the commit comment more info, i.e bullets on was done

@dralley dralley merged commit 392e74b into pulp:main Nov 28, 2023
Copy link

patchback bot commented Nov 28, 2023

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

❌ Failed to cleanly apply 392e74b on top of patchback/backports/3.18/392e74be907a6b588b3ad02ecc47eea3258b0d94/pr-3323

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

@dralley dralley deleted the remove-drpm-test branch November 28, 2023 15:23
Copy link

patchback bot commented Nov 28, 2023

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

❌ Failed to cleanly apply 392e74b on top of patchback/backports/3.19/392e74be907a6b588b3ad02ecc47eea3258b0d94/pr-3323

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

Copy link

patchback bot commented Nov 28, 2023

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

❌ Failed to cleanly apply 392e74b on top of patchback/backports/3.22/392e74be907a6b588b3ad02ecc47eea3258b0d94/pr-3323

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

Copy link

patchback bot commented Nov 28, 2023

Backport to 3.23: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.23/392e74be907a6b588b3ad02ecc47eea3258b0d94/pr-3323

Backported as #3337

🤖 @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 Nov 28, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template

(cherry picked from commit 392e74b)
dralley added a commit that referenced this pull request Nov 28, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template

(cherry picked from commit 392e74b)

Co-authored-by: Daniel Alley <dalley@redhat.com>
dralley added a commit to dralley/pulp_rpm that referenced this pull request Nov 29, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template
dralley added a commit that referenced this pull request Nov 29, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template
dralley added a commit to dralley/pulp_rpm that referenced this pull request Nov 29, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template
dralley added a commit to dralley/pulp_rpm that referenced this pull request Nov 29, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template
Copy link

patchback bot commented Dec 12, 2023

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

❌ Failed to cleanly apply 392e74b on top of patchback/backports/3.23/392e74be907a6b588b3ad02ecc47eea3258b0d94/pr-3323

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

Copy link

patchback bot commented Dec 12, 2023

Backport to 3.24: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.24/392e74be907a6b588b3ad02ecc47eea3258b0d94/pr-3323

Backported as #3363

🤖 @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 Dec 12, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template

(cherry picked from commit 392e74b)
dralley added a commit that referenced this pull request Dec 12, 2023
* Skip test that uses DRPM fixture, for now. It's not worth maintaining the fixture, and in the future we ought to be
able to do this test without it.
* Made metadata downloading util agnostic to compression type
* Ditch all usages of http_get and http_get_headers for requests
* Fix CI after working directory adjustment in the template

(cherry picked from commit 392e74b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.22 multi-commit Added when a PR consists of more than one commit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants