Rebase STI to support ONBUILD Docker images #1024
Conversation
|
[test] |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_openshift3/1107/) |
|
LGTM |
|
@bparees @smarterclayton I just tested this locally and the builder works. Here is my sample buildConfig: https://gist.github.com/mfojtik/737a03990f0dcf102764 going to add ContextDir and this is ready for review/push. |
|
@bparees I think we should move out the (doing this will require conversion, but I think it is worth) |
|
@mfojtik now that we support |
|
@mfojtik agree to making contextdir part of buildsource instead of strategy. |
|
[test] again... |
|
@bparees @smarterclayton PTAL I added ContextDir into BuildSource, added conversion function and fixed tons of tests.... |
There was a problem hiding this comment.
apparently we're not doing json tagging for the internal structs anymore.
There was a problem hiding this comment.
@bparees in that case they should be all removed ;-) I will make the current build finish and remove the json tagging.
|
i'm not seeing anything that actually tests this behavior, am i missing it? |
|
+1 ----- Original Message -----
|
|
by "this behavior" i mean the contextdir part, i know you cover onbuild tests in STI. |
|
@bparees the contextDir testing really belongs to STI as the Origin is only consuming it. There are plenty of tests in Origin where we do exercise contextDir option in BuildSource. Also I just noted that there are no unit tests for onbuild. I going to add those into STI as a follow up. |
|
@mfojtik something needs to test the Source.contextDir field behavior. |
|
As discussed on IRC, cover contextDir behavior testing via e2e. |
|
@bparees @smarterclayton all comments addressed, I think this is OK for merge. I'm still thinking about how to exercise this in e2e. I don't want to add example ruby app into sub-folder just to trigger ContextDir... Anyway, I think we can do this as a follow up for this card. |
mfojtik
changed the title
|
lgtm. |
|
[merge] |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/966/) (Image: devenv-fedora_837) |
|
Evaluated for origin up to 00ada2a |
Merged by openshift-bot
…service-catalog/' changes from 568a7b9..8f07b7b 8f07b7b origin: add required patches ee57bfb Cleanup of ups broker example + making controller follow the OSB API (openshift#807) 45a11ed Revert "Rename our resources to have ServiceCatalog prefix (openshift#1054)" (openshift#1061) 4e47ec1 Rename our resources to have ServiceCatalog prefix (openshift#1054) 2bb334a Rebase on 1.7 API machinery (openshift#944) 5780b59 Run broker reconciler when spec is changed. (openshift#1026) 9c22d04 Merge branch 'pr/1006' d077915 check number of expected events before dereferencing to avoid panic (openshift#1052) 90d615f Merge branch 'pr/1055' bb6d6d8 fix log output to use formatted output (openshift#1056) c7abc81 Adding examples to the README ccc93c9 Remove different-org rule for LGTM (openshift#1050) be04cd5 Allow for a period in the GUID of the External ID (openshift#1034) 8c246df Make it so that binding.spec.secretName defaults to binding name (openshift#851) 6745418 Bump OSB Client (openshift#1049) 8346a0d apiserver etcd healthcheck as suggested to address k/k#48215 (openshift#1039) 11d0d4a use GKE's latest 1.6.X cluster version for Jenkins (openshift#1036) 7d71b5b Cross-build all the things! 8ec0874 RBAC setup behind the aggregator. (openshift#936) 0864a2e Upsert retry loop for Secret, set/check ownerReference for Secret owned by Binding (openshift#979) 6be9886 add info about weekly calls (openshift#1027) a242b26 add OSB API Header version flag (openshift#1014) 66e2ce6 Update REVIEWING doc with changes to LGTM process (openshift#1016) 699e016 Writing the returned progress description from the broker (openshift#998) 02642f4 Adding target to test on the host (openshift#1020) 78ca572 v0.0.13 (openshift#1024) 9e79ec2 use GKE's default K8S version for Jenkins (openshift#1023) d3c915a Fix curl on API server start error (openshift#1015) b50be75 Merge branch 'pr/1013' 2c98ba1 Using tag URLs 687f091 Parameterizing the priority fields 34ed5cd update apiregistration yaml to v1.7 final (openshift#1011) 91fa1ad make e2e look for pods' existence before checking status (openshift#1012) 0f90705 explicitly disable leader election if it is not enabled (openshift#965) f5761e7 controller-manager health checks (openshift#694) da260f2 Add logging for normal Unbind errors (openshift#992) 4c916a5 make the apiserver test use tls (openshift#991) 1a62ecc refactor reconcileBroker (openshift#986) cc179bc Add logging for normal Bind errors (openshift#993) a1458dd add parameterization for user-broker image to e2e tests (openshift#995) fb15891 Bump OSB client (openshift#1000) 79d5206 v0.0.12 (openshift#996) 39c7407 Merge branch 'pr/975' a553b2d Merge branch 'pr/974' d573339 reconcileBinding error checking (openshift#973) 39a1061 Making events and actions checks generic (openshift#960) 73136a4 Bump osb client (openshift#971) 878a987 reconcileInstance error checking in unit-tests 4991d57 reconcileBroker error checking in unit-tests 9ed6812 Extract methods for binding test setup (openshift#961) b69a1ee Make ups-broker return valid unbind response (openshift#964) 8b37d2f Releasing 0.0.11 (openshift#962) 52fec8b Merge branch 'pr/954' d49cdeb Swap client 445fa71 Add dependency on pmorie/go-open-service-broker-client 9f743b2 Instructions for enabling API Aggregation (openshift#895) 512508d Use correct infof calls in controller_manager (openshift#950) 77943ba fix regex that determines if a tag is deployable (openshift#947) 8a226b8 Updates for v0.0.10 release (openshift#943) REVERT: 568a7b9 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: 8f07b7bbf3acb2b557f23596a92b5e775ae9321c
Signed-off-by: Doug Davis <[email protected]>
5 participants
No description provided.