fixed bug with agents that disappeared

ddepaoli3 · Oct 4, 2016 · 5f3f179 · 5f3f179
1 parent 594a85f
commit 5f3f179
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/jenkins/files/lifecycle-poller/worker.rb b/jenkins/files/lifecycle-poller/worker.rb
@@ -48,6 +48,8 @@ def isAgentIdle(agent)
       $log.error "unexpected body: #{res.body}"
       return false
     end
+  elsif res.code == '404'
+    return true
   else
     $log.error "unexpected response code: #{res.code}"
     return false

diff --git a/jenkins/jenkins2-ha-agents.json b/jenkins/jenkins2-ha-agents.json
@@ -716,7 +716,7 @@
                   "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/opt/aws/bin", "\n",
                   "MAILTO=root", "\n",
                   "HOME=/", "\n",
-                  "* * * * * root aws --region ", {"Ref": "AWS::Region"}, " cloudwatch put-metric-data --namespace ", {"Ref": "AWS::StackName"}, " --metric-name BuildQueue --value $(curl curl -s -u 'admin:", {"Ref": "MasterAdminPassword"}, "' 'http://@localhost:8080/queue/api/xml' | grep -o '<item' | wc -l) --unit Count", "\n"
+                  "* * * * * root aws --region ", {"Ref": "AWS::Region"}, " cloudwatch put-metric-data --namespace ", {"Ref": "AWS::StackName"}, " --metric-name BuildQueue --value $(curl -s -u 'admin:", {"Ref": "MasterAdminPassword"}, "' 'http://@localhost:8080/queue/api/xml' | grep -o '<item' | wc -l) --unit Count", "\n"
                 ]]},
                 "mode": "000600",
                 "owner": "root",