Merge release branch into master branch [skip ci]

nubisproject · Apr 6, 2018 · 8d72201 · 8d72201
2 parents 35ee190 + aa10398
commit 8d72201
Show file tree

Hide file tree

Showing 11 changed files with 3,533 additions and 26 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.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: fIUCBmAoL7bo438WcNXXBdepSyUnoYpk+VTdz1HOlgkkmAF2eBAqRcIoauJKIerz07Az5YqJf5066xvcxuQhislRJciiZG0Ian97zgYbcKQYvf7QmyacNQYGo12c6S7/s3VU36tbj4qY/ntcoVKY67haE0r7WVueIMyba8r1n8G8OwR4GINzYaVsyBVqmo1cPzHtmoW+Xxp1DAEXika+a80KcKVzsMxJANkjhWRqvo5zB+y15IPqhLDnt8AgUuHFiMYH3o25OB0BxyFQZJnWjQz730e7wIR1Y2dkH16yJWPDB7aNNbahHtChlDe19uFgrC9/DHaqdAE7E7pUu+ks8DxgOPuooipOtUrlryiX0bYtbpECY3EnS4V1NpmZDpofWwGPcnLYhGI3FWiCZdKrngVtYSaADnUmNlgl5GfJkkUvruqkDwObV1lRNCQgZfV16dmIYSeMSG6TPAneMQEuIyOP6WqzuU+FMIY3BcQh1qRVGB6r0oonsrHCWGLcp5WjM2cFhROzDsIz/5Egy97MynK5aqkRGnFz2hC+2cP/JyS8oCKofOR3DHLI038S+ifekt8NNOeV5FTZ01DJ9NHmQQBh49SHq3AjQCFM8RUn15UhMSKnJPwi+nLglAxpb30RAPZ6mDdLUla20OCgu2KZ3FEZE3NrK4t6njQXfDAv3XI=

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,28 @@
 # Change Log
 
-## [v2.1.0](https://github.com/nubisproject/nubis-skel/tree/v2.1.0) (2018-02-03)
+## [v2.2.0](https://github.com/nubisproject/nubis-skel/tree/v2.2.0) (2018-04-06)
+[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v2.1.0...v2.2.0)
+
+**Merged pull requests:**
+
+- Small lint check fixups [\#148](https://github.com/nubisproject/nubis-skel/pull/148) ([tinnightcap](https://github.com/tinnightcap))
+- Remove old travis submodule [\#147](https://github.com/nubisproject/nubis-skel/pull/147) ([tinnightcap](https://github.com/tinnightcap))
+- Remove debug from build [\#146](https://github.com/nubisproject/nubis-skel/pull/146) ([tinnightcap](https://github.com/tinnightcap))
+- Migrate to using the nubis-travis Docker image [\#145](https://github.com/nubisproject/nubis-skel/pull/145) ([tinnightcap](https://github.com/tinnightcap))
+
+## [v2.1.0](https://github.com/nubisproject/nubis-skel/tree/v2.1.0) (2018-02-07)
 [Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v2.0.4...v2.1.0)
 
 **Closed issues:**
 
+- Tag v2.1.0 release [\#142](https://github.com/nubisproject/nubis-skel/issues/142)
 - Tag v2.1.0 release [\#139](https://github.com/nubisproject/nubis-skel/issues/139)
 - Update docs to reflect new container style [\#118](https://github.com/nubisproject/nubis-skel/issues/118)
 
 **Merged pull requests:**
 
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#144](https://github.com/nubisproject/nubis-skel/pull/144) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#143](https://github.com/nubisproject/nubis-skel/pull/143) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.1.0 release \[skip ci\] [\#141](https://github.com/nubisproject/nubis-skel/pull/141) ([nubis-automation](https://github.com/nubis-automation))
 - Update CHANGELOG for v2.1.0 release \[skip ci\] [\#140](https://github.com/nubisproject/nubis-skel/pull/140) ([nubis-automation](https://github.com/nubis-automation))
 

diff --git a/nubis/builder/artifacts/v2.2.0_0e29326ba7d4e4677b37e50179975a64ed4877fd/AMIs.json b/nubis/builder/artifacts/v2.2.0_0e29326ba7d4e4677b37e50179975a64ed4877fd/AMIs.json
@@ -0,0 +1,21 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1523040815,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-c6f3e2ba,ap-northeast-2:ami-040ea16a,ap-southeast-1:ami-894367f5,ap-southeast-2:ami-075b9565,eu-central-1:ami-a2a7f949,eu-west-1:ami-37bae34e,sa-east-1:ami-62a0f60e,us-east-1:ami-3220894f,us-west-1:ami-94cfdff4,us-west-2:ami-151a7c6d",
+      "packer_run_uuid": "7db2c3e5-54af-282b-8600-af85eecaa15b"
+    },
+    {
+      "name": "amazon-ebs-centos",
+      "builder_type": "amazon-ebs",
+      "build_time": 1523040872,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-272c3a5b,ap-northeast-2:ami-96319ef8,ap-southeast-1:ami-3c4d6940,ap-southeast-2:ami-e15d9383,eu-central-1:ami-9ea4fa75,eu-west-1:ami-96acf5ef,sa-east-1:ami-ada3f5c1,us-east-1:ami-6721881a,us-west-1:ami-d8cdddb8,us-west-2:ami-f9187e81",
+      "packer_run_uuid": "7db2c3e5-54af-282b-8600-af85eecaa15b"
+    }
+  ],
+  "last_run_uuid": "7db2c3e5-54af-282b-8600-af85eecaa15b"
+}