Skip to content
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

Jump to bottom

[JENKINS-58290] Verifying ContainerExecDecorator scalability #522

Merged
merged 10 commits into from
Jul 6, 2019
Merged

[JENKINS-58290] Verifying ContainerExecDecorator scalability #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
906dabf
Demonstrating effect of ContainerExecDecorator at scale.
jglick Jun 27, 2019
7627420
Merge branch 'master' into websocket
jglick Jun 27, 2019
2fc9cd0
Capturing desired behavior in automated test.
jglick Jul 1, 2019
02ae57a
Merge branch 'master' into websocket
jglick Jul 1, 2019
f825673
Better logging.
jglick Jul 1, 2019
061e0a5
Make tests run faster by overriding hudson.slaves.NodeProvisioner.rec…
jglick Jul 1, 2019
357e400
Pulling in fix.
jglick Jul 1, 2019
2ff4263
Merge branch 'master' into websocket
jglick Jul 2, 2019
5e30c24
Forgot to use $NAME!
jglick Jul 2, 2019
dfdee19
durable-task 1.30
jglick Jul 5, 2019
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
8 changes: 5 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.46</version>
<version>3.47</version>
<relativePath />
</parent>

<groupId>org.csanchez.jenkins.plugins</groupId>
Expand Down Expand Up @@ -94,10 +95,10 @@
<version>6.8</version>
</dependency>

<dependency> <!-- OnceRetentionStrategy -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>durable-task</artifactId>
<version>1.29</version>
<version>1.30</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -306,6 +307,7 @@
<configuration>
<systemPropertyVariables>
<hudson.slaves.NodeProvisioner.initialDelay>0</hudson.slaves.NodeProvisioner.initialDelay>
<hudson.slaves.NodeProvisioner.recurrencePeriod>1000</hudson.slaves.NodeProvisioner.recurrencePeriod>
<!-- listen in this interface for connections from kubernetes pods -->
<connectorHost>${connectorHost}</connectorHost>
<!-- have pods connect to this address for Jenkins -->
Expand Down
16 changes: 15 additions & 1 deletion .../org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorPipelineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@
import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
import org.jenkinsci.plugins.durabletask.BourneShellScript;

public class ContainerExecDecoratorPipelineTest extends AbstractKubernetesPipelineTest {

@Rule
public LoggerRule containerExecLogs = new LoggerRule()
.record(Logger.getLogger(ContainerExecDecorator.class.getName()), Level.ALL);
.record(Logger.getLogger(ContainerExecDecorator.class.getName()), Level.ALL)
.record(BourneShellScript.class, Level.ALL);

@Issue({ "JENKINS-47225", "JENKINS-42582" })
@Test
Expand Down Expand Up @@ -77,4 +79,16 @@ public void docker() throws Exception {
assertFalse("credential leaked to log",
containerExecLogs.getMessages().stream().anyMatch(msg -> msg.contains("secret_password")));
}

@Issue("JENKINS-58290")
@Test
public void websocket() throws Exception {
assertNotNull(createJobThenScheduleRun());
containerExecLogs.capture(1000);
r.waitForMessage("have started user process", b);
assertTrue("WebSocket was closed in a timely fashion", containerExecLogs.getMessages().stream().anyMatch(m -> m.startsWith("onClose : ")));
b.getExecutor().interrupt();
r.waitForCompletion(b);
}

}
9 changes: 9 additions & 0 deletions src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/websocket.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
podTemplate(label: '$NAME', containers: [
containerTemplate(name: 'busybox', image: 'busybox', ttyEnabled: true, command: '/bin/cat'),
]) {
node('$NAME') {
container('busybox') {
sh 'sleep 5; echo have started user process; sleep 999'
}
}
}