Skip to content

Commit

Permalink
Merge release branch into master branch [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
Nubisproject (Mozilla) committed Apr 6, 2018
2 parents 888265d + 3a95ee1 commit bffd654
Show file tree
Hide file tree
Showing 19 changed files with 3,572 additions and 74 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

26 changes: 12 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
sudo: required

language: ruby
sudo: false
gemfile: nubis/travis/Gemfile
branches:
except:
- master
cache:
bundler: true
pip: true
directories:
- "${HOME}/bin"
- nubis/librarian-puppet

services:
- docker

before_install:
- docker pull nubisproject/nubis-travis:master

script:
- nubis/travis/run-checks
- nubis/travis/run-builds
- docker run --mount type=bind,source="$(pwd)",target=/nubis/files nubisproject/nubis-travis:master

notifications:
slack:
secure: Bgu42ldHdcCPJ1pJ0YplS5N3xwU3iS7gbsrJzRMQzBrj3nXYICqLUNFNwClAwUft3CMFHiofV/Y59X2E7likGXB8XX6J8FteL7mEqGifg8ucxrVtNGjztITnxke6XiFq2FC2bjld/RYX0d+eo2ZlkJbwWgLeHFjC+GHmaNLZfy8=
secure: SwTS8rFQUt3LV/dyH6sX22ZEaqyj2IZfiPagLIGEuoyJ/LGBv8HqKFx1GDq/nUtSbvbVaxFjOuiGaYeTHfO0y8pOOBqG+2SWkvAdT3O/NiQjFio1BlOxYeiYA6Zs4t6ZQ+k6pytbFkpISYvkX2fQxTcY5XnzlMl/S9Am8CdMVEo=
28 changes: 23 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
# Change Log

## [v2.1.0](https://github.com/nubisproject/nubis-base/tree/v2.1.0) (2018-02-07)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.1.0...v2.1.0)
## [v2.2.0](https://github.com/nubisproject/nubis-base/tree/v2.2.0) (2018-04-06)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.1.0...v2.2.0)

**Closed issues:**

- Create a swap partition on boot [\#778](https://github.com/nubisproject/nubis-base/issues/778)
- \[nubis-cron\] Capture output and ship to ES [\#796](https://github.com/nubisproject/nubis-base/issues/796)
- \[taint\] Issues aws ec2 terminate-instance call on taint reaping [\#793](https://github.com/nubisproject/nubis-base/issues/793)
- \[taint\] Allow disabling of auto-tainting for certain special automation users [\#791](https://github.com/nubisproject/nubis-base/issues/791)
- \[puppet\] Upgrade to nubis-nubis\_configuration 1.3.4 [\#786](https://github.com/nubisproject/nubis-base/issues/786)
- \[puppet\] Upgrade to nubis-puppet-apache 0.1.15 [\#784](https://github.com/nubisproject/nubis-base/issues/784)
- Update nubis-travis to v1.5.0 [\#759](https://github.com/nubisproject/nubis-base/issues/759)
- \[node\_exporter\] Expose a platform tag [\#585](https://github.com/nubisproject/nubis-base/issues/585)

**Merged pull requests:**

- Handle swap creation for instances at boot time [\#779](https://github.com/nubisproject/nubis-base/pull/779) ([gozer](https://github.com/gozer))
- Capture nubis-cron logs and ship them to ElasticSearch [\#797](https://github.com/nubisproject/nubis-base/pull/797) ([gozer](https://github.com/gozer))
- Allow system user to disable auto-tainting [\#795](https://github.com/nubisproject/nubis-base/pull/795) ([gozer](https://github.com/gozer))
- Try and use AWS APIs to gracefully terminate instances [\#794](https://github.com/nubisproject/nubis-base/pull/794) ([gozer](https://github.com/gozer))
- Upgrade nubis-puppet-configuration to 1.3.4 [\#792](https://github.com/nubisproject/nubis-base/pull/792) ([gozer](https://github.com/gozer))
- Update Slack integration token [\#790](https://github.com/nubisproject/nubis-base/pull/790) ([tinnightcap](https://github.com/tinnightcap))
- Expose platform label [\#789](https://github.com/nubisproject/nubis-base/pull/789) ([limed](https://github.com/limed))
- Migrate to travis docker checks [\#788](https://github.com/nubisproject/nubis-base/pull/788) ([tinnightcap](https://github.com/tinnightcap))
- Upgrade nubis-puppet-apache to 0.1.15 [\#785](https://github.com/nubisproject/nubis-base/pull/785) ([gozer](https://github.com/gozer))

## [v2.1.0](https://github.com/nubisproject/nubis-base/tree/v2.1.0) (2018-02-02)
## [v2.1.0](https://github.com/nubisproject/nubis-base/tree/v2.1.0) (2018-02-07)
[Full Changelog](https://github.com/nubisproject/nubis-base/compare/v2.0.4...v2.1.0)

**Implemented enhancements:**
Expand All @@ -20,12 +33,14 @@

**Closed issues:**

- Create a swap partition on boot [\#778](https://github.com/nubisproject/nubis-base/issues/778)
- Ensure nubis user \*always\* exists [\#771](https://github.com/nubisproject/nubis-base/issues/771)
- \[fluentd\] Upgrade to Fluentd 0.14 / td-agent 3.x [\#770](https://github.com/nubisproject/nubis-base/issues/770)
- \[prompt\] include environment, if available [\#769](https://github.com/nubisproject/nubis-base/issues/769)
- Upgrade puppet-storage to 1.2.5 [\#768](https://github.com/nubisproject/nubis-base/issues/768)
- Upgrade to nubis-puppet-nubis\_users 1.4.3 [\#766](https://github.com/nubisproject/nubis-base/issues/766)
- Disable firewalld for centos host [\#765](https://github.com/nubisproject/nubis-base/issues/765)
- Tag v2.1.0 release [\#780](https://github.com/nubisproject/nubis-base/issues/780)
- Tag v2.1.0 release [\#775](https://github.com/nubisproject/nubis-base/issues/775)
- \[node-collector\] Verify what data we are collecting [\#721](https://github.com/nubisproject/nubis-base/issues/721)
- \[node-exporter\] Upgrade node-exporter to v0.15.0 [\#720](https://github.com/nubisproject/nubis-base/issues/720)
Expand All @@ -35,6 +50,9 @@

**Merged pull requests:**

- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#782](https://github.com/nubisproject/nubis-base/pull/782) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#781](https://github.com/nubisproject/nubis-base/pull/781) ([nubis-automation](https://github.com/nubis-automation))
- Handle swap creation for instances at boot time [\#779](https://github.com/nubisproject/nubis-base/pull/779) ([gozer](https://github.com/gozer))
- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#777](https://github.com/nubisproject/nubis-base/pull/777) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#776](https://github.com/nubisproject/nubis-base/pull/776) ([nubis-automation](https://github.com/nubis-automation))
- Final small update to using '@type' instead of the deprecated 'type' [\#774](https://github.com/nubisproject/nubis-base/pull/774) ([gozer](https://github.com/gozer))
Expand Down
4 changes: 2 additions & 2 deletions nubis/Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ mod 'srf/fluentd',
# Nubis
mod 'nubis/nubis_apache',
:git => 'https://github.com/nubisproject/nubis-puppet-apache.git',
:ref => 'v0.1.14'
:ref => 'v0.1.15'

mod 'nubis/consul_do',
:git => 'https://github.com/nubisproject/nubis-puppet-consul_do.git',
Expand All @@ -83,7 +83,7 @@ mod 'nubis/nubis_discovery',

mod 'nubis/nubis_configuration',
:git => 'https://github.com/nubisproject/nubis-puppet-configuration.git',
:ref => 'v1.3.3'
:ref => 'v1.3.4'

mod 'nubis/nubis_storage',
:git => 'https://github.com/nubisproject/nubis-puppet-storage.git',
Expand Down
21 changes: 21 additions & 0 deletions nubis/builder/artifacts/v2.2.0/AMIs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"builds": [
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1523032285,
"files": null,
"artifact_id": "ap-northeast-1:ami-5d213721,ap-northeast-2:ami-e9339c87,ap-southeast-1:ami-2d725651,ap-southeast-2:ami-b3428cd1,eu-central-1:ami-90b3ed7b,eu-west-1:ami-86b0e9ff,sa-east-1:ami-1da2f471,us-east-1:ami-8c4ae3f1,us-west-1:ami-a7c8d8c7,us-west-2:ami-5b177123",
"packer_run_uuid": "55d8fc68-e95f-dff5-93c2-6a1de1e60e19"
},
{
"name": "amazon-ebs-centos",
"builder_type": "amazon-ebs",
"build_time": 1523032707,
"files": null,
"artifact_id": "ap-northeast-1:ami-862031fa,ap-northeast-2:ami-a4329dca,ap-southeast-1:ami-f073578c,ap-southeast-2:ami-aa438dc8,eu-central-1:ami-aeb2ec45,eu-west-1:ami-adb0e9d4,sa-east-1:ami-56a3f53a,us-east-1:ami-d241e8af,us-west-1:ami-12c8d872,us-west-2:ami-f517718d",
"packer_run_uuid": "55d8fc68-e95f-dff5-93c2-6a1de1e60e19"
}
],
"last_run_uuid": "55d8fc68-e95f-dff5-93c2-6a1de1e60e19"
}
Loading

0 comments on commit bffd654

Please sign in to comment.