Resync v0.0.10 of service-catalog with origin #14675
Conversation
…service-catalog/' changes from c91fecb..568a7b9 568a7b9 origin build: add origin tooling 1bfff53 instance never provisioned should just delete (openshift#891) 1ae26db Adding a fake broker server (openshift#928) 6403076 docs: fix quoting issue, clarify naming in auth.md (openshift#931) 8ac0775 Merge branch 'pr/927' 02af952 Merge branch 'pr/876' 2aa84f9 add Jenkins badge to README 0c08788 Brokers must have at least one service (openshift#930) cbfa39b Add PodPreset support (openshift#917) 0d9b810 refactor Jenkins GitHub status postback to work on non-PR commits (openshift#916) 066159d Converting the AuthSecret field to a union AuthInfo type (openshift#877) 203af5c Add leader election namespace configuration (openshift#920) 5831502 Add example JSON schema to controller unit tests (openshift#918) b78ab99 Fix usage of finalizers (openshift#894) d3d29f0 Enable pprof in controller-manager (openshift#896) f4233a0 Correct parameter schema support (openshift#912) 05c6f00 bump image tags from v0.0.8 to v0.0.9 (openshift#910) 97d278a Add support for OSB parameter schemas (openshift#822) 3e4120e Fix nil dereference panic on request timeout (openshift#906) d8c7494 Add feature gate for audit options in helm chart (openshift#904) 89ce1cd Decompose controller unit tests (openshift#899) a1e83b2 Add e2e for walkthrough (openshift#832) 4679685 Add support for audit log options (openshift#897) 262a94f Do not allow updates to an object if asynchronous operation is in progress (openshift#853) 7295dad Validate that a ServiceClass must have at least one plan (openshift#879) 9db9fa4 Decompose controller.go (openshift#893) c3ea9bd Nits in our types (openshift#854) 1d8280a bump tags from v0.0.7 to v0.0.8 (openshift#892) 5e6925d Clean up the OSB client (openshift#888) fe6aee9 cleaning up logs and adding more log detail (openshift#874) f41516f Detect if a TPR update represents a soft delete (openshift#836) 9ce99f3 Add functions on Makefile for build and tag REVERT: c91fecb Merge pull request openshift#1 from jpeeler/origin-build REVERT: 55ccf3d origin build: add _output to .gitignore REVERT: 8352e14 origin build: make build-go and build-cross work REVERT: d969641 origin build: modify hard coded path REVERT: 30000cc origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: 568a7b9dbdc4fdd1fabffdd52af030ec73124b89
|
Unclear why that commit is being flagged as an func (c Commit) DeclaresUpstreamChange() bool {
return strings.HasPrefix(strings.ToLower(c.Summary), "upstream")
} |
|
[test] |
|
flake #8502 |
Now git commit messages are parsed so that their contents can be examined. This is similar to the commits that are exempt from validation using the bump prefix.
|
[test] again, the previous commit was just some additional error checking. |
| @@ -335,6 +341,22 @@ func filesInCommit(sha string) ([]File, error) { | |||
| return files, nil | |||
| } | |||
|
|
|||
| func descriptionInCommit(sha string) ([]string, error) { | |||
| descriptionLines := []string{} | |||
| stdout, stderr, err := run("git", "show", "--quiet", sha) | |||
There was a problem hiding this comment.
Why not git log --pretty=%b -1 $SHA?
There was a problem hiding this comment.
That is a bit nicer. If/when CI fails, I'll incorporate it.
There was a problem hiding this comment.
@jpeeler can you open a follow-up pr for this please
|
Evaluated for origin test up to 9f88d33 |
|
So what was the root cause? I'm missing something because I can't tell how your commit got picked for the |
|
@stevekuznetsov Due to the way subtrees work, the commit looked like it was an origin vendor change. The sc vendor directory prefix is not present in the file list, though it is in the commit description. |
|
Ah, I see |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2280/) (Base Commit: 3a1a5fa) (PR Branch Commit: 9f88d33) |
1 similar comment
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2280/) (Base Commit: 3a1a5fa) (PR Branch Commit: 9f88d33) |
|
[merge][severity:blocker] |
|
continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 10 |
|
Evaluated for origin merge up to 9f88d33 |
|
@eparis @smarterclayton - green if willing to manual merge. |
|
Can't break anything but itself. Merging to keep the queue open for meaningful things. |
This specifically uses a different branch than master as suggested to see if verify-upstream-commits.sh will be happy.