Make sure gradle check agent only runs once (#159)

* Make sure gradle check agent only runs once Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove defaults value Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Jul 20, 2022 · 8381638 · 8381638
1 parent eeaf866
commit 8381638
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/compute/agent-node-config.ts b/lib/compute/agent-node-config.ts
@@ -22,6 +22,7 @@ export interface AgentNodeProps {
    instanceType: string;
    workerLabelString: string;
    remoteUser: string;
+   maxTotalUses: number;
    numExecutors: number;
    initScript: string
  }
@@ -167,7 +168,7 @@ export class AgentNodeConfig {
        initScript: config.initScript,
        labelString: config.workerLabelString,
        launchTimeoutStr: '300',
-       maxTotalUses: -1,
+       maxTotalUses: config.maxTotalUses,
        minimumNumberOfInstances: 0,
        minimumNumberOfSpareInstances: 1,
        mode: 'EXCLUSIVE',

diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts
@@ -29,6 +29,7 @@ export class AgentNodes {
         workerLabelString: 'Jenkins-Agent-al2-x64-c54xlarge-Single-Host',
         instanceType: 'C54xlarge',
         remoteUser: 'ec2-user',
+        maxTotalUses: -1,
         numExecutors: 1,
         amiId: 'ami-00a07e55fcad01043',
         initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum/* && sudo yum repolist &&'
@@ -38,6 +39,7 @@ export class AgentNodes {
         workerLabelString: 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host',
         instanceType: 'C54xlarge',
         remoteUser: 'ec2-user',
+        maxTotalUses: -1,
         numExecutors: 8,
         amiId: 'ami-00a07e55fcad01043',
         initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum/* && sudo yum repolist &&'
@@ -47,6 +49,7 @@ export class AgentNodes {
         workerLabelString: 'Jenkins-Agent-al2-x64-m52xlarge-Docker-Host-Perf-Test',
         instanceType: 'M52xlarge',
         remoteUser: 'ec2-user',
+        maxTotalUses: -1,
         numExecutors: 8,
         amiId: 'ami-00a07e55fcad01043',
         initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum/* && sudo yum repolist &&'
@@ -56,6 +59,7 @@ export class AgentNodes {
         workerLabelString: 'Jenkins-Agent-al2-arm64-c6g4xlarge-Single-Host',
         instanceType: 'C6g4xlarge',
         remoteUser: 'ec2-user',
+        maxTotalUses: -1,
         numExecutors: 1,
         amiId: 'ami-020c52efb1a60f1ae',
         initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum/* && sudo yum repolist &&'
@@ -65,6 +69,7 @@ export class AgentNodes {
         workerLabelString: 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host',
         instanceType: 'C6g4xlarge',
         remoteUser: 'ec2-user',
+        maxTotalUses: -1,
         numExecutors: 8,
         amiId: 'ami-020c52efb1a60f1ae',
         initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum/* && sudo yum repolist &&'
@@ -74,6 +79,7 @@ export class AgentNodes {
         workerLabelString: 'Jenkins-Agent-Ubuntu2004-X64-c524xlarge-Single-Host',
         instanceType: 'C524xlarge',
         remoteUser: 'ubuntu',
+        maxTotalUses: 1,
         numExecutors: 1,
         amiId: 'ami-0f6ceb3b3687a3fba',
         initScript: 'sudo apt-mark hold docker docker.io openssh-server && docker ps &&'
@@ -83,6 +89,7 @@ export class AgentNodes {
         workerLabelString: 'Jenkins-Agent-Ubuntu2004-X64-m52xlarge-Docker-Builder',
         instanceType: 'M52xlarge',
         remoteUser: 'ubuntu',
+        maxTotalUses: -1,
         numExecutors: 1,
         amiId: 'ami-0f6ceb3b3687a3fba',
         initScript: 'sudo apt-mark hold docker docker.io openssh-server && docker ps &&'