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

fix: OADP velero 1.4 branch #53237

Merged

Conversation

mateusoliveira43
Copy link
Contributor

Fix for unit tests in branch oadp-1.4 of Velero fork.

Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>
@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@mateusoliveira43: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-velero-oadp-1.4-unit-test openshift/velero presubmit Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@mateusoliveira43
Copy link
Contributor Author

/pj-rehearse

@openshift-ci-robot
Copy link
Contributor

@mateusoliveira43: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@mateusoliveira43
Copy link
Contributor Author

/pj-rehearse ack

@openshift-ci-robot
Copy link
Contributor

@mateusoliveira43: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 17, 2024
Copy link
Member

@kaovilai kaovilai left a comment

Choose a reason for hiding this comment

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

/lgtm
/pj-rehearse ack

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 17, 2024
Copy link
Contributor

openshift-ci bot commented Jun 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mateusoliveira43

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2024
@kaovilai
Copy link
Member

This PR addresses issue with ci-tools openshift/ci-tools#4165

Copy link
Contributor

openshift-ci bot commented Jun 17, 2024

@mateusoliveira43: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/openshift/velero/oadp-1.4/unit-test a08422a link unknown /pj-rehearse pull-ci-openshift-velero-oadp-1.4-unit-test

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 87a8c13 into openshift:master Jun 17, 2024
15 of 16 checks passed
@@ -33,7 +33,7 @@ tests:
steps:
test:
- as: unit
commands: make -f Makefile.prow ci
commands: PATH="/go/bin:$PATH" make -f Makefile.prow ci
Copy link
Contributor

Choose a reason for hiding this comment

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

Which image is that from?

I wonder if it's not easier to use one of the go env to ensure it's there ,because we can't be sure konveyor will always stay there:

https://github.com/konveyor/builder/blob/main/Dockerfile.ubi9#L13-L32

Copy link
Member

Choose a reason for hiding this comment

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

From here https://github.com/openshift/ci-tools/blame/master/pkg/steps/source.go#L102

This is added to our image when our repo is configured to use imagestreamtag which openshift prow replaces FROM in our dockerfile. Not something specified in konveyor builder.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

image_stream_tag line 2 (which would be fine)

but as Tiger noted openshift/ci-tools#4165 this is needed

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks !

lihongyan1 pushed a commit to lihongyan1/release that referenced this pull request Jun 20, 2024
Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>
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. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants