The timeout can be overridden individually.
15 | *
16 | * @see org.junit.jupiter.api.Timeout
17 | */
18 | @Target({ElementType.TYPE, ElementType.METHOD})
19 | @Retention(RetentionPolicy.RUNTIME)
20 | @Tag("integration")
21 | @Timeout(value = 3, unit = TimeUnit.MINUTES)
22 | public @interface IntegrationTest {}
23 |
--------------------------------------------------------------------------------
/src/main/java/org/jenkinsci/plugins/mesos/MesosRetentionStrategy.java:
--------------------------------------------------------------------------------
1 | package org.jenkinsci.plugins.mesos;
2 |
3 | import hudson.model.Descriptor;
4 | import hudson.slaves.CloudRetentionStrategy;
5 | import hudson.slaves.RetentionStrategy;
6 |
7 | /** A strategy to terminate idle {@link MesosComputer} */
8 | public class MesosRetentionStrategy extends CloudRetentionStrategy {
9 | /**
10 | * Constructs a new {@link hudson.slaves.CloudRetentionStrategy}.
11 | *
12 | * @param idleMinutes The number of minutes to wait before calling getNode().terminate() on an
13 | * idle {@link MesosComputer}
14 | */
15 | public MesosRetentionStrategy(int idleMinutes) {
16 | super(idleMinutes);
17 | }
18 |
19 | public static class DescriptorImpl extends Descriptor A singleton is required because we use in in validation code in {@link MesosCloud} and in
18 | * {@link MesosApi} instances.
19 | *
20 | * @param frameworkName The name of the framework that is used as a prefix.
21 | * @return The Metrics implementation for the framework.
22 | */
23 | public static synchronized com.mesosphere.usi.metrics.Metrics getInstance(String frameworkName) {
24 | final String prefix = sanitize(frameworkName);
25 | if (!metrics.containsKey(prefix)) {
26 | // Construct metrics
27 | MetricsSettings metricsSettings =
28 | new MetricsSettings(
29 | sanitize(frameworkName),
30 | HistorgramSettings.apply(
31 | HistorgramSettings.apply$default$1(),
32 | HistorgramSettings.apply$default$2(),
33 | HistorgramSettings.apply$default$3(),
34 | HistorgramSettings.apply$default$4(),
35 | HistorgramSettings.apply$default$5()),
36 | Option.empty(),
37 | Option.empty());
38 | metrics.put(
39 | prefix,
40 | new com.mesosphere.usi.metrics.dropwizard.DropwizardMetrics(
41 | metricsSettings, jenkins.metrics.api.Metrics.metricRegistry()));
42 | }
43 |
44 | return metrics.get(prefix);
45 | }
46 |
47 | /** @return a santized prefix for Dropwizard metrics. */
48 | public static String sanitize(String prefix) {
49 | return prefix.replaceAll("[^a-zA-Z0-9\\-\\.]", "-");
50 | }
51 | }
52 |
--------------------------------------------------------------------------------
/src/test/java/org/jenkinsci/plugins/mesos/api/LaunchCommandBuilderTest.java:
--------------------------------------------------------------------------------
1 | package org.jenkinsci.plugins.mesos.api;
2 |
3 | import static org.hamcrest.MatcherAssert.assertThat;
4 | import static org.hamcrest.Matchers.containsString;
5 | import static org.hamcrest.Matchers.not;
6 |
7 | import akka.actor.ActorSystem;
8 | import akka.stream.ActorMaterializer;
9 | import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
10 | import hudson.security.HudsonPrivateSecurityRealm;
11 | import jenkins.model.Jenkins;
12 | import org.jenkinsci.plugins.mesos.TestUtils;
13 | import org.junit.jupiter.api.Test;
14 | import org.junit.jupiter.api.extension.ExtendWith;
15 |
16 | @ExtendWith(TestUtils.JenkinsParameterResolver.class)
17 | public class LaunchCommandBuilderTest {
18 |
19 | static ActorSystem system = ActorSystem.create("mesos-scheduler-test");
20 | static ActorMaterializer materializer = ActorMaterializer.create(system);
21 |
22 | @Test
23 | public void testJnlpAgentCommandContainsSecret(TestUtils.JenkinsRule j) throws Exception {
24 | final String name = "jenkins-jnlp-security";
25 | LaunchCommandBuilder builder = new LaunchCommandBuilder().withName(name);
26 |
27 | // before enabling security shell command contains no secret param
28 | assertThat(builder.buildJnlpSecret(), not(containsString("-secret")));
29 |
30 | // This test requires a running Jenkins instances *and* at least one node.
31 | Jenkins instance = j.getInstance();
32 | if (instance == null) {
33 | throw new IllegalStateException("Jenkins is null");
34 | }
35 | HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(false);
36 | instance.setSecurityRealm(realm);
37 | FullControlOnceLoggedInAuthorizationStrategy strategy =
38 | new hudson.security.FullControlOnceLoggedInAuthorizationStrategy();
39 |
40 | strategy.setAllowAnonymousRead(false);
41 | instance.setAuthorizationStrategy(strategy);
42 | instance.save();
43 |
44 | // after enabling security shell command contains secret
45 | assertThat(builder.buildJnlpSecret(), containsString("-secret"));
46 | }
47 | }
48 |
--------------------------------------------------------------------------------
/dcos-testing/conf/jenkins/configuration.yaml:
--------------------------------------------------------------------------------
1 | jenkins:
2 | agentProtocols:
3 | - "JNLP4-connect"
4 | - "Ping"
5 | numExecutors: 0
6 | clouds:
7 | - mesos:
8 | agentUser: "${JENKINS_AGENT_USER:-root}"
9 | frameworkName: "${JENKINS_FRAMEWORK_NAME:-Jenkins Scheduler}"
10 | jenkinsURL: "http://${JENKINS_FRAMEWORK_NAME:-jenkins}.${MARATHON_NAME:-marathon}.mesos:${PORT0:-8080}"
11 | mesosAgentSpecTemplates:
12 | - label: "linux"
13 | agentAttributes: ""
14 | agentCommandStyle: Linux
15 | containerInfo:
16 | dockerForcePullImage: false
17 | dockerImage: "mesosphere/jenkins-dind:0.8.0"
18 | dockerPrivilegedMode: true
19 | isDind: true
20 | networking: HOST
21 | type: "DOCKER"
22 | cpus: "0.1"
23 | disk: "0.0"
24 | domainFilterModel: "home"
25 | idleTerminationMinutes: 3
26 | jnlpArgs: "-noReconnect"
27 | maxExecutors: 1
28 | mem: "512"
29 | minExecutors: 1
30 | mode: EXCLUSIVE
31 | - label: "windows"
32 | agentAttributes: "os:windows"
33 | agentCommandStyle: Windows
34 | containerInfo:
35 | dockerForcePullImage: false
36 | dockerImage: "mesosphere/jenkins-windows-node:latest"
37 | dockerPrivilegedMode: false
38 | isDind: false
39 | networking: BRIDGE
40 | type: "DOCKER"
41 | cpus: "1.0"
42 | disk: "0.0"
43 | domainFilterModel: "any"
44 | idleTerminationMinutes: 3
45 | jnlpArgs: "-noReconnect"
46 | maxExecutors: 1
47 | mem: "4096"
48 | minExecutors: 1
49 | mode: EXCLUSIVE
50 | mesosMasterUrl: "${JENKINS_MESOS_MASTER:-http://leader.mesos:5050}"
51 | role: "${JENKINS_AGENT_ROLE:-*}"
52 | unclassified:
53 | location:
54 | adminAddress: "address not configured yet Implementation of {@link NodeProvisioner.Strategy} which will provision a new node immediately
22 | * as a task enter the queue. In kubernetes, we don't really need to wait before provisioning a new
23 | * node, because kubernetes agents can be started and destroyed quickly
24 | *
25 | * @author runzexia
26 | */
27 | @Extension(ordinal = 100)
28 | public class NoDelayProvisionerStrategy extends NodeProvisioner.Strategy {
29 |
30 | private static final Logger logger = LoggerFactory.getLogger(MesosCloud.class);
31 |
32 | private static final boolean DISABLE_NODELAY_PROVISING =
33 | Boolean.valueOf(System.getProperty("io.jenkins.plugins.mesos.disableNoDelayProvisioning"));
34 |
35 | @Override
36 | public NodeProvisioner.StrategyDecision apply(NodeProvisioner.StrategyState strategyState) {
37 | if (DISABLE_NODELAY_PROVISING) {
38 | logger.info("Provisioning not complete, NoDelayProvisionerStrategy is disabled");
39 | return NodeProvisioner.StrategyDecision.CONSULT_REMAINING_STRATEGIES;
40 | }
41 |
42 | final Label label = strategyState.getLabel();
43 |
44 | LoadStatistics.LoadStatisticsSnapshot snapshot = strategyState.getSnapshot();
45 | int availableCapacity =
46 | snapshot.getAvailableExecutors() // live executors
47 | + snapshot.getConnectingExecutors() // executors present but not yet connected
48 | + strategyState
49 | .getPlannedCapacitySnapshot() // capacity added by previous strategies from previous
50 | // rounds
51 | + strategyState
52 | .getAdditionalPlannedCapacity(); // capacity added by previous strategies _this
53 | // round_
54 | int currentDemand = snapshot.getQueueLength();
55 | logger.info("Available capacity={}, currentDemand={}", availableCapacity, currentDemand);
56 | if (availableCapacity < currentDemand) {
57 | List This class should only be used by {@link org.jenkinsci.plugins.mesos.MesosApi}.
47 | */
48 | public class Session {
49 |
50 | private static final Logger logger = LoggerFactory.getLogger(Session.class);
51 |
52 | // Interface to USI.
53 | @Nonnull private final SourceQueueWithComplete
2 | The template uses either the {@link SimpleTaskInfoBuilder} or a custom {@link
40 | * ContainerInfoTaskInfoBuilder}.
41 | *
42 | * @param agentName The name of the Mesos task/Jenkins agent, {@link
43 | * LaunchCommandBuilder#withName(String)}.
44 | * @param requirements The resource requirements for a Jenkins agent.
45 | * @param shellCommand The shell command built by {@link LaunchCommandBuilder}.
46 | * @param role The Mesos role the Jenkins agent will assume.
47 | * @param fetchUris Artifacts that are fetched, eg the Jenkins agent.jar.
48 | * @param containerInfo Optional information for a Docker or Mesos container.
49 | * @return the new USI run template.
50 | */
51 | static RunTemplate newRunTemplate(
52 | String agentName,
53 | List This is basically a port of JenkinsScheduler.getContainerInfoBuilder from v1.1 of the
98 | * plugin.
99 | *
100 | * @param agentName The name of the Jenkins agent.
101 | * @param taskInfoBuilder The original {@link SimpleTaskInfoBuilder}.
102 | * @param containerInfo The additional container information.
103 | */
104 | public ContainerInfoTaskInfoBuilder(
105 | String agentName,
106 | TaskBuilder taskInfoBuilder,
107 | MesosAgentSpecTemplate.ContainerInfo containerInfo) {
108 | this.agentName = agentName;
109 | this.simpleTaskInfoBuilder = taskInfoBuilder;
110 | this.containerInfo = containerInfo;
111 | }
112 |
113 | @Override
114 | public Seq
34 |
6 |
7 |
67 |
68 |
61 |
3 |
4 |