Skip to content

Upgrade workflow log api #1833

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

Merged
vivek merged 6 commits into from
Oct 16, 2018
Merged

Upgrade workflow log api #1833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5da8147
Fixing waitForMessage in AbstractRunImplTest.queuedAndRunningParallel…
jglick Oct 10, 2018
9b2bd66
Update workflow plugins with logging changes
vivek Oct 12, 2018
20f7e9f
pipeline plugins upgrade
vivek Oct 12, 2018
b060ec5
bumped up struts and workflow-cps version
vivek Oct 15, 2018
f7c48db
Check existence of display name vs specific name as it can change in …
vivek Oct 15, 2018
b05591f
Updated structs plugin version in acceptance test
vivek Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acceptance-tests/runner/runtime-plugins/runtime-deps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.14</version>
<version>1.17</version>
</dependency>

<dependency>
Expand Down
5 changes: 3 additions & 2 deletions ...e-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/AbstractRunImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,8 @@ public void queuedAndRunningParallel() throws Exception {
// Run until completed
WorkflowRun r = p.scheduleBuild2(0).waitForStart();
SemaphoreStep.waitForStart("wait-a/1", r);
j.waitForMessage("[Pipeline] [b] node", r);
String causeOfBlockage = "There are no nodes with the label ‘second’";
j.waitForMessage(causeOfBlockage, r);

// Get latest run for this pipeline
pipeline = request().get(String.format("/organizations/jenkins/pipelines/%s/", p.getName())).build(Map.class);
Expand All @@ -388,7 +389,7 @@ public void queuedAndRunningParallel() throws Exception {

Assert.assertEquals("QUEUED", latestRun.get("state"));
Assert.assertEquals("1", latestRun.get("id"));
Assert.assertEquals("There are no nodes with the label ‘second’", latestRun.get("causeOfBlockage"));
Assert.assertEquals(causeOfBlockage, latestRun.get("causeOfBlockage"));

j.createOnlineSlave(Label.get("second"));

Expand Down
28 changes: 12 additions & 16 deletions ...line-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@
import io.jenkins.blueocean.rest.hal.Link;
import io.jenkins.blueocean.rest.model.BluePipelineNode;
import io.jenkins.blueocean.rest.model.BlueRun;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import jenkins.branch.BranchSource;
import jenkins.model.Jenkins;
import jenkins.plugins.git.GitSCMSource;
Expand All @@ -42,21 +53,6 @@
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.Issue;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import static io.jenkins.blueocean.rest.impl.pipeline.PipelineStepImpl.PARAMETERS_ELEMENT;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.*;
Expand Down Expand Up @@ -2846,7 +2842,7 @@ public void encodedStepDescription() throws Exception {
resp = get("/organizations/jenkins/pipelines/p/pipelines/master/runs/"+b1.getId()+"/steps/", List.class);
Assert.assertEquals(2, resp.size());

assertEquals("General SCM", resp.get(0).get("displayName"));
assertNotNull(resp.get(0).get("displayName"));

assertEquals("Shell Script", resp.get(1).get("displayName"));
assertEquals("echo \"\u001B[32m some text \u001B[0m\"", resp.get(1).get("displayDescription"));
Expand Down
20 changes: 10 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<jacoco.missedclass.coverage>0.00</jacoco.missedclass.coverage>
<hpi.dependencyResolution>runtime</hpi.dependencyResolution>
<jenkins-test-harness.version>2.38</jenkins-test-harness.version>
<scm-api.version>2.2.7</scm-api.version>
<scm-api.version>2.2.8</scm-api.version>
<git.version>3.8.0</git.version>
<access-modifier-checker.failOnError>true</access-modifier-checker.failOnError>
</properties>
Expand Down Expand Up @@ -342,17 +342,17 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.54</version>
<version>2.58</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
<version>2.29</version>
<version>2.30</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.25</version>
<version>2.26</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -372,28 +372,28 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<version>2.21</version>
<version>2.22</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>2.20</version>
<version>2.21</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>2.20</version>
<version>2.21</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>2.10</version>
<version>2.11</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-scm-step</artifactId>
<version>2.6</version>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -591,7 +591,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.14</version>
<version>1.17</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down