Skip to content
[Jenkins]Jenkins
log in
Failed

Console Output

GitHub pull request #1539 of commit 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5, has merge conflicts.
Running as SYSTEM
!!! PR mergeability status has changed !!!  
PR now has NO merge conflicts
Setting status of 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 to PENDING with url https://acdl.mit.edu/csi/job/CE_gpkit_PR_pylint/2373/ and message: 'Running pylint... hold your breath...'
Using context: gpkit pylint tests
[EnvInject] - Loading node environment variables.
Building remotely on reynolds in workspace /jenkins/workspace/CE_gpkit_PR_pylint
Running Prebuild steps
Run condition [Execution node ] enabling prebuild for step [Execute shell]
[Execution node] check if [reynolds] is in [[macys, macys_VM]]
Run condition [Execution node ] preventing perform for step [Execute shell]
Success build fororg.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder@7af6508
The recommended git tool is: NONE
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_pylint # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5^{commit} # timeout=10
Merging Revision 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5" returned status code 1:
stdout: Auto-merging docs/source/examples/performance_modeling.py
CONFLICT (content): Merge conflict in docs/source/examples/performance_modeling.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
The recommended git tool is: NONE
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_pylint # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5^{commit} # timeout=10
Merging Revision 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5" returned status code 1:
stdout: Auto-merging docs/source/examples/performance_modeling.py
CONFLICT (content): Merge conflict in docs/source/examples/performance_modeling.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
The recommended git tool is: NONE
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_pylint # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5^{commit} # timeout=10
Merging Revision 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5" returned status code 1:
stdout: Auto-merging docs/source/examples/performance_modeling.py
CONFLICT (content): Merge conflict in docs/source/examples/performance_modeling.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
The recommended git tool is: NONE
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_pylint # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5^{commit} # timeout=10
Merging Revision 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5" returned status code 1:
stdout: Auto-merging docs/source/examples/performance_modeling.py
CONFLICT (content): Merge conflict in docs/source/examples/performance_modeling.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Setting status of 6ce1b83e6dd30869f7e4534beeaa2ceaccdc27e5 to FAILURE with url https://acdl.mit.edu/csi/job/CE_gpkit_PR_pylint/2373/ and message: 'Shucks... didn't pass the tests...
 '
Using context: gpkit pylint tests
Finished: FAILURE