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

[WINC-921]: Follow-up add fast-forward workflow #35987

Merged
merged 2 commits into from Feb 3, 2023

Conversation

alinaryan
Copy link
Contributor

Removes the 'git log' line and sets the upstream branch as origin in the case of fast-forwarding to a new branch.

Follow-up to #35781

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Feb 2, 2023
@openshift-ci-robot
Copy link
Contributor

@alinaryan: no rehearsable tests are affected by this change

Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

Thanks for the follow up, @alinaryan

git --no-pager log --pretty=oneline origin/"$DESTINATION_BRANCH"..HEAD
if ! git push origin $DESTINATION_BRANCH; then
echo "INFO Pushing to new branch $DESTINATION_BRANCH"
if ! git push --set-upstream origin "$DESTINATION_BRANCH" ; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Please mention why you are making this change in your commit message.

I also don't understand why you need the --set-upstream. Why is that needed given it is an ephemeral config change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated the commit message and removed the --set-upstream given what you said. I was able to run this locally with no errors.

This commit removes the 'git log' line in the case of fast-forwarding to a
new branch since all the commits will be new to the branch.

Follow-up to openshift#35781

Signed-off-by: Alina Ryan <aliryan@redhat.com>
Copy link
Contributor

@saifshaikh48 saifshaikh48 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 2, 2023
@saifshaikh48
Copy link
Contributor

/remove-lgtm

for tools instead of cli

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 2, 2023
This commit switches the image reference in the fast-forward workflow from 'cli'
to 'tools' since the 'cli' image does not have git installed. Git is needed for the
fast-forward workflow to be able to perform git commands.

Signed-off-by: Alina Ryan <aliryan@redhat.com>
Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this up, @alinaryan

/hold

for other reviews.

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 2, 2023
@saifshaikh48
Copy link
Contributor

/lgtm

1 similar comment
@sebsoto
Copy link
Contributor

sebsoto commented Feb 3, 2023

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 3, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alinaryan, aravindhp, saifshaikh48, sebsoto

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

@mtnbikenc
Copy link
Member

LGTM

@alinaryan
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 3, 2023
@openshift-merge-robot openshift-merge-robot merged commit fc9182a into openshift:master Feb 3, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 3, 2023

@alinaryan: 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/test-infra repository. I understand the commands that are listed here.

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
7 participants