Skip to content

Fix deprecated positional inbound agent arguments #1361

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

Open
poweichen00 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deprecated positional inbound agent arguments #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/main/java/io/jenkins/docker/connector/DockerComputerJNLPConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ public String getDescription() {
}

private static final String DEFAULT_ENTRY_POINT_ARGUMENTS = "-url\n${" + ArgumentVariables.JenkinsUrl.getName()
+ "}\n${" + ArgumentVariables.Secret.getName() + "}\n${" + ArgumentVariables.NodeName.getName() + "}";
+ "}\n-secret\n${" + ArgumentVariables.Secret.getName() + "}\n-name\n${"
+ ArgumentVariables.NodeName.getName() + "}";

@Override
public void beforeContainerCreated(DockerAPI api, String workdir, CreateContainerCmd cmd)
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/io/jenkins/docker/connector/DockerComputerJNLPConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package io.jenkins.docker.connector;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

import com.nirima.jenkins.plugins.docker.DockerTemplate;
import com.nirima.jenkins.plugins.docker.DockerTemplateBase;
import hudson.Platform;
import java.net.URI;
import java.util.List;
import jenkins.model.JenkinsLocationConfiguration;
import org.junit.jupiter.api.Test;
import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
Expand All @@ -15,6 +17,13 @@
class DockerComputerJNLPConnectorTest extends DockerComputerConnectorTest {
private static final String JNLP_AGENT_IMAGE_IMAGENAME = "jenkins/inbound-agent";

@Test
void defaultEntryPointArgumentsUseNamedSecretAndAgentNameOptions() {
assertEquals(
List.of("-url", "${JENKINS_URL}", "-secret", "${JNLP_SECRET}", "-name", "${NODE_NAME}"),
new DockerComputerJNLPConnector.DescriptorImpl().getDefaultEntryPointArguments());
}

@Test
void connectAgentViaJNLP() throws Exception {
assumeTrue(DockerClientFactory.instance().isDockerAvailable());
Expand Down