Skip to content

Rebase STI to pickup .sti/environment support #1138

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-bot merged 2 commits into from
Feb 25, 2015
Merged

Rebase STI to pickup .sti/environment support #1138

openshift-bot merged 2 commits into from
Feb 25, 2015

Conversation

@mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Feb 25, 2015

This rebase brings the support for .sti/environment file to Origin (see: openshift/source-to-image#145) (Trello#499)

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

@soltysh PTAL

@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 25, 2015

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_openshift3/1165/)

@mfojtik mfojtik mentioned this pull request Feb 25, 2015
Merged
@soltysh
Copy link
Contributor

soltysh commented Feb 25, 2015

LGTM

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

[test]

@soltysh
Copy link
Contributor

soltysh commented Feb 25, 2015

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 25, 2015

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1031/) (Image: devenv-fedora_885)

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

[merge] again?

@mfojtik
Copy link
Contributor Author

mfojtik commented Feb 25, 2015

@smarterclayton @bparees it seems like there is some race condition in integration test in Jenkins:

--- FAIL: TestSimpleImageChangeBuildTrigger (0.13 seconds)
    deploy_trigger_test.go:317: Starting test openshift
    imagechange_buildtrigger_test.go:69: Expected build with base image registry:8080/openshift/test-image:ref-2, got registry:8080/openshift/test-image:ref-1

If I run integration tests manually, then I don't get this error. @smarterclayton @soltysh said you were modifying the test run to run in separate processes, could this be related to that?

@soltysh
Copy link
Contributor

soltysh commented Feb 25, 2015

From my observations on this we're using test-image-repo name in two separate tests imagechange_buildtrigger_test.go and deploy_trigger_test.go and this might be the root cause for this problem. I'd suggest renaming it in one of those files.

@openshift-bot
Copy link
Contributor

openshift-bot commented Feb 25, 2015

Evaluated for origin up to 73577f1

openshift-bot pushed a commit that referenced this pull request Feb 25, 2015
Merge pull request #1138 from mfojtik/sti_rebase2
9f27781 
Merged by openshift-bot
@openshift-bot openshift-bot merged commit 9f27781 into openshift:master Feb 25, 2015
@soltysh soltysh mentioned this pull request Feb 25, 2015
Merged
@smarterclayton
Copy link
Contributor

smarterclayton commented Feb 26, 2015

They're sequentially run, so the only race possible is within the test

On Feb 25, 2015, at 6:31 AM, Michal Fojtik [email protected] wrote:

@smarterclayton @bparees it seems like there is some race condition in intergration test in Jenkins:

--- FAIL: TestSimpleImageChangeBuildTrigger (0.13 seconds)
deploy_trigger_test.go:317: Starting test openshift
imagechange_buildtrigger_test.go:69: Expected build with base image registry:8080/openshift/test-image:ref-2, got registry:8080/openshift/test-image:ref-1
If I run integration tests manually, then I don't get this error. @smarterclayton @soltysh said you were modifying the test run to run in separate processes, could this be related to that?

—
Reply to this email directly or view it on GitHub.

@soltysh soltysh mentioned this pull request Feb 26, 2015
Closed
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Aug 17, 2017
Squashed 'cmd/service-catalog/go/src/github.com/kubernetes-incubator/…
1cd2988 
…service-catalog/' changes from 8f07b7b..7e650e7

7e650e7 origin build: add origin tooling
f32eec2 unit test for ./pkg/rest/core/fake rest client, addresses openshift#860 Test ready to be reviewed (openshift#1113)
e388aee explicitly always prefer latest OSBAPI Version (openshift#1138)
962429e Merge branch 'pr/1135'
b6ee7ef fix rbac
cb1beb9 Merge branch 'pr/1131'
ecc5c01 Update Code of Conduct (openshift#1137)
e7c5ab3 address one more PR comment
ddcbbad address PR comments
652a83b fix test expectation to match the new error message for missing service class
33417cc address PR comments
565fccf Use the chart name instead of the namespace (openshift#1102)
bc61919 Add new terminal failure binding condition (openshift#1057)
4e642d5 Added more detailed instructions on how to setup the repo (openshift#1114)
bdaea23 update unit tests (openshift#1123)
88a9642 validate the apiserver options (openshift#1116)
b0af5fc fix whitespace in the copyright section
dee796a generated type changes
ef585c4 Rename the directory from default to defaultservicename to conform to go style guide. Wire admission controller into the apiserver
0b5d6c6 add firewall troubleshooting section (openshift#1040)
fd9e6bc Fix Typo in Events Code of Conduct (openshift#1126)
ebe6506 Fix Typo in Terminology (openshift#1128)
0038b1e Merge branch 'pr/1122'
8411f31 make deprovisioning an instance asynchronously not fall-through to synchronous deprovision (openshift#1067)
76c1d93 handle failures from list and test the not ready condition, cleanup
9241296 finish unit tests, passing
ed75774 Minor fixes based on go report card
9911e8d Add GoReport Widget (openshift#1121)
dd24e5c clean up old cruft
08276c6 generated file changes
6489d90 Implement the default plan in admission controller
a6bb576 Code: Instance/Binding parameters from secret (openshift#1079)
10bb148 Update generated files (openshift#1115)
5291e6f v0.0.15 (openshift#1118)
28a1ea6 Merge branch 'pr/1104'
bb4a2d2 Merge branch 'pr/1097'
1c14a90 push all arch images on release tags (openshift#1108)
b587b2c Improve log output for deprovision
8887561 Remove PodPreset embedding from Binding (openshift#1030)
1abdcc8 Adjust helm/tiller installation instructions (openshift#1091)
f636f99 only skip tls verify if not behind the aggregator (openshift#1101)
43b40ab controller_broker unit test bullet-proofing openshift#1077 (openshift#1099)
bb596b8 Use data store instead of database (openshift#1100)
04fa477 Implementation: Support for Bearer token auth between Service Catalog and brokers (openshift#1053)
9e46d3c refactor Jenkins e2e tests (openshift#1082)
1f0a41e remove old/misleading comments about only doing soft delete if it's "our turn--" i.e. only if the finalizer we care about is at the head of the finalizers list.
5c1d9b8 Update OSB client (openshift#1085)
a6e80ea Only do work for instances from a single queue (openshift#1074)
2bd85d6 Merge branch 'pr/1076'
e324287 Tweaks to the walkthrough for local-up-cluster
d8b7899 Add a note to the walkthrough about getting bindings when using the aggregator (openshift#1078)
ea44cf1 msg on Environment Variables to set for e2e (openshift#1070)
d15554a Merge branch 'pr/1017'
faf966e Add comment re: async race condition in integration tests
ed2e096 v0.0.14 (openshift#1071)
fc84ffd more PR feedback
283bed4 Add integration tests and some error checking; PR feedback
903a7a7 Add terminal condition for instance and do not retry failed provisions
REVERT: 8f07b7b origin: add required patches

git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog
git-subtree-split: 7e650e7e39c3fc79a8ecc061cce2a70e899406ff
jpeeler pushed a commit to jpeeler/origin that referenced this pull request Feb 1, 2018
@MHBauer @arschles
explicitly always prefer latest OSBAPI Version (openshift#1138)
e388aee 
- resolves openshift#982
@mfojtik mfojtik deleted the sti_rebase2 branch September 5, 2018 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mfojtik @openshift-bot @soltysh @smarterclayton