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

Update MRO to v0.3.12 #287

Merged
merged 2 commits into from
Sep 18, 2019

Conversation

cynepco3hahue
Copy link

Signed-off-by: Artyom Lukianov alukiano@redhat.com

@cynepco3hahue
Copy link
Author

/test hco-e2e-aws

@rthallisey
Copy link

@cynepco3hahue is this for cnv 2.1? If it is, add "/cherrypick release-2.1"

Also, create a new PR that changes to version MRO in the 0.0.3 CSV to v0.3.11.

@cynepco3hahue
Copy link
Author

@rthallisey yep it should be, by the way what the point to update it upstream if under the d/s we use d/s images from errata?

@cynepco3hahue
Copy link
Author

/cherrypick release-2.1

@kubevirt-bot
Copy link
Contributor

@cynepco3hahue: once the present PR merges, I will cherry-pick it on top of release-2.1 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.1

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.

@rthallisey
Copy link

Upstream has all the CI right now and d/s downstream doesn't. In addition, you can consume from operatorhub.

@cynepco3hahue
Copy link
Author

@cynepco3hahue is this for cnv 2.1? If it is, add "/cherrypick release-2.1"

Also, create a new PR that changes to version MRO in the 0.0.3 CSV to v0.3.11.

Done

@kubevirt-bot
Copy link
Contributor

@cynepco3hahue: PR needs rebase.

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.

1 similar comment
@kubevirt-bot
Copy link
Contributor

@cynepco3hahue: PR needs rebase.

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.

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
@cynepco3hahue cynepco3hahue changed the title Update MRO to v0.3.11 Update MRO to v0.3.12 Sep 18, 2019
Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
@cynepco3hahue
Copy link
Author

ci test please

@cynepco3hahue
Copy link
Author

@rthallisey Can you please merge it?

@rthallisey
Copy link

@cynepco3hahue the 0.0.2 changes will need to be backported to release-2.1 branch

@rthallisey rthallisey merged commit 9c29043 into kubevirt:master Sep 18, 2019
@kubevirt-bot
Copy link
Contributor

@cynepco3hahue: #287 failed to apply on top of branch "release-2.1":

Applying: Update CSV manifest via build-manifest.sh
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	deploy/olm-catalog/kubevirt-hyperconverged/0.0.3/kubevirt-hyperconverged-operator.v0.0.3.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging deploy/olm-catalog/kubevirt-hyperconverged/0.0.1/kubevirt-hyperconverged-operator.v0.0.1.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in deploy/olm-catalog/kubevirt-hyperconverged/0.0.1/kubevirt-hyperconverged-operator.v0.0.1.clusterserviceversion.yaml
Patch failed at 0002 Update CSV manifest via build-manifest.sh

In response to this:

/cherrypick release-2.1

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.

cynepco3hahue pushed a commit to cynepco3hahue/hyperconverged-cluster-operator that referenced this pull request Sep 18, 2019
* Update MRO to v0.3.12

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>

* Update CSV manifest via build-manifest.sh

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
djzager pushed a commit that referenced this pull request Sep 26, 2019
* Update MRO to v0.3.12

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>

* Update CSV manifest via build-manifest.sh

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
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.

None yet

3 participants