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

move API types to consistent packages #14843

Merged
merged 14 commits into from
Jun 26, 2017

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jun 22, 2017

@openshift/api-review as we discussed, this moves our API types to make them consistent with all other api types in existence. This has to merge for 3.6 or we will be unable to pick changes back.

[test] to see what was missed.

@deads2k
Copy link
Contributor Author

deads2k commented Jun 22, 2017

Hey, only 20k lines. That's better than I thought it would be.

@@ -0,0 +1,135 @@
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you expecting this to stick around?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are you expecting this to stick around?

Not in the sense of "this script needs to be pretty". I want the script in this pull so that people can see if it does roughly what they expect instead of reviewing the 20k diff.

@deads2k
Copy link
Contributor Author

deads2k commented Jun 22, 2017

Try running 'gofmt -s -d [path]'
Or autocorrect with 'hack/verify-gofmt.sh | xargs -n 1 gofmt -s -w'
pkg/dockerregistry/testutil/fakeopenshift.go:16: imageapi redeclared as imported package name
	previous declaration at pkg/dockerregistry/testutil/fakeopenshift.go:15

and clientset verifier
regenerate protobuf again.  Something is off

@deads2k
Copy link
Contributor Author

deads2k commented Jun 23, 2017

I'd like this after #14701

@deads2k
Copy link
Contributor Author

deads2k commented Jun 23, 2017

re[test]

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 26, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

failed to provision re[test] green except for gce, yay!

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 26, 2017
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to af2e30d

@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

[testextended][extended:core(builds)]

@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

@liggitt builds on the SCC pull. Can you take a look. This actually has a shot at being green and being on a valid base for a force.

@openshift-bot
Copy link
Contributor

Evaluated for origin testextended up to af2e30d

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/testextended Running (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_extended/740/) (Base Commit: 07cba93) (PR Branch Commit: af2e30d) (Extended Tests: core(builds))

@@ -1 +0,0 @@
../main.go
Copy link
Contributor

Choose a reason for hiding this comment

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

the changes to this package surprised me

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the changes to this package surprised me

weird, but it looks like it will hold (symlink to file with same content) and be fixable immediately after.

Copy link
Contributor

Choose a reason for hiding this comment

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

that's fine

@liggitt
Copy link
Contributor

liggitt commented Jun 26, 2017

LGTM

@liggitt
Copy link
Contributor

liggitt commented Jun 26, 2017

looks good to merge on green tests against master HEAD

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2618/) (Base Commit: 07cba93) (PR Branch Commit: af2e30d)

@deads2k
Copy link
Contributor Author

deads2k commented Jun 26, 2017

Base commit is the current HEAD of master (minus webconsole commits), tests are green, currently merging pull flaked, it won't get better than this. Merging and aborting the current job.

@deads2k deads2k merged commit 496129f into openshift:master Jun 26, 2017
@deads2k deads2k mentioned this pull request Jun 27, 2017
@deads2k deads2k deleted the api-10-consistency branch August 3, 2017 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants