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

bump image builder #20256

Merged

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jul 9, 2018

Looks like levels of deps for imagebuilder don't want to match origin 3.10. I pinned everything, then added this.

As I recall, we only need this for pkg/build/builders which are logically a separate product/binary. We really should split those out to make this work easier, less conflicty, and less dangerous

/assign @smarterclayton @liggitt

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 9, 2018
@liggitt
Copy link
Contributor

liggitt commented Jul 9, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 9, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, liggitt

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

@smarterclayton
Copy link
Contributor

smarterclayton commented Jul 9, 2018 via email

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/test cross

@openshift-bot
Copy link
Contributor

/retest

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

@smarterclayton
Copy link
Contributor

Travis rules are complaining about your commit name, but only you know whether you care

@openshift-bot
Copy link
Contributor

/retest

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

@deads2k
Copy link
Contributor Author

deads2k commented Jul 9, 2018

Travis rules are complaining about your commit name, but only you know whether you care

Not anymore. I'll update the commit checker later. Rules are much simpler now that we don't pick for any repo but kube and we always update all deps.

@deads2k
Copy link
Contributor Author

deads2k commented Jul 9, 2018

/test cross

@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@smarterclayton
Copy link
Contributor

A note, this had nothing to do with imagebuilder deps, which are deliberately chosen to match origin.

@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@mfojtik
Copy link
Contributor

mfojtik commented Jul 10, 2018

/retest

@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@mfojtik
Copy link
Contributor

mfojtik commented Jul 10, 2018

/refresh

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@stevekuznetsov
Copy link
Contributor

@deads2k looks like your commits are bad?

Running hack/verify-upstream-commits.sh:19: executing 'commitchecker' expecting success...
FAILURE after 0.168s: hack/verify-upstream-commits.sh:19: executing 'commitchecker' expecting success: the command returned the wrong error code
There was no output from the command.
Standard error from the command:
The following commits contain Godeps changes but aren't declared as UPSTREAM:
[f23b65448] bump image builder
  - vendor/github.com/openshift/imagebuilder/cmd/imagebuilder/imagebuilder.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/archive.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/archive_test.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/client.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/conformance_test.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/copyinfo_test.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/directory.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copy/Dockerfile
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copy/script
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copydir/Dockerfile
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copydir/dir/file
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copyrename/Dockerfile
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copyrename/file1
The following UPSTREAM commits modify files outside Godeps:
[f23b65448] bump image builder
  - glide.lock
  - vendor/github.com/openshift/imagebuilder/cmd/imagebuilder/imagebuilder.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/archive.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/archive_test.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/client.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/conformance_test.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/copyinfo_test.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/directory.go
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copy/Dockerfile
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copy/script
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copydir/Dockerfile
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copydir/dir/file
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copyrename/Dockerfile
  - vendor/github.com/openshift/imagebuilder/dockerclient/testdata/copyrename/file1

@deads2k
Copy link
Contributor Author

deads2k commented Jul 10, 2018

@deads2k looks like your commits are bad?

That didn't use to matter. I'll adjust the commit checker

@deads2k deads2k added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Jul 10, 2018
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2018
@deads2k deads2k added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Jul 10, 2018

/retest

@openshift-bot
Copy link
Contributor

/retest

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

@bparees bparees removed their request for review July 11, 2018 01:33
@openshift-bot
Copy link
Contributor

/retest

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

@deads2k
Copy link
Contributor Author

deads2k commented Jul 11, 2018

@bparees can you look and see if the extended image ecosystem job has rotted? It passed, I changed a commit message (no code changes) and it now fails.

@deads2k
Copy link
Contributor Author

deads2k commented Jul 11, 2018

/retest

@bparees
Copy link
Contributor

bparees commented Jul 11, 2018

it hasn't rotted (it passed the last 2 nightly runs: https://ci.openshift.redhat.com/jenkins/job/test_branch_origin_extended_image_ecosystem/) but there does appear to be a flake w/ some of the replica tests that occasionally hangs the job for the full 6 hours. The common factor in all of them is that they use an NFS pod for PV storage. I will say I don't think we were seeing those hangs before the rebase :)

@bparees
Copy link
Contributor

bparees commented Jul 11, 2018

(we've also added logic, at least to the mongo one, to time them out sooner. Looks like your test job hadn't picked up that change though, which is unfortunate since i was hoping to get some more debug info out of things when we handle the timeout ourselves)

@openshift-merge-robot openshift-merge-robot merged commit 114b3b8 into openshift:release-3.10 Jul 11, 2018
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. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants