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.

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

LPS-64789 SF #38412

Closed
wants to merge 2 commits into from
Closed

LPS-64789 SF #38412

wants to merge 2 commits into from

Conversation

rotty3000
Copy link

@liferay-continuous-integration
Copy link
Collaborator

Some tests FAILED!

Build Time: 55 seconds

Base Branch:

Branch Name: master
Branch GIT ID: 5b6b3d153a21e89ec9327718316cbc3c36f41cfa

Job Summary:

For more details click here.

Failed Jobs:

  1. test-portal-acceptance-pullrequest(master)
    Job Results:

    0 Jobs Passed.
    2 Jobs Failed.

    Completed with the status of FAILURE.
  2. test-portal-acceptance-pullrequest-source(master)

    Please fix rebase errors on rotty3000/LPS-64789.

         [exec] First, rewinding head to replay your work on top of it...
     [exec] Applying: LPS-64789 NPE occurs in PortletTracker when deploying a ds/wab portlet
     [exec] Applying: LPS-64789 SF
     [exec] Using index info to reconstruct a base tree...
     [exec] M modules/core/portal-bootstrap/build.gradle
     [exec] M modules/core/registry-test/build.gradle
     [exec] Falling back to patching base and 3-way merge...
     [exec] Auto-merging modules/core/registry-test/build.gradle
     [exec] CONFLICT (content): Merge conflict in modules/core/registry-test/build.gradle
     [exec] Auto-merging modules/core/portal-bootstrap/build.gradle
     [exec] CONFLICT (content): Merge conflict in modules/core/portal-bootstrap/build.gradle
     [exec] Failed to merge in the changes.
     [exec] Patch failed at 0002 LPS-64789 SF

@rotty3000
Copy link
Author

ci:retest

@liferay-continuous-integration
Copy link
Collaborator

Some tests FAILED!

Build Time: 1 hour 5 minutes 19 seconds

Base Branch:

Branch Name: master
Branch GIT ID: 2151e43f7d05373945277bef11e25f01425ad92a

Job Summary:

For more details click here.

Failed Jobs:

  1. test-portal-acceptance-pullrequest(master)
    Job Results:

    54 Jobs Passed.
    2 Jobs Failed.

    Completed with the status of FAILURE.
  2. test-portal-acceptance-pullrequest-batch(master)/modules-unit-jdk7
    Job Results:

    1208 Tests Passed.
    2 Tests Failed.

    1. DDMFormValuesFactoryTest.testCreateDefaultWithEmptyRequest
    2. SourceFormatterTest.testSourceFormatter

@rotty3000
Copy link
Author

These failures are completely unrelated.

@brianchandotcom
Copy link
Owner

Merged. Thank you.
View total diff: 3200075...3697ff9

@rotty3000 rotty3000 deleted the LPS-64789 branch April 2, 2016 00:55
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
3 participants
@rotty3000 @liferay-continuous-integration @brianchandotcom