Merge release branch into master branch [skip ci]

.travis.yml

@@ -1,19 +1,16 @@
+sudo: required
+
 language: ruby
-sudo: false
-gemfile: nubis/travis/Gemfile
-cache:
-  bundler: true
-  directories:
-  - "${HOME}/bin"
-  - nubis/librarian-puppet
-addons:
-  apt:
-    sources:
-    - debian-sid
-    packages:
-    - shellcheck
+
+services:
+  - docker
+
+before_install:
+  - docker pull nubisproject/nubis-travis:master
+
 script:
-- nubis/travis/run-checks
+  - docker run --mount type=bind,source="$(pwd)",target=/nubis/files nubisproject/nubis-travis:master
+
 notifications:
   slack:
     secure: GvNKLrsql6mgQPP1Gvwgd3IBvN2d+DKNGmFwhL9eiwWQncOlDZTNMnrG6+6D3sN1iTuvrUiWzefPGzRl+mBnO+63VhpWW0AOsjuVq1U+NPxUisbJMYukyN70uwMG8ZeT4BrUWLb4W3e7mtnoUwcH++pgsuwp45Kd7AKj32bB9KU=

CHANGELOG.md

@@ -1,6 +1,23 @@
 # Change Log
 
-## [v2.1.0](https://github.com/nubisproject/nubis-consul/tree/v2.1.0) (2018-02-02)
+## [v2.2.0](https://github.com/nubisproject/nubis-consul/tree/v2.2.0) (2018-04-06)
+[Full Changelog](https://github.com/nubisproject/nubis-consul/compare/v2.1.0...v2.2.0)
+
+**Closed issues:**
+
+- \[TF\] Cleanup for 0.11.x [\#358](https://github.com/nubisproject/nubis-consul/issues/358)
+- Tag project as platform [\#354](https://github.com/nubisproject/nubis-consul/issues/354)
+- Image search location [\#352](https://github.com/nubisproject/nubis-consul/issues/352)
+
+**Merged pull requests:**
+
+- Fix \#358 [\#359](https://github.com/nubisproject/nubis-consul/pull/359) ([gozer](https://github.com/gozer))
+- Tag this as a platform component [\#357](https://github.com/nubisproject/nubis-consul/pull/357) ([limed](https://github.com/limed))
+- Linting nubis-ci [\#356](https://github.com/nubisproject/nubis-consul/pull/356) ([limed](https://github.com/limed))
+- Point image search to nubis-terraform [\#353](https://github.com/nubisproject/nubis-consul/pull/353) ([limed](https://github.com/limed))
+- Update nubis-travis [\#351](https://github.com/nubisproject/nubis-consul/pull/351) ([tinnightcap](https://github.com/tinnightcap))
+
+## [v2.1.0](https://github.com/nubisproject/nubis-consul/tree/v2.1.0) (2018-02-07)
 [Full Changelog](https://github.com/nubisproject/nubis-consul/compare/v2.0.4...v2.1.0)
 
 **Implemented enhancements:**
@@ -9,11 +26,14 @@
 
 **Closed issues:**
 
+- Tag v2.1.0 release [\#348](https://github.com/nubisproject/nubis-consul/issues/348)
 - Tag v2.1.0 release [\#345](https://github.com/nubisproject/nubis-consul/issues/345)
 - Use a generated unique bucket name [\#81](https://github.com/nubisproject/nubis-consul/issues/81)
 
 **Merged pull requests:**
 
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#350](https://github.com/nubisproject/nubis-consul/pull/350) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#349](https://github.com/nubisproject/nubis-consul/pull/349) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.1.0 release \[skip ci\] [\#347](https://github.com/nubisproject/nubis-consul/pull/347) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.1.0 release \[skip ci\] [\#346](https://github.com/nubisproject/nubis-consul/pull/346) ([nubis-automation](https://github.com/nubis-automation))
 

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

@@ -0,0 +1,13 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1523033960,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-78223404,ap-northeast-2:ami-5e329d30,ap-southeast-1:ami-5673572a,ap-southeast-2:ami-1a5e9078,eu-central-1:ami-9db2ec76,eu-west-1:ami-12b2eb6b,sa-east-1:ami-0da2f461,us-east-1:ami-cd40e9b0,us-west-1:ami-4dc7d72d,us-west-2:ami-4214723a",
+      "packer_run_uuid": "db5cfcf9-13c9-3ad5-5014-f82b5442ee69"
+    }
+  ],
+  "last_run_uuid": "db5cfcf9-13c9-3ad5-5014-f82b5442ee69"
+}