From c5e1ab47b08eb6f2ce39a70e4a58c1e02df81a2b Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Thu, 22 May 2025 14:16:03 +0200 Subject: [PATCH 1/2] Update master to oadp-dev references Update to include oadp-operator master to oadp-dev rename. Signed-off-by: Michal Pryc --- Makefile | 2 +- PARTNERS.md | 2 +- README.md | 22 +++--- blogs/tekton-oadp-nonadmin/README.md | 6 +- .../check_prerequisites.sh | 2 +- docs/API_ref.md | 2 +- docs/design/upstream-datamover.md | 4 +- docs/developer/PROW_CI.md | 68 +++++++++---------- docs/developer/testing/TESTING.md | 4 +- .../testing/test_oadp_version_upgrade.md | 8 +-- docs/oadp_cheat_sheet.md | 2 +- must-gather/README.md | 6 +- tests/e2e/upgrade_suite_test.go | 2 +- 13 files changed, 65 insertions(+), 65 deletions(-) diff --git a/Makefile b/Makefile index dc9844acfa4..8a067114995 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ vet: ## Run go vet against code. # If test results in prow are different, it is because the environment used. # You can simulate their env by running # docker run --platform linux/amd64 -w $PWD -v $PWD:$PWD -it registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 sh -c "make test" -# where the image corresponds to the prow config for the test job, https://github.com/openshift/release/blob/master/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml#L1-L5 +# where the image corresponds to the prow config for the test job, https://github.com/openshift/release/blob/master/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml#L1-L5 # to login to registry cluster follow https://docs.ci.openshift.org/docs/how-tos/use-registries-in-build-farm/#how-do-i-log-in-to-pull-images-that-require-authentication # If bin/ contains binaries of different arch, you may remove them so the container can install their arch. .PHONY: test diff --git a/PARTNERS.md b/PARTNERS.md index 92690193e08..750fbc62c3a 100644 --- a/PARTNERS.md +++ b/PARTNERS.md @@ -38,7 +38,7 @@ better stability and maintainability. - Partners must align their integration testing with the specific OADP version corresponding to their target OpenShift version - Unreleased OADP builds are available via the branches of this oadp-operator - repository. The next release will be available for install via the `master` + repository. The next release will be available for install via the `oadp-dev` branch until such time the next release branch is created, the `oadp-1.+1` branch will be made available for install. - latest branched version is [oadp-1.4](https://github.com/openshift/oadp-operator/tree/oadp-1.4) diff --git a/README.md b/README.md index a2f4187a4ca..7517ab83515 100644 --- a/README.md +++ b/README.md @@ -2,30 +2,30 @@

OADP Operator

OpenShift API for Data Protection

- [![Go Report Card](https://goreportcard.com/badge/github.com/openshift/oadp-operator)](https://goreportcard.com/report/github.com/openshift/oadp-operator) [![codecov](https://codecov.io/gh/openshift/oadp-operator/branch/master/graph/badge.svg?token=qLM0hAzjpD)](https://codecov.io/gh/openshift/oadp-operator) [![License](https://img.shields.io/:license-apache-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Go Reference](https://pkg.go.dev/badge/github.com/openshift/oadp-operator.svg)](https://pkg.go.dev/github.com/openshift/oadp-operator) + [![Go Report Card](https://goreportcard.com/badge/github.com/openshift/oadp-operator)](https://goreportcard.com/report/github.com/openshift/oadp-operator) [![codecov](https://codecov.io/gh/openshift/oadp-operator/branch/oadp-dev/graph/badge.svg?token=qLM0hAzjpD)](https://codecov.io/gh/openshift/oadp-operator) [![License](https://img.shields.io/:license-apache-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Go Reference](https://pkg.go.dev/badge/github.com/openshift/oadp-operator.svg)](https://pkg.go.dev/github.com/openshift/oadp-operator) -Periodic Unit Tests [![Unit tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-unit-test-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-unit-test-periodic) +Periodic Unit Tests [![Unit tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-unit-test-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-unit-test-periodic) Periodic AWS E2E Tests in OpenShift 4.19 -[![AWS tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.19-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.19-e2e-test-aws-periodic) +[![AWS tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.19-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.19-e2e-test-aws-periodic) +[![GCP builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.12-e2e-test-gcp-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.12-e2e-test-gcp-periodic) +[![GCP builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-gcp-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-gcp-periodic) +[![GCP builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-gcp-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-gcp-periodic) --> +[![Azure builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.12-e2e-test-azure-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.12-e2e-test-azure-periodic) +[![Azure builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-azure-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-azure-periodic) +[![Azure builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-azure-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-azure-periodic) --> Periodic AWS E2E Virtualization Tests in OpenShift 4.19 -[![VM tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.19-e2e-test-kubevirt-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.19-e2e-test-kubevirt-aws-periodic) +[![VM tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.19-e2e-test-kubevirt-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.19-e2e-test-kubevirt-aws-periodic) OADP repositories images job | OADP | OpenShift Velero plugin | Velero | Velero plugin for AWS | Velero plugin for Legacy AWS | Velero plugin for GCP | Velero plugin for Microsoft Azure | Non Admin | | ---------- | ---------- | ---------- | ---------- | ---------- | ---------- | ---------- | ---------- | -| [![OADP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-oadp-operator-master-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-oadp-operator-master-images) | [![OpenShift Velero plugin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-openshift-velero-plugin-master-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-openshift-velero-plugin-master-images) | [![OADP's Velero repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-konveyor-dev-images) | [![OADP's Velero plugin for AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-aws-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-aws-konveyor-dev-images) | [![OADP's Velero plugin for Legacy AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-legacy-aws-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-legacy-aws-konveyor-dev-images) | [![OADP's Velero plugin for GCP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-gcp-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-gcp-konveyor-dev-images) | [![OADP's Velero plugin for Microsoft Azure repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-microsoft-azure-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-microsoft-azure-konveyor-dev-images) | [![Non Admin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-migtools-oadp-non-admin-master-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-migtools-oadp-non-admin-master-images) | +| [![OADP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-oadp-operator-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-oadp-operator-oadp-dev-images) | [![OpenShift Velero plugin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-openshift-velero-plugin-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-openshift-velero-plugin-oadp-dev-images) | [![OADP's Velero repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-konveyor-dev-images) | [![OADP's Velero plugin for AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-aws-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-aws-konveyor-dev-images) | [![OADP's Velero plugin for Legacy AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-legacy-aws-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-legacy-aws-konveyor-dev-images) | [![OADP's Velero plugin for GCP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-gcp-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-gcp-konveyor-dev-images) | [![OADP's Velero plugin for Microsoft Azure repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-microsoft-azure-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-microsoft-azure-konveyor-dev-images) | [![Non Admin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-migtools-oadp-non-admin-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-migtools-oadp-non-admin-oadp-dev-images) | Mirroring images to quay.io [![Mirror images](https://prow.ci.openshift.org/badge.svg?jobs=periodic-image-mirroring-konveyor)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-image-mirroring-konveyor) diff --git a/blogs/tekton-oadp-nonadmin/README.md b/blogs/tekton-oadp-nonadmin/README.md index 59fbf945dc4..9a51d53aaa2 100644 --- a/blogs/tekton-oadp-nonadmin/README.md +++ b/blogs/tekton-oadp-nonadmin/README.md @@ -28,8 +28,8 @@ A user may want to change the backup custom resource, or other aspects of this d ## Sample Applications If you require a sample application while working through the instructions, you can find viable sample applications via the following links: - * https://github.com/openshift/oadp-operator/tree/master/tests/e2e/sample-applications/nginx - * https://github.com/openshift/oadp-operator/tree/master/tests/e2e/sample-applications/mysql-persistent + * https://github.com/openshift/oadp-operator/tree/oadp-dev/tests/e2e/sample-applications/nginx + * https://github.com/openshift/oadp-operator/tree/oadp-dev/tests/e2e/sample-applications/mysql-persistent ## Known Issues * Advanced backup and restore options are not included in this demo. @@ -39,7 +39,7 @@ If you require a sample application while working through the instructions, you ### Prerequisites * Install [OpenShift Pipelines (Tekton)](https://docs.openshift.com/container-platform/latest/cicd/pipelines/installing-pipelines.html) * Check that [OADP is installed](https://docs.openshift.com/container-platform/latest/backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.html) -* Check OADP configuration which must have at least one [DPA CR](https://github.com/openshift/oadp-operator/blob/master/docs/install_olm.md#create-the-dataprotectionapplication-custom-resource) +* Check OADP configuration which must have at least one [DPA CR](https://github.com/openshift/oadp-operator/blob/oadp-dev/docs/install_olm.md#create-the-dataprotectionapplication-custom-resource) * It is recommended to the user to ensure backup and restore operations are working prior to running this demonstration. There is a shell script to check those Prerequisites: diff --git a/blogs/tekton-oadp-nonadmin/check_prerequisites.sh b/blogs/tekton-oadp-nonadmin/check_prerequisites.sh index acf7e8dc196..93d3fe45c15 100755 --- a/blogs/tekton-oadp-nonadmin/check_prerequisites.sh +++ b/blogs/tekton-oadp-nonadmin/check_prerequisites.sh @@ -84,7 +84,7 @@ function print_oadp_not_installed() { function print_oadp_not_configured() { printf "\n\t* Configure OADP DataProtectionApplication Custom Resource named 'dpa-sample':\n" - printf "\n\t https://github.com/openshift/oadp-operator/blob/master/docs/install_olm.md#create-the-dataprotectionapplication-custom-resource" + printf "\n\t https://github.com/openshift/oadp-operator/blob/oadp-dev/docs/install_olm.md#create-the-dataprotectionapplication-custom-resource" } printf "\n######################" diff --git a/docs/API_ref.md b/docs/API_ref.md index 4ae289b11ed..657f83e7ea3 100644 --- a/docs/API_ref.md +++ b/docs/API_ref.md @@ -42,4 +42,4 @@ FIELDS: Contains data mover specific configurations ``` -See also [![Go Reference](https://pkg.go.dev/badge/github.com/openshift/oadp-operator.svg)](https://pkg.go.dev/github.com/openshift/oadp-operator@master) for a deeper dive. +See also [![Go Reference](https://pkg.go.dev/badge/github.com/openshift/oadp-operator.svg)](https://pkg.go.dev/github.com/openshift/oadp-operator@oadp-dev) for a deeper dive. diff --git a/docs/design/upstream-datamover.md b/docs/design/upstream-datamover.md index 011bf0422a0..c8ace32421e 100644 --- a/docs/design/upstream-datamover.md +++ b/docs/design/upstream-datamover.md @@ -100,7 +100,7 @@ Volsync backups from OADP 1.2 will not be restoreable with any OADP version inco ## Implementation Initial work for this will be done on the velero-datamover topic branch of oadp-operator. -Once the design changes are fully approved and basic functionality for OADP is fully working again (possibly with the exception of the e2e test changes), it will be merged to master and work will continue there. +Once the design changes are fully approved and basic functionality for OADP is fully working again (possibly with the exception of the e2e test changes), it will be merged to oadp-dev branch and work will continue there. The velero and velero-plugin-for-csi forks have already been updated with the current VBDM changes but will continue to be updated periodically throughout the remainder of the Velero 1.12 development cycle. @@ -114,4 +114,4 @@ The final implementation task will be updating the OADP e2e tests. - One possibility would be to downgrade to 1.2 and restore -- any new-in-1.3 DPA fields would need to be removed prior to downgrade - Another possiblity would be to install OADP 1.2 in a different cluster, restore here, and then back up again via restic. This backup could then be used in the original cluster. - It may be possible to manually pull volume data from the BSL with Volsync directly, but the user would have to do a lot of manual steps, including creating volumes to receive this data. This may not be a feasible solution at all. -- Is this functionality to be considered tech preview or GA for OADP 1.3? With the current design, I don't believe that this decision will have any material impact on the implementation, since the only OADP DPA configuration needed to enable VBDM (enabling CSI plugin and restic/node-agent) is already available as GA in OADP. \ No newline at end of file +- Is this functionality to be considered tech preview or GA for OADP 1.3? With the current design, I don't believe that this decision will have any material impact on the implementation, since the only OADP DPA configuration needed to enable VBDM (enabling CSI plugin and restic/node-agent) is already available as GA in OADP. diff --git a/docs/developer/PROW_CI.md b/docs/developer/PROW_CI.md index f0161f00d9e..072951dc274 100644 --- a/docs/developer/PROW_CI.md +++ b/docs/developer/PROW_CI.md @@ -67,7 +67,7 @@ The images mirroring to [quay.io](https://quay.io/organization/konveyor) configu The jobs run can be seen in PRs and in the links in the README.md file of OADP repo. -OADP operator master branch is tested against the last 3 minor OCP releases. To Update an OCP version the project is tested against, see [Update OCP version](#update-ocp-version). +OADP operator oadp-dev branch is tested against the last 3 minor OCP releases. To Update an OCP version the project is tested against, see [Update OCP version](#update-ocp-version). > **Note**: To avoid changing upstream `OWNERS` files on `openshift` organization forks, we use `DOWNSTREAM_OWNERS` files on those repos. Reference https://github.com/openshift/release/blob/dd6b8b25a85bfd92ca74fdf1435ee9f21cd22516/core-services/prow/02_config/_plugins.yaml#L664-L678 @@ -80,7 +80,7 @@ To create new OADP release branches (they must follow the pattern `oadp-major.mi - Downstream repositories release branches may not need updates (except OADP operator, which always need updates). - Upstream repositories release branches need to be rebased. -> **Note**: Try to always create release branches from default branches (usually called master). +> **Note**: Try to always create release branches from default branches (usually called oadp-dev). > **Note**: Documentation should live only in default branches. For example, for OADP operator, `docs/` and `blogs/` folders can be deleted in release branches. @@ -96,7 +96,7 @@ The new release branch must be added to `core-services/prow/02_config/openshift/ ```diff ... - includedBranches: - - master + - oadp-dev - oadp-1.0 - oadp-1.1 - oadp-1.2 @@ -106,7 +106,7 @@ The new release branch must be added to `core-services/prow/02_config/openshift/ ... ``` -Create `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml`. To make it easier, copy the contents of `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml` (if release branch was created from master branch), changing the following. +Create `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml`. To make it easier, copy the contents of `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml` (if release branch was created from the oadp-dev branch), changing the following. ```diff ... images: @@ -123,9 +123,9 @@ Create `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp- repo: oadp-operator ``` -> **Note**: to get diff between files, you can run `diff -ruN ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml`. +> **Note**: to get diff between files, you can run `diff -ruN ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev.yaml ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml`. -Create `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.VERSION.yaml` files. To make it easier, copy the contents of `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.VERSION.yaml` files (if release branch was created from master branch), changing the following. +Create `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.VERSION.yaml` files. To make it easier, copy the contents of `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.VERSION.yaml` files (if release branch was created from master branch), changing the following. ```diff ... images: @@ -178,14 +178,14 @@ Create `ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp- resources: ... zz_generated_metadata: -- branch: master +- branch: oadp-dev + branch: oadp-1.4 org: openshift repo: oadp-operator ... ``` -> **Note**: to get diff between files, you can run `diff -ruN diff -ruN ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.VERSION.yaml ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.VERSION.yaml`. +> **Note**: to get diff between files, you can run `diff -ruN diff -ruN ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.VERSION.yaml ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.VERSION.yaml`. After creating these files, run: * `make jobs checkconfig` @@ -204,7 +204,7 @@ Finally, add image to `core-services/image-mirroring/konveyor/mapping_konveyor_l For this example, lets say new release branch is `oadp-1.4`. -Update `Makefile`, changing the following (if release branch was created from master branch). +Update `Makefile`, changing the following (if release branch was created from oadp-dev branch). ```diff ... -DEFAULT_VERSION := 99.0.0 @@ -235,9 +235,9 @@ Update `Makefile`, changing the following (if release branch was created from ma > >Upgrade E2E tests must also be updated. -> **Note**: to get diff between files, you can run `git diff master oadp-1.4 Makefile`. +> **Note**: to get diff between files, you can run `git diff oadp-dev oadp-1.4 Makefile`. -Update `config/manifests/bases/oadp-operator.clusterserviceversion.yaml`, changing the following (if release branch was created from master branch). +Update `config/manifests/bases/oadp-operator.clusterserviceversion.yaml`, changing the following (if release branch was created from oadp-dev branch). ```diff ... - containerImage: quay.io/konveyor/oadp-operator:latest @@ -253,9 +253,9 @@ Update `config/manifests/bases/oadp-operator.clusterserviceversion.yaml`, changi + version: 1.4.0 ``` -> **Note**: to get diff between files, you can run `git diff master oadp-1.4 config/manifests/bases/oadp-operator.clusterserviceversion.yaml`. +> **Note**: to get diff between files, you can run `git diff oadp-dev oadp-1.4 config/manifests/bases/oadp-operator.clusterserviceversion.yaml`. -Update `config/manager/manager.yaml`, changing the following (if release branch was created from master branch). +Update `config/manager/manager.yaml`, changing the following (if release branch was created from oadp-dev branch). ```diff ... - name: RELATED_IMAGE_VELERO @@ -276,11 +276,11 @@ Update `config/manager/manager.yaml`, changing the following (if release branch ... ``` -> **Note**: to get diff between files, you can run `git diff master oadp-1.4 config/manager/manager.yaml`. +> **Note**: to get diff between files, you can run `git diff oadp-dev oadp-1.4 config/manager/manager.yaml`. After updating these files, run `make bundle`. -Update `pkg/common/common.go`, changing the following (if release branch was created from master branch). +Update `pkg/common/common.go`, changing the following (if release branch was created from oadp-dev branch). ```diff ... // Images @@ -301,7 +301,7 @@ Update `pkg/common/common.go`, changing the following (if release branch was cre ... ``` -Update `controllers/nonadmin_controller.go`, changing the following (if release branch was created from master branch). +Update `controllers/nonadmin_controller.go`, changing the following (if release branch was created from oadp-dev branch). ```diff ... // TODO https://github.com/openshift/oadp-operator/issues/1379 @@ -311,7 +311,7 @@ Update `controllers/nonadmin_controller.go`, changing the following (if release ... ``` -Update `tests/e2e/lib/apps.go`, changing the following (if release branch was created from master branch). +Update `tests/e2e/lib/apps.go`, changing the following (if release branch was created from oadp-dev branch). ```diff ... mustGatherCmd := "must-gather" @@ -321,29 +321,29 @@ Update `tests/e2e/lib/apps.go`, changing the following (if release branch was cr ... ``` -Update `README.md`, changing the following (if release branch was created from master branch). +Update `README.md`, changing the following (if release branch was created from oadp-dev branch). ```diff ... -- [![Go Report Card](https://goreportcard.com/badge/github.com/openshift/oadp-operator)](https://goreportcard.com/report/github.com/openshift/oadp-operator) [![codecov](https://codecov.io/gh/openshift/oadp-operator/branch/master/graph/badge.svg?token=qLM0hAzjpD)](https://codecov.io/gh/openshift/oadp-operator) [![License](https://img.shields.io/:license-apache-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Go Reference](https://pkg.go.dev/badge/github.com/openshift/oadp-operator.svg)](https://pkg.go.dev/github.com/openshift/oadp-operator) +- [![Go Report Card](https://goreportcard.com/badge/github.com/openshift/oadp-operator)](https://goreportcard.com/report/github.com/openshift/oadp-operator) [![codecov](https://codecov.io/gh/openshift/oadp-operator/branch/oadp-dev/graph/badge.svg?token=qLM0hAzjpD)](https://codecov.io/gh/openshift/oadp-operator) [![License](https://img.shields.io/:license-apache-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Go Reference](https://pkg.go.dev/badge/github.com/openshift/oadp-operator.svg)](https://pkg.go.dev/github.com/openshift/oadp-operator) + [![Go Report Card](https://goreportcard.com/badge/github.com/openshift/oadp-operator)](https://goreportcard.com/report/github.com/openshift/oadp-operator) [![codecov](https://codecov.io/gh/openshift/oadp-operator/branch/oadp-1.4/graph/badge.svg?token=qLM0hAzjpD)](https://codecov.io/gh/openshift/oadp-operator) [![License](https://img.shields.io/:license-apache-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Go Reference](https://pkg.go.dev/badge/github.com/openshift/oadp-operator.svg)](https://pkg.go.dev/github.com/openshift/oadp-operator) ... --Periodic Unit Tests [![Unit tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-unit-test-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-unit-test-periodic) +-Periodic Unit Tests [![Unit tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-unit-test-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-unit-test-periodic) +Periodic Unit Tests [![Unit tests](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-1.4-unit-test-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-1.4-unit-test-periodic) ... AWS : --[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.12-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.12-e2e-test-aws-periodic) +-[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.12-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.12-e2e-test-aws-periodic) +[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-1.4-4.12-e2e-test-aws-periodic) --[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.13-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.13-e2e-test-aws-periodic) +-[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-aws-periodic) +[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-1.4-4.13-e2e-test-aws-periodic) --[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-aws-periodic) +-[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-aws-periodic) +[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-1.4-4.14-e2e-test-aws-periodic) ... -Documentation in this repository are considered unofficial and for development purposes only. -+Development documentation of this repository can be found in [master branch](https://github.com/openshift/oadp-operator). ++Development documentation of this repository can be found in [oadp-dev branch](https://github.com/openshift/oadp-operator). # delete everything after this line ``` -> **Note**: to get diff between files, you can run `git diff master oadp-1.4 README.md`. +> **Note**: to get diff between files, you can run `git diff oadp-dev oadp-1.4 README.md`. ### Update Go version @@ -361,9 +361,9 @@ To update an OCP version in a branch: - Update links in README file. - Update envtest Kubernetes version in Makefile. -Example: update `4.13` to `4.16` in master branch. +Example: update `4.13` to `4.16` in oadp-dev branch. -`openshift-oadp-operator-master__4.13.yaml` needs to be renamed `openshift-oadp-operator-master__4.16.yaml`, in `ci-operator/config/openshift/oadp-operator/` folder of https://github.com/openshift/release repo. +`openshift-oadp-operator-oadp-dev__4.13.yaml` needs to be renamed `openshift-oadp-operator-oadp-dev__4.16.yaml`, in `ci-operator/config/openshift/oadp-operator/` folder of https://github.com/openshift/release repo. `4.13` occurrences in the file need to be updated to `4.16`. ```diff @@ -378,7 +378,7 @@ Example: update `4.13` to `4.16` in master branch. '*': limits: ... - branch: master + branch: oadp-dev org: openshift repo: oadp-operator - variant: "4.13" @@ -402,20 +402,20 @@ Example: update `4.13` to `4.16` in master branch. After that, run `make jobs` to update job files in `ci-operator/jobs/openshift/oadp-operator` folder of https://github.com/openshift/release repo. -`4.13` occurrences in README.md need to be updated to `4.16` in master branch of https://github.com/openshift/oadp-operator repo. +`4.13` occurrences in README.md need to be updated to `4.16` in oadp-dev branch of https://github.com/openshift/oadp-operator repo. ```diff -4.13, 4.14, 4.15 Periodic E2E Tests +4.14, 4.15, 4.16 Periodic E2E Tests AWS : --[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.13-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.13-e2e-test-aws-periodic) - [![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.14-e2e-test-aws-periodic) - [![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.15-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.15-e2e-test-aws-periodic) -+[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-master-4.16-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-master-4.16-e2e-test-aws-periodic) +-[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.13-e2e-test-aws-periodic) + [![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.14-e2e-test-aws-periodic) + [![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.15-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.15-e2e-test-aws-periodic) ++[![AWS builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-openshift-oadp-operator-oadp-dev-4.16-e2e-test-aws-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-openshift-oadp-operator-oadp-dev-4.16-e2e-test-aws-periodic) ``` -Finally, update envtest version in Makefile needs to be updated to point to Kubernetes version of OCP `4.16` in master branch of https://github.com/openshift/oadp-operator repo. +Finally, update envtest version in Makefile needs to be updated to point to Kubernetes version of OCP `4.16` in oadp-dev branch of https://github.com/openshift/oadp-operator repo. ```diff -# Kubernetes version from OpenShift 4.15.x https://openshift-release.apps.ci.l2s4.p1.openshiftapps.com/#4-stable diff --git a/docs/developer/testing/TESTING.md b/docs/developer/testing/TESTING.md index 5ce9789010a..c4c4a0b5dbb 100644 --- a/docs/developer/testing/TESTING.md +++ b/docs/developer/testing/TESTING.md @@ -196,7 +196,7 @@ Example Configuration: **launch.json** ``` -* The [e2e_suite_test.go](https://github.com/openshift/oadp-operator/blob/master/tests/e2e/e2e_suite_test.go) file must be overridden with parameters specific to your environment and aws buckets. +* The [e2e_suite_test.go](https://github.com/openshift/oadp-operator/blob/oadp-dev/tests/e2e/e2e_suite_test.go) file must be overridden with parameters specific to your environment and aws buckets. * The critical parameters to change are under `func init()`: * cloud * settings @@ -217,7 +217,7 @@ func init() { Example settings file could be found under oadp-operator/tests/e2e/templates/default_settings.json, and can be overridden used with different providers with similar structure. -* Note that your shell overrides documented [here](https://github.com/openshift/oadp-operator/blob/master/docs/developer/TESTING.md) are not accessible to Visual Studio Code. +* Note that your shell overrides documented [here](https://github.com/openshift/oadp-operator/blob/oadp-dev/docs/developer/TESTING.md) are not accessible to Visual Studio Code. ### Execute diff --git a/docs/developer/testing/test_oadp_version_upgrade.md b/docs/developer/testing/test_oadp_version_upgrade.md index 69632fb84b0..356f492600b 100644 --- a/docs/developer/testing/test_oadp_version_upgrade.md +++ b/docs/developer/testing/test_oadp_version_upgrade.md @@ -4,7 +4,7 @@ To test an upgrade from a version to another, run ```sh make catalog-test-upgrade ``` -from the branch you want to test the upgrade (master or a release branch). +from the branch you want to test the upgrade (development or a release branch). This will create `oadp-operator-catalog-test-upgrade` catalog in your cluster (OperatorHub in the UI). @@ -16,7 +16,7 @@ The catalog will have two channels: this is defined in `PREVIOUS_CHANNEL` variable in Makefile, and can be changed -- and the current version (the version of the branch you are, which can be yet unreleased, if on master branch) +- and the current version (the version of the branch you are, which can be yet unreleased, if on oadp-dev branch) > **Note:** to test production released versions, just install operator from marketplace, selecting the channel with previous version. @@ -28,7 +28,7 @@ Select the new catalog in the UI and install selecting the previous version (for ![Channel selecting](../../images/test_oadp_version_upgrade_channel.png) -Finally, after creating a DPA, change channel of the installed operator to the next version (for example, `stable` - version 99.0.0, which points to master branch) in Subscription tab. +Finally, after creating a DPA, change channel of the installed operator to the next version (for example, `stable` - version 99.0.0, which points to development branch) in Subscription tab. ![Update subscription channel](../../images/test_oadp_version_upgrade_subscription.png) @@ -76,7 +76,7 @@ export PREVIOUS_CHANNEL=stable-1.2 echo -e "kind: Subscription\napiVersion: operators.coreos.com/v1alpha1\nmetadata:\n name: oadp-operator\n namespace: $OADP_NAMESPACE\nspec:\n source: oadp-operator-catalog-test-upgrade\n sourceNamespace: openshift-marketplace\n name: oadp-operator\n channel: $PREVIOUS_CHANNEL\n installPlanApproval: Automatic" | oc create -f - ``` -Finally, after creating a DPA, change channel of the installed operator to the next version (for example, `stable`, which points to master branch) +Finally, after creating a DPA, change channel of the installed operator to the next version (for example, `stable`, which points to development branch) ```sh oc patch subscription oadp-operator -n --type='json' -p='[{"op": "replace", "path": "/spec/channel", "value":"stable"}]' ``` diff --git a/docs/oadp_cheat_sheet.md b/docs/oadp_cheat_sheet.md index 3d2590394e9..c8e34879c3b 100644 --- a/docs/oadp_cheat_sheet.md +++ b/docs/oadp_cheat_sheet.md @@ -227,7 +227,7 @@ for i in `oc get vsc -A -o custom-columns=NAME:.metadata.name`; do echo $i; oc p #### Watch datamover resources while backup in progress ``` -curl -o ~/.local/bin/datamover_resources.sh https://raw.githubusercontent.com/openshift/oadp-operator/master/docs/examples/datamover_resources.sh +curl -o ~/.local/bin/datamover_resources.sh https://raw.githubusercontent.com/openshift/oadp-operator/oadp-dev/docs/examples/datamover_resources.sh ``` ###### Backups ``` diff --git a/must-gather/README.md b/must-gather/README.md index b4b60a4d1f5..194d1fe6e96 100644 --- a/must-gather/README.md +++ b/must-gather/README.md @@ -46,8 +46,8 @@ omg get backup -n # and other OADP resources To update OADP Must-gather `go.mod` dependencies, run ```sh -go get github.com/openshift/oadp-operator@master -go get github.com/migtools/oadp-non-admin@master +go get github.com/openshift/oadp-operator@oadp-dev +go get github.com/migtools/oadp-non-admin@oadp-dev # manually update github.com/openshift/velero version in replace section of go.mod to match OADP operator go mod tidy go mod verify @@ -110,7 +110,7 @@ OADP Must-gather stores version information in `/must-gather/version` file Example content of the file ```txt OpenShift API for Data Protection (OADP) Must-gather -master-branch +oadp-dev-branch ``` >4. Should honor the user-provided values for `--since` and `--since-time`, which are passed to plugins via diff --git a/tests/e2e/upgrade_suite_test.go b/tests/e2e/upgrade_suite_test.go index a8520245f76..cd02b9035fa 100644 --- a/tests/e2e/upgrade_suite_test.go +++ b/tests/e2e/upgrade_suite_test.go @@ -179,7 +179,7 @@ var _ = ginkgo.Describe("OADP upgrade scenarios", ginkgo.Ordered, func() { // TODO backup/restore }, - ginkgo.Entry("Upgrade from stable (oadp-1.5 branch) to dev (master branch) channel", ginkgo.Label("upgrade"), channelUpgradeCase{ + ginkgo.Entry("Upgrade from stable (oadp-1.5 branch) to dev (oadp-dev branch) channel", ginkgo.Label("upgrade"), channelUpgradeCase{ previous: "stable", next: "dev", // to test production From e538d635e4520186884229062701aa70931b401b Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Thu, 31 Jul 2025 14:19:49 -0400 Subject: [PATCH 2/2] remaining oadp-dev substitutions Signed-off-by: Tiger Kaovilai --- README.md | 2 +- must-gather/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7517ab83515..8d152cada4c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Periodic AWS E2E Virtualization Tests in OpenShift 4.19 OADP repositories images job | OADP | OpenShift Velero plugin | Velero | Velero plugin for AWS | Velero plugin for Legacy AWS | Velero plugin for GCP | Velero plugin for Microsoft Azure | Non Admin | | ---------- | ---------- | ---------- | ---------- | ---------- | ---------- | ---------- | ---------- | -| [![OADP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-oadp-operator-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-oadp-operator-oadp-dev-images) | [![OpenShift Velero plugin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-openshift-velero-plugin-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-openshift-velero-plugin-oadp-dev-images) | [![OADP's Velero repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-konveyor-dev-images) | [![OADP's Velero plugin for AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-aws-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-aws-konveyor-dev-images) | [![OADP's Velero plugin for Legacy AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-legacy-aws-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-legacy-aws-konveyor-dev-images) | [![OADP's Velero plugin for GCP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-gcp-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-gcp-konveyor-dev-images) | [![OADP's Velero plugin for Microsoft Azure repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-microsoft-azure-konveyor-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-microsoft-azure-konveyor-dev-images) | [![Non Admin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-migtools-oadp-non-admin-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-migtools-oadp-non-admin-oadp-dev-images) | +| [![OADP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-oadp-operator-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-oadp-operator-oadp-dev-images) | [![OpenShift Velero plugin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-openshift-velero-plugin-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-openshift-velero-plugin-oadp-dev-images) | [![OADP's Velero repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-oadp-dev-images) | [![OADP's Velero plugin for AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-aws-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-aws-oadp-dev-images) | [![OADP's Velero plugin for Legacy AWS repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-legacy-aws-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-legacy-aws-oadp-dev-images) | [![OADP's Velero plugin for GCP repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-gcp-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-gcp-oadp-dev-images) | [![OADP's Velero plugin for Microsoft Azure repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-openshift-velero-plugin-for-microsoft-azure-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-openshift-velero-plugin-for-microsoft-azure-oadp-dev-images) | [![Non Admin repository](https://prow.ci.openshift.org/badge.svg?jobs=branch-ci-migtools-oadp-non-admin-oadp-dev-images)](https://prow.ci.openshift.org/job-history/gs/test-platform-results/logs/branch-ci-migtools-oadp-non-admin-oadp-dev-images) | Mirroring images to quay.io [![Mirror images](https://prow.ci.openshift.org/badge.svg?jobs=periodic-image-mirroring-konveyor)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-image-mirroring-konveyor) diff --git a/must-gather/Dockerfile b/must-gather/Dockerfile index 5bfd258e299..0d4e0076606 100644 --- a/must-gather/Dockerfile +++ b/must-gather/Dockerfile @@ -2,8 +2,8 @@ FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder ARG BUILDPLATFORM ARG TARGETOS ARG TARGETARCH -ARG KOPIA_BRANCH=konveyor-dev -ARG RESTIC_BRANCH=konveyor-dev +ARG KOPIA_BRANCH=oadp-dev +ARG RESTIC_BRANCH=oadp-dev WORKDIR /workspace