Skip to content

Conversation

mpryc
Copy link
Contributor

@mpryc mpryc commented May 19, 2025

Use of downstream fork of the Kopia repository.

Similar PR for the downstream velero project: openshift/velero#384

Note:
Before this PR downstream kopia repository was updated:

  • In the migtools/kopia repository a new branch was created from the master: master-before-making-konveyor-dev-obsolete
  • The master branch was synced from the konveyor-dev (they are now the same)
  • The master branch was made default branch, so we have similar naming there to be in sync with oadp-operator

NONE of this affected oadp-1.5 branch:

  • oadp-1.5 branch of migtools/kopia repository is the same as konveyor-dev and now the default master
  • oadp-1.5 branch of the oadp-operator project still points to the upstream project-velero/kopia from the branch v0.19.0-velero-patch
  • The upstream project-velero/kopia from the branch v0.19.0-velero-patch is the same as the master/konveoyr-dev/oadp-1.5 branches from the migtools/kopia repository.

Why the changes were made

Fix: OADP-6141

How to test the changes made

Check the go.mod it should point to migtools/kopia.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 19, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 19, 2025

@mpryc: This pull request references OADP-6141 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

In response to this:

Use of downstream fork of the Kopia repository.

Note:
Before this PR downstream kopia repository was updated:

  • In the migtools/kopia repository a new branch was created from the master: master-before-making-konveyor-dev-obsolete
  • The master branch was synced from the konveyor-dev (they are now the same)
  • The master branch was made default branch, so we have similar naming there to be in sync with oadp-operator

NONE of this affected oadp-1.5 branch:

  • oadp-1.5 branch of migtools/kopia repository is the same as konveyor-dev and now the default master
  • oadp-1.5 branch of the oadp-operator project still points to the upstream project-velero/kopia from the branch v0.19.0-velero-patch
  • The upstream project-velero/kopia from the branch v0.19.0-velero-patch is the same as the master/konveoyr-dev/oadp-1.5 branches from the migtools/kopia repository.

Why the changes were made

Fix: OADP-6141

How to test the changes made

Check the go.mod it should point to migtools/kopia.

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 openshift-eng/jira-lifecycle-plugin repository.

1 similar comment
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 19, 2025

@mpryc: This pull request references OADP-6141 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

In response to this:

Use of downstream fork of the Kopia repository.

Note:
Before this PR downstream kopia repository was updated:

  • In the migtools/kopia repository a new branch was created from the master: master-before-making-konveyor-dev-obsolete
  • The master branch was synced from the konveyor-dev (they are now the same)
  • The master branch was made default branch, so we have similar naming there to be in sync with oadp-operator

NONE of this affected oadp-1.5 branch:

  • oadp-1.5 branch of migtools/kopia repository is the same as konveyor-dev and now the default master
  • oadp-1.5 branch of the oadp-operator project still points to the upstream project-velero/kopia from the branch v0.19.0-velero-patch
  • The upstream project-velero/kopia from the branch v0.19.0-velero-patch is the same as the master/konveoyr-dev/oadp-1.5 branches from the migtools/kopia repository.

Why the changes were made

Fix: OADP-6141

How to test the changes made

Check the go.mod it should point to migtools/kopia.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from kaovilai and mrnold May 19, 2025 07:47
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 19, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 19, 2025

@mpryc: This pull request references OADP-6141 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.20.0" version, but no target version was set.

In response to this:

Use of downstream fork of the Kopia repository.

Similar PR for the downstream velero project: openshift/velero#384

Note:
Before this PR downstream kopia repository was updated:

  • In the migtools/kopia repository a new branch was created from the master: master-before-making-konveyor-dev-obsolete
  • The master branch was synced from the konveyor-dev (they are now the same)
  • The master branch was made default branch, so we have similar naming there to be in sync with oadp-operator

NONE of this affected oadp-1.5 branch:

  • oadp-1.5 branch of migtools/kopia repository is the same as konveyor-dev and now the default master
  • oadp-1.5 branch of the oadp-operator project still points to the upstream project-velero/kopia from the branch v0.19.0-velero-patch
  • The upstream project-velero/kopia from the branch v0.19.0-velero-patch is the same as the master/konveoyr-dev/oadp-1.5 branches from the migtools/kopia repository.

Why the changes were made

Fix: OADP-6141

How to test the changes made

Check the go.mod it should point to migtools/kopia.

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 openshift-eng/jira-lifecycle-plugin repository.

@weshayutin
Copy link
Contributor

/retest

go.mod Outdated
@@ -136,4 +136,4 @@ require (

replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250313160323-584cf1148a74

replace github.com/kopia/kopia => github.com/project-velero/kopia v0.0.0-20250227051353-20bfabbfc7a0
replace github.com/kopia/kopia => github.com/migtools/kopia v0.0.0-20230917191310-1f70992d2ebe
Copy link
Member

Choose a reason for hiding this comment

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

Do we need a newer hash?

Copy link
Contributor

Choose a reason for hiding this comment

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

@mpryc ^ ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, updated together with velero to track oadp-dev.

@mpryc mpryc force-pushed the downstream_kopia branch from d537cd5 to 1c1241b Compare August 12, 2025 13:25
Use of downstream fork of the Kopia repository.
Updated velero and kopia to use oadp-dev branch.

Signed-off-by: Michal Pryc <[email protected]>
@mpryc mpryc force-pushed the downstream_kopia branch from 1c1241b to d7748d3 Compare August 12, 2025 13:31
Copy link

openshift-ci bot commented Aug 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mpryc, shubham-pampattiwar

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [kaovilai,mpryc,shubham-pampattiwar]

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

@kaovilai
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 13, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 164bf42 and 2 for PR HEAD d7748d3 in total

2 similar comments
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 164bf42 and 2 for PR HEAD d7748d3 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 164bf42 and 2 for PR HEAD d7748d3 in total

@mpryc
Copy link
Contributor Author

mpryc commented Aug 14, 2025

/test 4.19-e2e-test-cli-aws

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d9ff173 and 1 for PR HEAD d7748d3 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d9ff173 and 2 for PR HEAD d7748d3 in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d9ff173 and 2 for PR HEAD d7748d3 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ea426b0 and 1 for PR HEAD d7748d3 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ea426b0 and 2 for PR HEAD d7748d3 in total

Copy link

openshift-ci bot commented Aug 18, 2025

@mpryc: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 517d614 into openshift:oadp-dev Aug 18, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants