Skip to content
This repository has been archived by the owner on Jan 18, 2020. It is now read-only.

[JENKINS-53274] move aws plugins to aws section #206

Merged
merged 1 commit into from Aug 29, 2018

Conversation

mandie722
Copy link
Contributor

No description provided.

@mandie722 mandie722 changed the title JENKINS-53274 move aws plugins to aws section [JENKINS-53274] move aws plugins to aws section Aug 28, 2018
@mandie722 mandie722 closed this Aug 28, 2018
@mandie722 mandie722 reopened this Aug 28, 2018
@jenkinsadmin
Copy link

Build failed; the context from the latest run is:

Expand to view
Branch indexing
Connecting to https://api.github.com using jenkinsadmin/****** (GitHub access token for jenkinsadmin)
Connecting to https://api.github.com to check permissions of obtain list of mandie722 for jenkins-infra/evergreen
Checking out git https://github.com/jenkins-infra/evergreen.git into /var/jenkins_home/jobs/Infra/jobs/evergreen/branches/PR-206/workspace@script to read Jenkinsfile
Fetching changes from the remote Git repository
Fetching without tags
Merging remotes/origin/master commit 32a278882aee26f7075e2c219a76dcbacc7b7532 into PR head commit 389b08a8f102210f80537369a39c3bcebf21a464

GitHub has been notified of this commit’s build result

hudson.plugins.git.GitException: Failed to merge AnyObjectId[32a278882aee26f7075e2c219a76dcbacc7b7532]
	at org.jenkinsci.plugins.gitclient.JGitAPIImpl$6.execute(JGitAPIImpl.java:1560)
	at jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:122)
	at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1094)
	at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1187)
	at org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:113)
	at org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition.create(CpsScmFlowDefinition.java:144)
	at org.jenkinsci.plugins.workflow.multibranch.SCMBinder.create(SCMBinder.java:120)
	at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:302)
	at hudson.model.ResourceController.execute(ResourceController.java:97)
	at hudson.model.Executor.run(Executor.java:429)
Finished: FAILURE

Powered by the Comment Logger

@batmat
Copy link
Collaborator

batmat commented Aug 29, 2018

@mandie722 just rebased this PR to resolve the conflict caused by my #205.

version: '1.39'
- groupId: org.jenkins-ci.plugins
artifactId: node-iterator-api
version: '1.5'
Copy link
Collaborator

Choose a reason for hiding this comment

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

not an issue caused by this, but I'll need to force it to 1.5.0.

@batmat
Copy link
Collaborator

batmat commented Aug 29, 2018

LGTM. Will merge this once we get a green build.

@batmat
Copy link
Collaborator

batmat commented Aug 29, 2018

Green! 🎆 merging.

@batmat batmat merged commit 060ac15 into jenkins-infra:master Aug 29, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants