search

openshift-knative / serverless-operator

Main source repository for Openshift Serverless
Apache License 2.0
43 stars 66 forks source link

[release-1.33] Verify promotion tag for patch releases #2755

Closed pierDipi closed 3 months ago

pierDipi commented 3 months ago

One of the pre-requisites for patch releases is to bump the promotion tag and name.

With this additional verification, we make sure that it's done before or block the PR (or warn the author) from merging if not done.

Tested the failure case in

pierDipi commented 3 months ago

/cherry-pick main

openshift-cherrypick-robot commented 3 months ago

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

In response to [this](https://github.com/openshift-knative/serverless-operator/pull/2755#issuecomment-2208735445): >/cherry-pick main Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
pierDipi commented 3 months ago

/cherry-pick release-1.32

openshift-cherrypick-robot commented 3 months ago

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

In response to [this](https://github.com/openshift-knative/serverless-operator/pull/2755#issuecomment-2209147169): >/cherry-pick release-1.32 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
pierDipi commented 3 months ago

/cc @maschmid @matzew @skonto

openshift-ci[bot] commented 3 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matzew, pierDipi

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](https://github.com/openshift-knative/serverless-operator/blob/release-1.33/OWNERS)~~ [matzew,pierDipi] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 3 months ago

@pierDipi: #2755 failed to apply on top of branch "main":

Applying: Verify promotion tag for patch releases
.git/rebase-apply/patch:62: trailing whitespace.

.git/rebase-apply/patch:80: trailing whitespace.

warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   .github/workflows/validate.yaml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/validate.yaml
Applying: Temp: Test failure
Using index info to reconstruct a base tree...
M   olm-catalog/serverless-operator/Dockerfile
M   olm-catalog/serverless-operator/index/Dockerfile
M   olm-catalog/serverless-operator/index/configs/index.yaml
M   olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
M   olm-catalog/serverless-operator/project.yaml
Falling back to patching base and 3-way merge...
Auto-merging olm-catalog/serverless-operator/project.yaml
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/project.yaml
Auto-merging olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
Auto-merging olm-catalog/serverless-operator/index/configs/index.yaml
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/index/configs/index.yaml
Auto-merging olm-catalog/serverless-operator/index/Dockerfile
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/index/Dockerfile
Auto-merging olm-catalog/serverless-operator/Dockerfile
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Temp: Test failure
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift-knative/serverless-operator/pull/2755#issuecomment-2208735445): >/cherry-pick main Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 3 months ago

@pierDipi: #2755 failed to apply on top of branch "release-1.32":

Applying: Verify promotion tag for patch releases
.git/rebase-apply/patch:62: trailing whitespace.

.git/rebase-apply/patch:80: trailing whitespace.

warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   .github/workflows/validate.yaml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/validate.yaml
Applying: Temp: Test failure
Using index info to reconstruct a base tree...
M   olm-catalog/serverless-operator/Dockerfile
M   olm-catalog/serverless-operator/index/Dockerfile
M   olm-catalog/serverless-operator/index/configs/index.yaml
M   olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
M   olm-catalog/serverless-operator/project.yaml
Falling back to patching base and 3-way merge...
Auto-merging olm-catalog/serverless-operator/project.yaml
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/project.yaml
Auto-merging olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
Auto-merging olm-catalog/serverless-operator/index/configs/index.yaml
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/index/configs/index.yaml
Auto-merging olm-catalog/serverless-operator/index/Dockerfile
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/index/Dockerfile
Auto-merging olm-catalog/serverless-operator/Dockerfile
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Temp: Test failure
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift-knative/serverless-operator/pull/2755#issuecomment-2209147169): >/cherry-pick release-1.32 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.