Merge pull request #79 from neiman-marcus/#77-Jenkins-2.346.3-Java-11

Bumped version of Jenkins to 2.346.3
neiman-marcus · Aug 16, 2022 · 86387b4 · 86387b4
2 parents a25764d + e8c4af3
commit 86387b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/init/agent-runcmd.cfg b/init/agent-runcmd.cfg
@@ -1,9 +1,9 @@
 #cloud-config
 
 runcmd:
-  - amazon-linux-extras enable corretto8 docker=18.06.1
+  - amazon-linux-extras enable docker=18.06.1
   - yum clean metadata
-  - yum install -y docker git java-1.8.0-amazon-corretto-devel python3-pip jq nfs-utils awslogs tree
+  - yum install -y docker git java-11-amazon-corretto.x86_64 python3-pip jq nfs-utils awslogs tree
   - mv /bin/pip /bin/pip2 && cp /bin/pip3 /bin/pip
   - cp /etc/awslogs/awscli.conf.desired /etc/awslogs/awscli.conf
   - systemctl enable awslogsd

diff --git a/init/master-runcmd.cfg b/init/master-runcmd.cfg
@@ -1,9 +1,9 @@
 #cloud-config
 
 runcmd:
-  - amazon-linux-extras enable corretto8 docker=18.06.1
+  - amazon-linux-extras enable docker=18.06.1
   - yum clean metadata
-  - yum install -y docker git java-1.8.0-amazon-corretto-devel python3-pip jq nfs-utils awslogs tree
+  - yum install -y docker git java-11-amazon-corretto.x86_64 python3-pip jq nfs-utils awslogs tree
   - mv /bin/pip /bin/pip2 && cp /bin/pip3 /bin/pip
   - cp /etc/awslogs/awscli.conf.desired /etc/awslogs/awscli.conf
   - systemctl enable awslogsd

diff --git a/variables.tf b/variables.tf
@@ -130,7 +130,7 @@ variable "instance_type" {
 variable "jenkins_version" {
   description = "The version number of Jenkins to use on the master. Change this value when a new version comes out, and it will update the launch configuration and the autoscaling group."
   type        = string
-  default     = "2.346.1"
+  default     = "2.346.3"
 }
 
 variable "key_name" {
@@ -202,7 +202,7 @@ variable "ssm_parameter" {
 variable "swarm_version" {
   description = "The version of swarm plugin to install on the agents. Update by updating this value."
   type        = string
-  default     = "3.33"
+  default     = "3.34"
 }
 
 variable "tags" {