Update worker port

buildfarm · Jun 5, 2020 · 64c8915 · 64c8915
1 parent d209f37
commit 64c8915
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.eightydegreeswest</groupId>
 	<artifactId>bfmgr</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<name>bfmgr</name>
 	<description>Buildfarm Manager</description>
 

diff --git a/src/main/resources/aws.json b/src/main/resources/aws.json
@@ -89,6 +89,11 @@
                   },
                   " -O shard-server.config\n",
                   "sed -e \"s/localhost:6379/$REDIS_ENDPOINT:6379/g\" shard-server.config > /var/lib/buildfarm-server/server.config\n",
+                  "wget https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/debian_amd64/amazon-ssm-agent.deb\n",
+                  "dpkg -i amazon-ssm-agent.deb\n",
+                  "status amazon-ssm-agent\n",
+                  "start amazon-ssm-agent\n",
+                  "status amazon-ssm-agent\n",
                   "yes | yum install docker\n",
                   "service docker start\n",
                   "usermod -a -G docker ec2-user\n",
@@ -109,8 +114,7 @@
                   {
                     "Ref":"ServerTag"
                   },
-                  " /var/lib/buildfarm-server/server.config -p 8980\n",
-                  "done\n"
+                  " /var/lib/buildfarm-server/server.config -p 8980\n"
                 ]
               ]
             }
@@ -173,7 +177,7 @@
                   "#!/bin/bash\n\n",
                   "mkdir -p /tmp/worker\n",
                   "#set worker public name\n",
-                  "PUBLIC_NAME=$(curl http://169.254.169.254/latest/meta-data/local-ipv4):8980\n",
+                  "PUBLIC_NAME=$(curl http://169.254.169.254/latest/meta-data/local-ipv4):8981\n",
                   "REDIS_ENDPOINT=",
                   {
                     "Fn::GetAtt":[
@@ -191,9 +195,6 @@
                   "sed -e \"s/localhost:6379/$REDIS_ENDPOINT:6379/g\" shard-worker.config > /var/lib/buildfarm-shard-worker/worker.config\n",
                   "#activate cloudwatch agent\n",
                   "rm /etc/init/amazon-cloudwatch-agent.override\n",
-                  "#install ssm\n",
-                  "mkdir /tmp/ssm\n",
-                  "cd /tmp/ssm\n",
                   "wget https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/debian_amd64/amazon-ssm-agent.deb\n",
                   "dpkg -i amazon-ssm-agent.deb\n",
                   "status amazon-ssm-agent\n",
@@ -219,8 +220,7 @@
                   {
                     "Ref":"WorkerTag"
                   },
-                  " /var/lib/buildfarm-shard-worker/worker.config --public_name=\"$PUBLIC_NAME\"\n",
-                  "done\n"
+                  " /var/lib/buildfarm-shard-worker/worker.config --public_name=\"$PUBLIC_NAME\"\n"
                 ]
               ]
             }

diff --git a/src/main/resources/bfmgr-aws.json b/src/main/resources/bfmgr-aws.json
@@ -119,6 +119,11 @@
                             [
                                 "#!/bin/bash\n\n",
                                 "yum install java -y\n",
+                                "wget https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/debian_amd64/amazon-ssm-agent.deb\n",
+                                "dpkg -i amazon-ssm-agent.deb\n",
+                                "status amazon-ssm-agent\n",
+                                "start amazon-ssm-agent\n",
+                                "status amazon-ssm-agent\n",
                                 "rel=", { "Ref": "ReleaseNumber" }, "\n",
                                 "wget -N https://github.com/80degreeswest/bfmgr/releases/download/$rel/bfmgr-$rel.jar\n",
                                 "mkdir /var/log/bfmgr && chmod 0777 /var/log/bfmgr\n",