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.

Sign up for GitHub

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

Jump to bottom

[Bugzilla 1849524] marketplace-operator should show the source git commit #288

Merged

openshift-merge-robot merged 2 commits into operator-framework:master from jianzhangbjz:git-commit

Mar 14, 2020

Contributor

jianzhangbjz commented Mar 12, 2020

Description of the change:
Now, the output of the marketplace-operator --version is the sha of the commit in dist-git, not the source commit digest. This PR will fix this issue.

[jzhang@dhcp-140-36 ~]$ oc exec marketplace-operator-f7d7689c9-rllgk -- marketplace-operator --version
Marketplace source git commit: fb0762cf5b386d783527d036e4666b4468a12aad
time="2020-03-12T13:54:55Z" level=info msg="[metrics] Registering marketplace metrics"
time="2020-03-12T13:54:55Z" level=info msg="[metrics] Creating marketplace metrics RoundTripperFunc"
time="2020-03-12T13:54:55Z" level=info msg="[metrics] Serving marketplace metrics"
time="2020-03-12T13:54:55Z" level=info msg="Go Version: go1.13.4"
time="2020-03-12T13:54:55Z" level=info msg="Go OS/Arch: linux/amd64"
time="2020-03-12T13:54:55Z" level=info msg="operator-sdk Version: v0.8.0"

Motivation for the change:

Reviewer Checklist

Implementation matches the proposed design, or proposal is updated to match implementation
Sufficient unit test coverage
Sufficient end-to-end test coverage
Docs updated or added to /docs
Commit messages sensible and descriptive


          Get the source commit id from the SOURCE_GIT_COMMIT

88c197e

openshift-ci-robot requested review from aravindhp and kevinrizza

March 12, 2020 14:35

Contributor

openshift-ci-robot commented Mar 12, 2020

Hi @jianzhangbjz. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

openshift-ci-robot added needs-ok-to-test size/XS labels

Member

kevinrizza commented Mar 12, 2020

/ok-to-test
/lgtm
/approve

@jianzhangbjz thanks for the contribution!

openshift-ci-robot assigned kevinrizza

openshift-ci-robot added ok-to-test lgtm and removed needs-ok-to-test labels

Contributor

openshift-ci-robot commented Mar 12, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jianzhangbjz, kevinrizza

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~~ [kevinrizza]

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

openshift-ci-robot added the approved label

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

sosiouxme reviewed

View reviewed changes

build/build.sh Outdated Show resolved Hide resolved

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

9 similar comments

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 12, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.


          Fix build failure when SOURCE_GIT_COMMIT is unset.

82344d2

Co-Authored-By: Luke Meyer <sosiouxme@gmail.com>

openshift-ci-robot removed the lgtm label

Member

ecordell commented Mar 14, 2020

/lgtm

openshift-ci-robot assigned ecordell

openshift-ci-robot added the lgtm label

Contributor

openshift-bot commented Mar 14, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments

Contributor

openshift-bot commented Mar 14, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 14, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 14, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Mar 14, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-merge-robot merged commit bd34747 into operator-framework:master

Contributor Author

jianzhangbjz commented Mar 16, 2020

/cherry-pick release-4.4

openshift-cherrypick-robot commented Mar 16, 2020

@jianzhangbjz: only operator-framework org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherry-pick release-4.4

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.

Contributor Author

jianzhangbjz commented Mar 16, 2020

/cherry-pick release-4.3

openshift-cherrypick-robot commented Mar 16, 2020

@jianzhangbjz: only operator-framework org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherry-pick release-4.3

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.

Contributor Author

jianzhangbjz commented Mar 16, 2020

/cherry-pick release-4.2

openshift-cherrypick-robot commented Mar 16, 2020

@jianzhangbjz: only operator-framework org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherry-pick release-4.2

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.

Member

kevinrizza commented Mar 16, 2020

/cherry-pick release-4.4

openshift-cherrypick-robot mentioned this pull request

Bug 1849518: [release-4.4] show the source commit id #292

Merged

openshift-cherrypick-robot commented Mar 16, 2020

@kevinrizza: new pull request created: #292

In response to this:

/cherry-pick release-4.4

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.

jianzhangbjz changed the title ~~show the source commit id~~ [Bugzilla 1849518] show the source commit id

jianzhangbjz changed the title ~~[Bugzilla 1849518] show the source commit id~~ [Bugzilla 1849524] show the source commit id

jianzhangbjz changed the title ~~[Bugzilla 1849524] show the source commit id~~ [Bugzilla 1849524] marketplace-operator should show the source git commit

Member

kevinrizza commented Jun 23, 2020

/cherry-pick release-4.4

openshift-cherrypick-robot commented Jun 23, 2020

@kevinrizza: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift-cherrypick-robot/operator-marketplace\n ! [rejected] cherry-pick-288-to-release-4.4 -> cherry-pick-288-to-release-4.4 (non-fast-forward)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:CENSORED@github.com/openshift-cherrypick-robot/operator-marketplace'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Integrate the remote changes (e.g.\nhint: 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n", error: exit status 1

In response to this:

/cherry-pick release-4.4

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment