fix(e2e): do not fail when there's 2 or more cfn stacks named exactly the same

mumoshu · mumoshu · commit 8c4030def92b · 2016-11-04T09:04:15.000+09:00
diff --git a/e2e/run b/e2e/run
@@ -132,6 +132,7 @@ conformance() {
   master_host=$(aws ec2 describe-instances --output json --query "Reservations[].Instances[]
     | [?Tags[?Key==\`aws:cloudformation:stack-name\`].Value|[0]==\`${KUBE_AWS_CLUSTER_NAME}\`]
     | [?Tags[?Key==\`aws:cloudformation:logical-id\`].Value|[0]==\`AutoScaleController\`][]
+    | [?State.Name==\`running\`][]
     | []" | jq -r 'map({InstanceId: .InstanceId, PublicIpAddress: .PublicIpAddress}) | first | .PublicIpAddress'
   )
 
@@ -146,6 +147,7 @@ conformance_result() {
   master_host=$(aws ec2 describe-instances --output json --query "Reservations[].Instances[]
     | [?Tags[?Key==\`aws:cloudformation:stack-name\`].Value|[0]==\`${KUBE_AWS_CLUSTER_NAME}\`]
     | [?Tags[?Key==\`aws:cloudformation:logical-id\`].Value|[0]==\`AutoScaleController\`][]
+    | [?State.Name==\`running\`][]
     | []" | jq -r 'map({InstanceId: .InstanceId, PublicIpAddress: .PublicIpAddress}) | first | .PublicIpAddress'
   )
 

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ conformance() {`
`132`	`132`	`master_host=$(aws ec2 describe-instances --output json --query "Reservations[].Instances[]`
`133`	`133`	\| [?Tags[?Key==\`aws:cloudformation:stack-name\`].Value\|[0]==\`${KUBE_AWS_CLUSTER_NAME}\`]
`134`	`134`	\| [?Tags[?Key==\`aws:cloudformation:logical-id\`].Value\|[0]==\`AutoScaleController\`][]
	`135`	+ \| [?State.Name==\`running\`][]
`135`	`136`	`\| []" \| jq -r 'map({InstanceId: .InstanceId, PublicIpAddress: .PublicIpAddress}) \| first \| .PublicIpAddress'`
`136`	`137`	`)`
`137`	`138`
`@@ -146,6 +147,7 @@ conformance_result() {`
`146`	`147`	`master_host=$(aws ec2 describe-instances --output json --query "Reservations[].Instances[]`
`147`	`148`	\| [?Tags[?Key==\`aws:cloudformation:stack-name\`].Value\|[0]==\`${KUBE_AWS_CLUSTER_NAME}\`]
`148`	`149`	\| [?Tags[?Key==\`aws:cloudformation:logical-id\`].Value\|[0]==\`AutoScaleController\`][]
	`150`	+ \| [?State.Name==\`running\`][]
`149`	`151`	`\| []" \| jq -r 'map({InstanceId: .InstanceId, PublicIpAddress: .PublicIpAddress}) \| first \| .PublicIpAddress'`
`150`	`152`	`)`
`151`	`153`