Merge release branch into master branch [skip ci]

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v2.2.0](https://github.com/nubisproject/nubis-ci/tree/v2.2.0) (2018-04-10)
+[Full Changelog](https://github.com/nubisproject/nubis-ci/compare/v2.2.0...v2.2.0)
+
+**Closed issues:**
+
+- \[regression\] Invalid /opt/nubis-builder/secrets/variables.json [\#603](https://github.com/nubisproject/nubis-ci/issues/603)
+
+**Merged pull requests:**
+
+- Correctly and carefully build our region array [\#604](https://github.com/nubisproject/nubis-ci/pull/604) ([gozer](https://github.com/gozer))
+
 ## [v2.2.0](https://github.com/nubisproject/nubis-ci/tree/v2.2.0) (2018-04-06)
 [Full Changelog](https://github.com/nubisproject/nubis-ci/compare/v2.1.0...v2.2.0)
 
@@ -14,9 +25,12 @@
 - \[jenkins\] Upgrade to 2.89.4 [\#580](https://github.com/nubisproject/nubis-ci/issues/580)
 - \[s3cmd\] Upgrade to 2.0.1 [\#578](https://github.com/nubisproject/nubis-ci/issues/578)
 - \[iam\] Cleanup Policy errors [\#576](https://github.com/nubisproject/nubis-ci/issues/576)
+- Tag v2.2.0 release [\#599](https://github.com/nubisproject/nubis-ci/issues/599)
 
 **Merged pull requests:**
 
+- Update CHANGELOG for v2.2.0 release \[skip ci\] [\#601](https://github.com/nubisproject/nubis-ci/pull/601) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.2.0 release \[skip ci\] [\#600](https://github.com/nubisproject/nubis-ci/pull/600) ([nubis-automation](https://github.com/nubis-automation))
 - Upgrade Jenkins and plugins to latest [\#598](https://github.com/nubisproject/nubis-ci/pull/598) ([gozer](https://github.com/gozer))
 - Prep for TF 0.11.x [\#596](https://github.com/nubisproject/nubis-ci/pull/596) ([gozer](https://github.com/gozer))
 - Also add the associated ec2:DisassociateAddress permission [\#594](https://github.com/nubisproject/nubis-ci/pull/594) ([gozer](https://github.com/gozer))

nubis/bin/jenkins-startup.sh

@@ -74,8 +74,11 @@ perl -pi -e "s[%%NUBIS_GIT_REPO%%][$NUBIS_GIT_REPO]g" "/var/lib/jenkins/jobs/00-
 # Discover available regions
 # All regions according to AWS (US only), with our own first
 
-# XXX: packer doesn't support us-east-2 yet
-REGIONS="($AWS_REGION $(aws --region "$AWS_REGION" ec2 describe-regions | jq -r '.Regions[] | .RegionName' | grep -E "^us-" | grep -v "$AWS_REGION" | grep -v us-east-2 | sort))"
+# Start with our region
+REGIONS=("$AWS_REGION")
+
+# Add all other regions at the end of the arrau
+mapfile -O1 -t REGIONS <<< "$(aws --region "$AWS_REGION" ec2 describe-regions | jq -r '.Regions[] | .RegionName' | grep -E "^us-" | grep -v "$AWS_REGION" | grep -v us-east-2 | sort)"
 
 # build a XML chunk
 for region in ${REGIONS[*]}; do

nubis/builder/artifacts/v2.2.0/v2.2.0/AMIs.json

@@ -0,0 +1,21 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1523034190,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-8a2233f6,ap-northeast-2:ami-e3319e8d,ap-southeast-1:ami-de7c58a2,ap-southeast-2:ami-655e9007,eu-central-1:ami-6fb1ef84,eu-west-1:ami-2cb2eb55,sa-east-1:ami-a3a2f4cf,us-east-1:ami-0e45ec73,us-west-1:ami-23c9d943,us-west-2:ami-fa157382",
+      "packer_run_uuid": "c15e3f70-00db-d3f7-739a-90f923c02eb6"
+    },
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1523385296,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-bef1e3c2,ap-northeast-2:ami-d5f658bb,ap-southeast-1:ami-fd785e81,ap-southeast-2:ami-c122eba3,eu-central-1:ami-f0356d1b,eu-west-1:ami-e9762f90,sa-east-1:ami-955504f9,us-east-1:ami-e3a6789c,us-west-1:ami-b7190ad7,us-west-2:ami-f475158c",
+      "packer_run_uuid": "987cebc8-5c1d-851a-b20f-3cc3ab76bb18"
+    }
+  ],
+  "last_run_uuid": "987cebc8-5c1d-851a-b20f-3cc3ab76bb18"
+}