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

Issue 1862: Gitlab status upload fails with missing commit error #1863

Merged
merged 1 commit into from
Jan 16, 2020

Conversation

dibbles
Copy link
Member

@dibbles dibbles commented Jan 13, 2020

Changes

This PR adds the preloading of data into the resource.PullRequest
used in the FromDisk() method. If the pr.json file has been copied
into the ouput directory, it is unmarshalled into the resource prior
to subsequent updates from other files on disk, avoiding overwiting
the r.PR.Sha with a null value from head.json (should that situation
occur).

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

Reviewer Notes

If API changes are included, additive changes must be approved by at least two OWNERS and backwards incompatible changes must be approved by more than 50% of the OWNERS, and they must first be added in a backwards compatible way.

Release Notes

Fixes issue 1862: Gitlab status upload fails with missing commit error when using pipelineresource
of type pullrequest.

@googlebot googlebot added the cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit label Jan 13, 2020
@tekton-robot tekton-robot requested review from dlorenc and a user January 13, 2020 17:29
@tekton-robot tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 13, 2020
@dibbles
Copy link
Member Author

dibbles commented Jan 13, 2020

Notes:

  • I need to update the release note block (ran out of time today)
  • I spoke with @wlynch about this issue on Slack, main point of discussion might be around fixing here or in the jenkins scm code.

Copy link
Member

@wlynch wlynch left a comment

Choose a reason for hiding this comment

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

Yeah the underlying issue is that the go-scm library isn't populating this value - https://github.com/jenkins-x/go-scm/blob/master/scm/driver/gitlab/pr.go#L175-L195

I can take an AI to add this.

This is something that probably makes sense to do regard less.

pkg/pullrequest/disk.go Outdated Show resolved Hide resolved
pkg/pullrequest/disk.go Outdated Show resolved Hide resolved
pkg/pullrequest/disk.go Show resolved Hide resolved
@wlynch
Copy link
Member

wlynch commented Jan 13, 2020

I can take an AI to add this.

jenkins-x/go-scm#62

Copy link
Member

@wlynch wlynch left a comment

Choose a reason for hiding this comment

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

/lgtm pending minor comments

pkg/pullrequest/disk.go Outdated Show resolved Hide resolved
pkg/pullrequest/disk.go Outdated Show resolved Hide resolved
pkg/pullrequest/disk.go Outdated Show resolved Hide resolved
This PR adds the preloading of data into the resource.PullRequest
used in the FromDisk() method.  If the pr.json file has been copied
into the ouput directory, it is unmarshalled into the resource prior
to subsequent updates from other files on disk, avoiding overwiting
the r.PR.Sha with a null value from head.json (should that situation
occur).
@wlynch
Copy link
Member

wlynch commented Jan 15, 2020

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 15, 2020
@dibbles
Copy link
Member Author

dibbles commented Jan 15, 2020

/test pull-tekton-pipeline-integration-tests

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

/meow

@tekton-robot
Copy link
Collaborator

@vdemeester: cat image

In response to this:

/meow

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.

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2020
@dibbles
Copy link
Member Author

dibbles commented Jan 16, 2020

issue #1862

@tekton-robot tekton-robot merged commit 5e7f2ac into tektoncd:master Jan 16, 2020
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. cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants