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

Temporarily disable some integration tests to unblock queue #2210

Merged
merged 1 commit into from
Oct 5, 2017

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Oct 3, 2017

Run the integration tests, but don't fail if only the integration tests fail. See #2200

Merge will still fail on dist differences or unit test failures.

@spadgett
Copy link
Member Author

spadgett commented Oct 3, 2017

[test]

@spadgett
Copy link
Member Author

spadgett commented Oct 4, 2017

[test]

@spadgett
Copy link
Member Author

spadgett commented Oct 4, 2017

@jeff-phillips-18 @benjaminapetersen Any objection to this? Our merge queue has been broken for several days now. We haven't been able to find a simple fix.

I think the right path forward is to update Protractor in #2083, which we need to do anyway.

Copy link
Contributor

@benjaminapetersen benjaminapetersen left a comment

Choose a reason for hiding this comment

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

LGTM, lets get the merge queue open again.

Makefile Outdated
@@ -44,5 +44,5 @@ build: install
test: build
hack/verify-dist.sh
hack/test-headless.sh test $(GRUNT_FLAGS)
hack/test-headless.sh test-integration $(GRUNT_FLAGS)
-hack/test-headless.sh test-integration $(GRUNT_FLAGS)
Copy link
Contributor

@benjaminapetersen benjaminapetersen Oct 4, 2017

Choose a reason for hiding this comment

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

only thought, comment this? the - runs it but wont fail the build?

@openshift-bot
Copy link

Evaluated for origin web console test up to 19292d6

@openshift-bot
Copy link

Origin Web Console Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_web_console/283/) (Base Commit: a9de5c9) (PR Branch Commit: 19292d6)

Copy link
Member

@jeff-phillips-18 jeff-phillips-18 left a comment

Choose a reason for hiding this comment

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

I agree. Let's get by this for now and update to get it right.

@spadgett
Copy link
Member Author

spadgett commented Oct 5, 2017

[merge]

@openshift-bot
Copy link

openshift-bot commented Oct 5, 2017

Origin Web Console Merge Results: Waiting: You are in the build queue at position: 1

@openshift-bot
Copy link

Evaluated for origin web console merge up to 19292d6

@openshift-bot openshift-bot merged commit 6ef0e8b into openshift:master Oct 5, 2017
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.

None yet

4 participants