Skip to content

Bug 1806780: release: Mirroring from custom directory via oc adm release mirror fails #446

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
Merged
openshift-merge-robot merged 1 commit into from
Jun 3, 2020
Merged

Bug 1806780: release: Mirroring from custom directory via oc adm release mirror fails #446

openshift-merge-robot merged 1 commit into from
Jun 3, 2020

Conversation

@wking
Copy link
Member

@wking wking commented Jun 1, 2020

The command fails when specifying a non-default from directory because the from directory was not passed to either extract or mirror. Add that transformation.

Also include the Parallel options as good practice even if they are not heavily used in these flows.

Backporting e1567dd (#424) and resolving a context conflict because 4.4 does not include 2725cfa (#358).

@smarterclayton @wking
release: Mirroring from custom directory via oc adm release mirror fails
4882c8f 
The command fails when specifying a non-default from directory because
the from directory was not passed to either extract or mirror. Add that
transformation.

Also include the Parallel options as good practice even if they are
not heavily used in these flows.

Backporting e1567dd (openshift#424) and
resolving a context conflict because 4.4 does not include 2725cfa
(release: Support `-o commit` on `oc adm release extract --git`,
2020-03-26, openshift#358).
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 1, 2020

@wking: This pull request references Bugzilla bug 1806780, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.4.z) matches configured target release for branch (4.4.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1806779 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1806779 targets the "4.5.0" release, which is one of the valid target releases: 4.5.0, 4.5.z
  • bug has dependents
Details

In response to this:

Bug 1806780: release: Mirroring from custom directory via oc adm release mirror fails

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jun 1, 2020
soltysh
soltysh approved these changes Jun 2, 2020
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 2, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: soltysh, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 2, 2020
@mfojtik mfojtik added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 3, 2020
@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 3, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 3, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit d038424 into openshift:release-4.4 Jun 3, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 3, 2020

@wking: All pull requests linked via external trackers have merged: openshift/oc#446, openshift/oc#327. Bugzilla bug 1806780 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1806780: release: Mirroring from custom directory via oc adm release mirror fails

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@wking wking deleted the parallel-options branch June 3, 2020 13:13
@wking
Copy link
Member Author

wking commented Jun 8, 2020

/cherrypick release-4.3

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jun 8, 2020

@wking: #446 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/cli/admin/release/extract.go
M	pkg/cli/admin/release/mirror.go
M	pkg/cli/admin/release/new.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cli/admin/release/new.go
Auto-merging pkg/cli/admin/release/mirror.go
CONFLICT (content): Merge conflict in pkg/cli/admin/release/mirror.go
Auto-merging pkg/cli/admin/release/extract.go
Patch failed at 0001 release: Mirroring from custom directory via oc adm release mirror fails
Details

In response to this:

/cherrypick release-4.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@wking
Copy link
Member Author

wking commented Jun 8, 2020 •
edited
Loading

I'll try again after #456 lands... Or manually build on top, or something...

wking pushed a commit to wking/oc that referenced this pull request Jun 8, 2020
@smarterclayton @wking
release: Mirroring from custom directory via oc adm release mirror fails
dbe3f73 
The command fails when specifying a non-default from directory because
the from directory was not passed to either extract or mirror. Add that
transformation.

Also include the Parallel options as good practice even if they are
not heavily used in these flows.

Backporting 4882c8f (openshift#446) and
resolving a context conflict because 4.3 does not include 3ddaf4d
(cherry-pick 331c1a1, 2020-04-17, openshift#426).
This was referenced Jun 8, 2020
Closed
Merged
@wking
Copy link
Member Author

wking commented Jun 8, 2020

Manually backported to 4.3 with #458.

@wking wking mentioned this pull request Jun 8, 2020
Closed
wking pushed a commit to wking/oc that referenced this pull request Jun 26, 2020
@smarterclayton @wking
release: Mirroring from custom directory via oc adm release mirror fails
fdc81b9 
The command fails when specifying a non-default from directory because
the from directory was not passed to either extract or mirror. Add that
transformation.

Also include the Parallel options as good practice even if they are
not heavily used in these flows.

Backporting 4882c8f (openshift#446) and
resolving a context conflict because 4.3 does not include 3ddaf4d
(cherry-pick 331c1a1, 2020-04-17, openshift#426).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

1 more reviewer

@soltysh soltysh soltysh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@soltysh soltysh

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@wking @openshift-ci-robot @openshift-bot @openshift-cherrypick-robot @soltysh @mfojtik @openshift-merge-robot @smarterclayton