Skip to content
[Jenkins]Jenkins
log in
Failed

Console Output

GitHub pull request #21 of commit fd91341dfb698055b450cfcf58aa265ada960bab, has merge conflicts.
Running as SYSTEM
Setting status of fd91341dfb698055b450cfcf58aa265ada960bab to PENDING with url https://acdl.mit.edu/csi/job/gpkit_ResearchModel_turbofan_PR/19/ and message: 'Running TESTS... hold your breath...'
Using context: TESTS
[EnvInject] - Loading node environment variables.
Building remotely on reynolds in workspace /jenkins/workspace/gpkit_ResearchModel_turbofan_PR
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/turbofan
 > git init /jenkins/workspace/gpkit_ResearchModel_turbofan_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse fd91341dfb698055b450cfcf58aa265ada960bab^{commit} # timeout=10
Merging Revision fd91341dfb698055b450cfcf58aa265ada960bab (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f fd91341dfb698055b450cfcf58aa265ada960bab # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab" returned status code 1:
stdout: Auto-merging turbofan/engine_validation.py
CONFLICT (content): Merge conflict in turbofan/engine_validation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/turbofan
 > git init /jenkins/workspace/gpkit_ResearchModel_turbofan_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse fd91341dfb698055b450cfcf58aa265ada960bab^{commit} # timeout=10
Merging Revision fd91341dfb698055b450cfcf58aa265ada960bab (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f fd91341dfb698055b450cfcf58aa265ada960bab # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab" returned status code 1:
stdout: Auto-merging turbofan/engine_validation.py
CONFLICT (content): Merge conflict in turbofan/engine_validation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/turbofan
 > git init /jenkins/workspace/gpkit_ResearchModel_turbofan_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse fd91341dfb698055b450cfcf58aa265ada960bab^{commit} # timeout=10
Merging Revision fd91341dfb698055b450cfcf58aa265ada960bab (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f fd91341dfb698055b450cfcf58aa265ada960bab # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab" returned status code 1:
stdout: Auto-merging turbofan/engine_validation.py
CONFLICT (content): Merge conflict in turbofan/engine_validation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/turbofan
 > git init /jenkins/workspace/gpkit_ResearchModel_turbofan_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/turbofan # timeout=10
Fetching upstream changes from https://github.com/convexengineering/turbofan
 > git fetch --tags --progress https://github.com/convexengineering/turbofan +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse fd91341dfb698055b450cfcf58aa265ada960bab^{commit} # timeout=10
Merging Revision fd91341dfb698055b450cfcf58aa265ada960bab (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f fd91341dfb698055b450cfcf58aa265ada960bab # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff fd91341dfb698055b450cfcf58aa265ada960bab" returned status code 1:
stdout: Auto-merging turbofan/engine_validation.py
CONFLICT (content): Merge conflict in turbofan/engine_validation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Setting status of fd91341dfb698055b450cfcf58aa265ada960bab to FAILURE with url https://acdl.mit.edu/csi/job/gpkit_ResearchModel_turbofan_PR/19/ and message: 'Shucks... didn't pass the TESTS...
 '
Using context: TESTS
Finished: FAILURE