enable builds with PR references #13893

gabemontero · 2017-04-25T17:37:31Z

For https://trello.com/c/dY8fPwNo/1194-3-support-fetching-out-pr-ref-branches-techdebt

@openshift/devex PTAL

gabemontero · 2017-04-25T17:39:08Z

(3) Support fetching out PR ref branches [techdebt]

gabemontero · 2017-04-25T18:49:21Z

[testextended][extended:core(should start a build from a PR ref)]

gabemontero · 2017-04-25T19:24:13Z

[test]

bparees · 2017-04-25T21:03:04Z

pkg/build/builder/source.go

@@ -252,7 +252,16 @@ func extractGitSource(gitClient GitClient, gitSource *api.GitBuildSource, revisi
 		}

 		if err := gitClient.Checkout(dir, commit); err != nil {
-			return true, err
+			//TODO - do we want to parse the error string for the text that accompanies a clone / checkout of a PR ref, such as:   pathspec 'refs/pull/1/head' did not match any file(s) known to git


i think this case is infrequent enough that it's not worth introducing the fragility that would come w/ that optimization.

sounds good ... I'll remove the TODO comment

gabemontero · 2017-04-25T21:10:59Z

On the 1 test failure, we hit flake #12072

bparees · 2017-04-25T21:04:04Z

pkg/build/builder/source.go

@@ -252,7 +252,16 @@ func extractGitSource(gitClient GitClient, gitSource *api.GitBuildSource, revisi
 		}

 		if err := gitClient.Checkout(dir, commit); err != nil {
-			return true, err
+			//TODO - do we want to parse the error string for the text that accompanies a clone / checkout of a PR ref, such as:   pathspec 'refs/pull/1/head' did not match any file(s) known to git
+			err = gitClient.Fetch(dir, gitSource.URI, commit)


it's probably worth adding some level 4 logging to this code path so we know when we've gone down it successfully (or if we ever go down it incorrectly).

part of next push

bparees · 2017-04-25T21:05:47Z

test/extended/builds/start.go

@@ -51,6 +52,38 @@ var _ = g.Describe("[builds][Slow] starting a build using CLI", func() {
 		})
 	})

+	g.Describe("oc start-build with pr ref", func() {
+		g.It("should start a build from a PR ref, wait for the build to complete, and confirm the right level was used", func() {
+			g.By("make sure wildly is has latest tag")


s/is/imagestream/ (i read "is" as the verb..it was very confusing :) )

part of next push

bparees · 2017-04-25T21:09:14Z

test/extended/builds/start.go

+					break
+				}
+				time.Sleep(100 * time.Millisecond)
+			}


wait.Poll()

Turns out there already is a helper function for this ... will switch to that.

gabemontero · 2017-04-25T21:43:16Z

updates pushed @bparees - thanks

bparees · 2017-04-25T21:51:51Z

pkg/build/builder/source.go

@@ -252,7 +252,17 @@ func extractGitSource(gitClient GitClient, gitSource *api.GitBuildSource, revisi
 		}

 		if err := gitClient.Checkout(dir, commit); err != nil {
-			return true, err
+			glog.V(4).Infof("Checkout after clone failed for ref %s with error: %#v, attempting fetch", commit, err)


just making sure @bparees - you decided you were OK with this and you posted the merge comment ?

no, apparently I forgot :) merge comment deleted.

update pushed

bparees · 2017-04-25T21:53:41Z

one last nit and lgtm.

gabemontero · 2017-04-25T23:51:40Z

second test run hit flake #13650

gabemontero · 2017-04-26T00:04:05Z

nit addressed

openshift-bot · 2017-04-26T00:05:35Z

Evaluated for origin testextended up to 1be7025

openshift-bot · 2017-04-26T00:05:46Z

Evaluated for origin test up to 1be7025

openshift-bot · 2017-04-26T00:29:28Z

continuous-integration/openshift-jenkins/testextended SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_extended/232/) (Base Commit: 60180d1) (Extended Tests: core(should start a build from a PR ref))

openshift-bot · 2017-04-26T01:29:31Z

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/943/) (Base Commit: 60180d1)

smarterclayton · 2017-04-26T03:01:58Z

Sweet, want this for our own CI

bparees · 2017-04-26T03:47:00Z

Sweet, want this for our own CI

we did it just for you. 🎁

jim-minter · 2017-04-26T07:47:48Z

nice!

gabemontero · 2017-04-26T14:01:05Z

On the third test run, we hit flake #13650 again, as well as a network/env hiccup during the network minimal test:

Error: Error downloading packages:
  Curl error (35): SSL connect error for https://mirrors.fedoraproject.org/metalink?repo=fedora-25&arch=x86_64 [Encountered end of file]
The command '/bin/sh -c dnf -y update && dnf -y install bind-utils findutils hostname iproute iputils less procps-ng tar which bridge-utils ethtool iptables-services openvswitch && dnf clean all' returned a non-zero code: 1
[ERROR] PID 13696: hack/dind-cluster.sh:276: `${DOCKER_CMD} build -t "${image_name}" .` exited with status 1.

@bparees - I think we are good for merge .... I saw some conversation in other PRs about whether it was valid to post the merge comment while things were on hold for the rebase, but I don't know if I saw a conclusion as to what was valid. So please post/not post as needed. Thanks.

bparees · 2017-04-26T14:07:08Z

[merge] (queue is disabled but will merge once it's back up)

openshift-bot · 2017-04-26T19:29:31Z

Evaluated for origin merge up to 1be7025

openshift-bot · 2017-04-28T05:13:42Z

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/498/) (Base Commit: 325c02f) (Image: devenv-rhel7_6184)

bparees mentioned this pull request Apr 25, 2017

minor elaborate around git pr refs openshift/openshift-docs#4235

Merged

bparees reviewed Apr 25, 2017

View reviewed changes

bparees requested changes Apr 25, 2017

View reviewed changes

gabemontero force-pushed the fetch-git-pr branch from b8d97b8 to dabe17c Compare April 25, 2017 21:42

bparees requested changes Apr 25, 2017

View reviewed changes

enable builds with PR references

1be7025

gabemontero force-pushed the fetch-git-pr branch from dabe17c to 1be7025 Compare April 26, 2017 00:03

openshift-bot merged commit 5f212b0 into openshift:master Apr 28, 2017

gabemontero deleted the fetch-git-pr branch April 28, 2017 13:41

bparees mentioned this pull request May 1, 2017

Building pull-requests on OpenShift? #13970

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

enable builds with PR references #13893

enable builds with PR references #13893

gabemontero commented Apr 25, 2017

gabemontero commented Apr 25, 2017

gabemontero commented Apr 25, 2017

gabemontero commented Apr 25, 2017

bparees Apr 25, 2017

gabemontero Apr 25, 2017

gabemontero commented Apr 25, 2017

bparees Apr 25, 2017

gabemontero Apr 25, 2017

bparees Apr 25, 2017

gabemontero Apr 25, 2017

bparees Apr 25, 2017

gabemontero Apr 25, 2017

gabemontero commented Apr 25, 2017

bparees Apr 25, 2017

gabemontero Apr 25, 2017

bparees Apr 25, 2017

gabemontero Apr 26, 2017

bparees commented Apr 25, 2017

gabemontero commented Apr 25, 2017

gabemontero commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

smarterclayton commented Apr 26, 2017

bparees commented Apr 26, 2017

jim-minter commented Apr 26, 2017

gabemontero commented Apr 26, 2017

bparees commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 28, 2017 •

edited

Loading

enable builds with PR references #13893

enable builds with PR references #13893

Conversation

gabemontero commented Apr 25, 2017

gabemontero commented Apr 25, 2017

gabemontero commented Apr 25, 2017

gabemontero commented Apr 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabemontero commented Apr 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabemontero commented Apr 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bparees commented Apr 25, 2017

gabemontero commented Apr 25, 2017

gabemontero commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

smarterclayton commented Apr 26, 2017

bparees commented Apr 26, 2017

jim-minter commented Apr 26, 2017

gabemontero commented Apr 26, 2017

bparees commented Apr 26, 2017

openshift-bot commented Apr 26, 2017

openshift-bot commented Apr 28, 2017 • edited Loading

openshift-bot commented Apr 28, 2017 •

edited

Loading