Added new jenkins agents and logging bug-fix

docker/plugins.txt

@@ -66,4 +66,5 @@ workflow-basic-steps
 workflow-step-api
 ws-cleanup
 job-import-plugin
-workflow-multibranch
+workflow-multibranch
+pipeline-utility-steps

lib/ci-stack.ts

@@ -96,7 +96,7 @@ export class CIStack extends Stack {
     const certificateArn = Secret.fromSecretCompleteArn(this, 'certificateArn', importedArnSecretBucketValue.toString());
     const listenerCertificate = ListenerCertificate.fromArn(certificateArn.secretValue.toString());
     const agentNode = new AgentNodes(this);
-    const agentNodes: AgentNodeProps[] = [agentNode.AL2_X64, agentNode.AL2_ARM64];
+    const agentNodes: AgentNodeProps[] = [agentNode.AL2_X64, agentNode.AL2_X64_DOCKER_1, agentNode.AL2_ARM64, agentNode.AL2_ARM64_DOCKER_1];
 
     const mainJenkinsNode = new JenkinsMainNode(this, {
       vpc,

lib/compute/agent-node-config.ts

@@ -147,7 +147,7 @@ export class AgentNodeConfig {
        associatePublicIp: false,
        connectBySSHProcess: false,
        connectionStrategy: 'PRIVATE_IP',
-       customDeviceMapping: '/dev/xvda=:100:true:::encrypted',
+       customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
        deleteRootOnTermination: true,
        description: `jenkinsAgentNode-${config.workerLabelString}`,
        ebsEncryptRootVolume: 'ENCRYPTED',
@@ -163,7 +163,7 @@ export class AgentNodeConfig {
        minimumNumberOfSpareInstances: 1,
        mode: 'EXCLUSIVE',
        monitoring: true,
-       numExecutors: 1,
+       numExecutors: 4,
        remoteAdmin: config.remoteUser,
        remoteFS: '/var/jenkins',
        securityGroups: props.agentNodeSecurityGroup,

lib/compute/agent-nodes.ts

@@ -16,8 +16,12 @@ export class AgentNodes {
     // Refer: https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/ec2/model/InstanceType.html for instance types
     readonly AL2_X64: AgentNodeProps;
 
+    readonly AL2_X64_DOCKER_1: AgentNodeProps;
+
     readonly AL2_ARM64: AgentNodeProps;
 
+    readonly AL2_ARM64_DOCKER_1: AgentNodeProps;
+
     constructor(stack: Stack) {
       this.AL2_X64 = {
         workerLabelString: 'AL2-X64',
@@ -31,6 +35,13 @@ export class AgentNodes {
         + ' sudo yum install -y java-1.8.0-openjdk cmake python3 python3-pip python3-devel && sudo yum groupinstall -y "Development Tools" &&'
         + ' sudo ln -sfn `which pip3` /usr/bin/pip && pip3 install pipenv && sudo ln -s ~/.local/bin/pipenv /usr/local/bin',
       };
+      this.AL2_X64_DOCKER_1 = {
+        workerLabelString: 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host',
+        instanceType: 'C54xlarge',
+        remoteUser: 'ec2-user',
+        amiId: 'ami-00a07e55fcad01043',
+        initScript: 'sudo yum update -y || sudo yum update -y',
+      };
       this.AL2_ARM64 = {
         workerLabelString: 'AL2-ARM64',
         instanceType: 'C6g4xlarge',
@@ -43,5 +54,12 @@ export class AgentNodes {
         + ' sudo yum install -y java-1.8.0-openjdk cmake python3 python3-pip python3-devel && sudo yum groupinstall -y "Development Tools" &&'
         + ' sudo ln -sfn `which pip3` /usr/bin/pip && pip3 install pipenv && sudo ln -s ~/.local/bin/pipenv /usr/local/bin',
       };
+      this.AL2_ARM64_DOCKER_1 = {
+        workerLabelString: 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host',
+        instanceType: 'C6g4xlarge',
+        remoteUser: 'ec2-user',
+        amiId: 'ami-020c52efb1a60f1ae',
+        initScript: 'sudo yum update -y || sudo yum update -y',
+      };
     }
 }