You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jclouds.apache.org by BuildHive <bu...@cloudbees.com> on 2013/07/31 23:05:37 UTC
Build failed in Jenkins: jclouds » jclouds-labs #232
See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/232/>
------------------------------------------
GitHub pull request #18 to jclouds/jclouds-labs
Building remotely on s-7ebd6224 in workspace <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/ws/>
Checkout:jclouds-labs / <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/ws/> - hudson.remoting.Channel@5db2a1b9:s-7ebd6224
Using strategy: Build commits submitted for validated merge
Last Built Revision: Revision 880c1c7d0ef6bb32107b79e78ba89086cc0c0dc3 (origin/master)
Fetching changes from 1 remote Git repository
Fetching upstream changes from git://github.com/jclouds/jclouds-labs.git
Opening connection
Done: 0
Counting objects
Done: 3
Finding sources
Done: 3
Getting sizes
Done: 3
Compressing objects
Done: 2
Writing objects
Done: 3
Merging refs/tags/changes/232
FATAL: Could not merge refs/tags/changes/232
hudson.plugins.git.GitException: Could not merge refs/tags/changes/232
at hudson.plugins.git.GitAPI.merge(GitAPI.java:351)
at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:94)
at hudson.plugins.git.GitSCM$2.invoke(GitSCM.java:1170)
at hudson.plugins.git.GitSCM$2.invoke(GitSCM.java:1059)
at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2154)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:287)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
at java.util.concurrent.FutureTask.run(FutureTask.java:166)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:724)
Caused by: hudson.plugins.git.GitException: Command "git merge refs/tags/changes/232" returned status code 1:
stdout: Removing rackspace-clouddns/pom.xml
Removing rackspace-clouddns-us/pom.xml
Removing rackspace-clouddns-uk/pom.xml
Auto-merging pom.xml
CONFLICT (modify/delete): openstack/pom.xml deleted in refs/tags/changes/232 and modified in HEAD. Version HEAD of openstack/pom.xml left in tree.
Removing openstack/openstack-swift/src/test/resources/logback.xml
Removing openstack/openstack-swift/src/test/resources/container_list.json
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiExpectTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiLiveTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiExpectTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiLiveTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiExpectTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiExpectTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftErrorHandlerTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java
Removing openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/PasswordAuthenticationExpectTest.java
Removing openstack/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/options/ListContainersOptions.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/handlers/SwiftErrorHandler.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseAccountMetadataResponseFromHeaders.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftProperties.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/config/SwiftHttpApiModule.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
Removing openstack/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
CONFLICT (modify/delete): openstack/openstack-swift/pom.xml deleted in refs/tags/changes/232 and modified in HEAD. Version HEAD of openstack/openstack-swift/pom.xml left in tree.
Removing openstack/openstack-reddwarf/src/test/resources/logback.xml
Removing openstack/openstack-reddwarf/src/test/resources/flavor_list.json
Removing openstack/openstack-reddwarf/src/test/resources/flavor_get.json
Removing openstack/openstack-reddwarf/src/test/resources/access_rax_us.json
Removing openstack/openstack-reddwarf/src/test/java/org/jclouds/openstack/reddwarf/v1/parse/ParseFlavorListTest.java
Removing openstack/openstack-reddwarf/src/test/java/org/jclouds/openstack/reddwarf/v1/internal/BaseRedDwarfExpectTest.java
Removing openstack/openstack-reddwarf/src/test/java/org/jclouds/openstack/reddwarf/v1/internal/BaseRedDwarfApiLiveTest.java
Removing openstack/openstack-reddwarf/src/test/java/org/jclouds/openstack/reddwarf/v1/internal/BaseRedDwarfApiExpectTest.java
Removing openstack/openstack-reddwarf/src/test/java/org/jclouds/openstack/reddwarf/v1/features/FlavorApiLiveTest.java
Removing openstack/openstack-reddwarf/src/test/java/org/jclouds/openstack/reddwarf/v1/features/FlavorApiExpectTest.java
Removing openstack/openstack-reddwarf/src/test/java/org/jclouds/openstack/reddwarf/v1/domain/FlavorTest.java
Removing openstack/openstack-reddwarf/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
Removing openstack/openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/handlers/RedDwarfErrorHandler.java
Removing openstack/openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/features/FlavorApi.java
Removing openstack/openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/domain/Flavor.java
Removing openstack/openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/config/RedDwarfParserModule.java
Removing openstack/openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/config/RedDwarfHttpApiModule.java
Removing openstack/openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/RedDwarfApiMetadata.java
Removing openstack/openstack-reddwarf/src/main/java/org/jclouds/openstack/reddwarf/v1/RedDwarfApi.java
CONFLICT (modify/delete): openstack/openstack-reddwarf/pom.xml deleted in refs/tags/changes/232 and modified in HEAD. Version HEAD of openstack/openstack-reddwarf/pom.xml left in tree.
Removing openstack/openstack-quantum/src/test/resources/port_details.json
Removing openstack/openstack-quantum/src/test/resources/port.json
Removing openstack/openstack-quantum/src/test/resources/network_details.json
Removing openstack/openstack-quantum/src/test/resources/network.json
Removing openstack/openstack-quantum/src/test/resources/logback.xml
Removing openstack/openstack-quantum/src/test/resources/list_networks.json
Removing openstack/openstack-quantum/src/test/resources/list_network_refs.json
Removing openstack/openstack-quantum/src/test/resources/attachment.json
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParsePortDetailsTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseNetworkDetailsTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/parse/ParseAttachmentTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumExpectTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiLiveTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/internal/BaseQuantumApiExpectTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java
Removing openstack/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadataTest.java
Removing openstack/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/handlers/QuantumErrorHandler.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/PortApi.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApi.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Reference.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/PortDetails.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Port.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/NetworkDetails.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Network.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Attachment.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumProperties.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/config/QuantumHttpApiModule.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
Removing openstack/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApi.java
CONFLICT (modify/delete): openstack/openstack-quantum/pom.xml deleted in refs/tags/changes/232 and modified in HEAD. Version HEAD of openstack/openstack-quantum/pom.xml left in tree.
Removing openstack/openstack-glance/src/test/resources/logback.xml
Removing openstack/openstack-glance/src/test/resources/images_detail.json
Removing openstack/openstack-glance/src/test/resources/images.json
Removing openstack/openstack-glance/src/test/resources/image.json
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java
CONFLICT (modify/delete): openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java deleted in refs/tags/changes/232 and modified in HEAD. Version HEAD of openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java left in tree.
Removing openstack/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java
Removing openstack/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ImageField.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
Removing openstack/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java
CONFLICT (modify/delete): openstack/openstack-glance/pom.xml deleted in refs/tags/changes/232 and modified in HEAD. Version HEAD of openstack/openstack-glance/pom.xml left in tree.
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at hudson.plugins.git.GitAPI.launchCommandIn(GitAPI.java:779)
at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:741)
at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:751)
at hudson.plugins.git.GitAPI.merge(GitAPI.java:349)
... 13 more
Jenkins build is back to normal : jclouds » jclouds-labs #233
Posted by BuildHive <bu...@cloudbees.com>.
See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs/233/changes>