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 Aug 7, 2018
2 parents 2f6d7ed + b11c5d0 commit 43a1773
Show file tree
Hide file tree
Showing 17 changed files with 2,370 additions and 102 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

**Merged pull requests:**

- Update to latest deploy container [\#689](https://github.com/nubisproject/nubis-ci/pull/689) ([tinnightcap](https://github.com/tinnightcap))
- Update to newest deploy image and fix delete path [\#693](https://github.com/nubisproject/nubis-ci/pull/693) ([tinnightcap](https://github.com/tinnightcap))

## [v2.3.0](https://github.com/nubisproject/nubis-ci/tree/v2.3.0) (2018-08-07)
[Full Changelog](https://github.com/nubisproject/nubis-ci/compare/v2.2.0...v2.3.0)
Expand Down Expand Up @@ -41,7 +41,7 @@
- \[backup\] Run full backups hourly, keeping incremental count low [\#608](https://github.com/nubisproject/nubis-ci/issues/608)
- Tag v2.2.0 release [\#605](https://github.com/nubisproject/nubis-ci/issues/605)
- S3 backups can be slow to initially restore from, increace ELB grace period [\#602](https://github.com/nubisproject/nubis-ci/issues/602)
- Tag project as a platform component [\#588](https://github.com/nubisproject/nubis-ci/issues/588)
- Tag v2.3.0 release [\#690](https://github.com/nubisproject/nubis-ci/issues/690)
- Tag v2.3.0 release [\#686](https://github.com/nubisproject/nubis-ci/issues/686)
- Tag v2.3.0 release [\#682](https://github.com/nubisproject/nubis-ci/issues/682)
- Tag v2.3.0 release [\#675](https://github.com/nubisproject/nubis-ci/issues/675)
Expand All @@ -53,6 +53,9 @@

**Merged pull requests:**

- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#692](https://github.com/nubisproject/nubis-ci/pull/692) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#691](https://github.com/nubisproject/nubis-ci/pull/691) ([nubis-automation](https://github.com/nubis-automation))
- Update to latest deploy container [\#689](https://github.com/nubisproject/nubis-ci/pull/689) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#688](https://github.com/nubisproject/nubis-ci/pull/688) ([nubis-automation](https://github.com/nubis-automation))
- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#687](https://github.com/nubisproject/nubis-ci/pull/687) ([nubis-automation](https://github.com/nubis-automation))
- Update to latest nubis-deploy image [\#685](https://github.com/nubisproject/nubis-ci/pull/685) ([tinnightcap](https://github.com/tinnightcap))
Expand Down
8 changes: 4 additions & 4 deletions nubis/builder/artifacts/v2.3.0/v2.3.0/AMIs.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1533670861,
"build_time": 1533674199,
"files": null,
"artifact_id": "ap-northeast-1:ami-70fd849d,ap-northeast-2:ami-04a6e746ae02321c6,ap-southeast-1:ami-09a32debfe7b66c57,ap-southeast-2:ami-c43d9da6,eu-central-1:ami-85434a6e,eu-west-1:ami-0719643011b56028d,sa-east-1:ami-06c91e6fa2dc2a94c,us-east-1:ami-31f6ed4e,us-west-1:ami-d37d92b0,us-west-2:ami-447b5d3c",
"packer_run_uuid": "2ecc88aa-a78c-7824-c79a-2db153faf00b"
"artifact_id": "ap-northeast-1:ami-64ea9389,ap-northeast-2:ami-026d25f3271a29f1e,ap-southeast-1:ami-004a3e78a545e1ea7,ap-southeast-2:ami-4104a423,eu-central-1:ami-0b424be0,eu-west-1:ami-097933f4e436bb014,sa-east-1:ami-0132c0b7c373406df,us-east-1:ami-c8edf6b7,us-west-1:ami-61789702,us-west-2:ami-814264f9",
"packer_run_uuid": "43347b55-5486-a302-4e0c-3c0788673420"
}
],
"last_run_uuid": "2ecc88aa-a78c-7824-c79a-2db153faf00b"
"last_run_uuid": "43347b55-5486-a302-4e0c-3c0788673420"
}
8 changes: 4 additions & 4 deletions nubis/builder/artifacts/v2.3.0/v2.3.0/v2.3.0/AMIs.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1533666236,
"build_time": 1533670861,
"files": null,
"artifact_id": "ap-northeast-1:ami-4df881a0,ap-northeast-2:ami-071aba23ba0017abf,ap-southeast-1:ami-0a8e2ce3992275203,ap-southeast-2:ami-d03e9eb2,eu-central-1:ami-324c45d9,eu-west-1:ami-010bac363a951f458,sa-east-1:ami-0d9310d1758b21d07,us-east-1:ami-35dcc74a,us-west-1:ami-e8618e8b,us-west-2:ami-1f7d5b67",
"packer_run_uuid": "0a3b508f-a490-8edb-2a92-657d628937cc"
"artifact_id": "ap-northeast-1:ami-70fd849d,ap-northeast-2:ami-04a6e746ae02321c6,ap-southeast-1:ami-09a32debfe7b66c57,ap-southeast-2:ami-c43d9da6,eu-central-1:ami-85434a6e,eu-west-1:ami-0719643011b56028d,sa-east-1:ami-06c91e6fa2dc2a94c,us-east-1:ami-31f6ed4e,us-west-1:ami-d37d92b0,us-west-2:ami-447b5d3c",
"packer_run_uuid": "2ecc88aa-a78c-7824-c79a-2db153faf00b"
}
],
"last_run_uuid": "0a3b508f-a490-8edb-2a92-657d628937cc"
"last_run_uuid": "2ecc88aa-a78c-7824-c79a-2db153faf00b"
}
8 changes: 4 additions & 4 deletions nubis/builder/artifacts/v2.3.0/v2.3.0/v2.3.0/v2.3.0/AMIs.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1533652050,
"build_time": 1533666236,
"files": null,
"artifact_id": "ap-northeast-1:ami-f3a2db1e,ap-northeast-2:ami-0be7162913df441e2,ap-southeast-1:ami-0fa0040b7abf22a59,ap-southeast-2:ami-8a3898e8,eu-central-1:ami-dcbdb337,eu-west-1:ami-0af1916a1ffb50ad7,sa-east-1:ami-062faf66e2b84daea,us-east-1:ami-df352ea0,us-west-1:ami-41668922,us-west-2:ami-2b644253",
"packer_run_uuid": "be492e95-f283-1ac3-fda8-4c5cb3a9b066"
"artifact_id": "ap-northeast-1:ami-4df881a0,ap-northeast-2:ami-071aba23ba0017abf,ap-southeast-1:ami-0a8e2ce3992275203,ap-southeast-2:ami-d03e9eb2,eu-central-1:ami-324c45d9,eu-west-1:ami-010bac363a951f458,sa-east-1:ami-0d9310d1758b21d07,us-east-1:ami-35dcc74a,us-west-1:ami-e8618e8b,us-west-2:ami-1f7d5b67",
"packer_run_uuid": "0a3b508f-a490-8edb-2a92-657d628937cc"
}
],
"last_run_uuid": "be492e95-f283-1ac3-fda8-4c5cb3a9b066"
"last_run_uuid": "0a3b508f-a490-8edb-2a92-657d628937cc"
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1533132913,
"build_time": 1533652050,
"files": null,
"artifact_id": "ap-northeast-1:ami-86d1a16b,ap-northeast-2:ami-0cf5f9c8123bf37bc,ap-southeast-1:ami-b2bffc58,ap-southeast-2:ami-954beaf7,eu-central-1:ami-e1929f0a,eu-west-1:ami-fcc92811,sa-east-1:ami-0ef72ebaefab4e99b,us-east-1:ami-6c6e7e13,us-west-1:ami-ab7599c8,us-west-2:ami-5b775223",
"packer_run_uuid": "82cbdb39-6c5e-be30-1459-7656152bee3b"
"artifact_id": "ap-northeast-1:ami-f3a2db1e,ap-northeast-2:ami-0be7162913df441e2,ap-southeast-1:ami-0fa0040b7abf22a59,ap-southeast-2:ami-8a3898e8,eu-central-1:ami-dcbdb337,eu-west-1:ami-0af1916a1ffb50ad7,sa-east-1:ami-062faf66e2b84daea,us-east-1:ami-df352ea0,us-west-1:ami-41668922,us-west-2:ami-2b644253",
"packer_run_uuid": "be492e95-f283-1ac3-fda8-4c5cb3a9b066"
}
],
"last_run_uuid": "82cbdb39-6c5e-be30-1459-7656152bee3b"
"last_run_uuid": "be492e95-f283-1ac3-fda8-4c5cb3a9b066"
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
ensure => '2.38.0',
}
package { 'boto3':
ensure => '1.7.67',
ensure => '1.7.71',
}
package { 'botocore':
ensure => '1.10.4',
Expand Down Expand Up @@ -395,10 +395,10 @@
ensure => '1:2.7.4-0ubuntu1.4',
}
package { 'gnupg':
ensure => '1.4.20-1ubuntu3.2',
ensure => '1.4.20-1ubuntu3.3',
}
package { 'gpgv':
ensure => '1.4.20-1ubuntu3.2',
ensure => '1.4.20-1ubuntu3.3',
}
package { 'grep':
ensure => '2.25-1~16.04.1',
Expand Down Expand Up @@ -821,10 +821,10 @@
ensure => '18.0.5-0ubuntu0~16.04.1',
}
package { 'libglib2.0-0':
ensure => '2.48.2-0ubuntu3',
ensure => '2.48.2-0ubuntu4',
}
package { 'libglib2.0-data':
ensure => '2.48.2-0ubuntu3',
ensure => '2.48.2-0ubuntu4',
}
package { 'libgmp-dev':
ensure => '2:6.1.0+dfsg-2',
Expand Down Expand Up @@ -1025,7 +1025,7 @@
ensure => '5.4.0-6ubuntu1~16.04.10',
}
package { 'libmspack0':
ensure => '0.5-1ubuntu0.16.04.1',
ensure => '0.5-1ubuntu0.16.04.2',
}
package { 'libncurses5':
ensure => '6.0+20160213-1ubuntu1',
Expand Down Expand Up @@ -1400,7 +1400,7 @@
ensure => '1:0.4.4-1',
}
package { 'libxcursor1':
ensure => '1:1.1.14-1ubuntu0.16.04.1',
ensure => '1:1.1.14-1ubuntu0.16.04.2',
}
package { 'libxdamage1':
ensure => '1:1.1.4-2',
Expand Down Expand Up @@ -1961,22 +1961,22 @@
ensure => '3.4.2',
}
package { 'rspec':
ensure => ['3.7.0'],
ensure => ['3.8.0'],
}
package { 'rspec-core':
ensure => ['3.7.1'],
ensure => ['3.8.0'],
}
package { 'rspec-expectations':
ensure => ['3.7.0'],
ensure => ['3.8.1'],
}
package { 'rspec-its':
ensure => ['1.2.0'],
}
package { 'rspec-mocks':
ensure => ['3.7.0'],
ensure => ['3.8.0'],
}
package { 'rspec-support':
ensure => ['3.7.1'],
ensure => ['3.8.0'],
}
package { 'rsync':
ensure => '3.1.1-3ubuntu1.2',
Expand Down Expand Up @@ -2057,7 +2057,7 @@
ensure => '3.5-1~ubuntu16.04.3',
}
package { 'specinfra':
ensure => ['2.75.0'],
ensure => ['2.75.1'],
}
package { 'squashfs-tools':
ensure => '1:4.3-3ubuntu2.16.04.2',
Expand Down Expand Up @@ -2198,7 +2198,7 @@
ensure => '0.52.18-1ubuntu2',
}
package { 'x11-common':
ensure => '1:7.7+13ubuntu3',
ensure => '1:7.7+13ubuntu3.1',
}
package { 'x11proto-core-dev':
ensure => '7.0.31-1~ubuntu16.04.2',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1532713257,
"build_time": 1533132913,
"files": null,
"artifact_id": "ap-northeast-1:ami-51a8debc,ap-northeast-2:ami-4443f42a,ap-southeast-1:ami-fa682910,ap-southeast-2:ami-715ef813,eu-central-1:ami-5e989ab5,eu-west-1:ami-ec55b001,sa-east-1:ami-b1deffdd,us-east-1:ami-98232be7,us-west-1:ami-6c8e620f,us-west-2:ami-e4efb79c",
"packer_run_uuid": "a485546a-408c-1724-4334-54ee5f18f1c0"
"artifact_id": "ap-northeast-1:ami-86d1a16b,ap-northeast-2:ami-0cf5f9c8123bf37bc,ap-southeast-1:ami-b2bffc58,ap-southeast-2:ami-954beaf7,eu-central-1:ami-e1929f0a,eu-west-1:ami-fcc92811,sa-east-1:ami-0ef72ebaefab4e99b,us-east-1:ami-6c6e7e13,us-west-1:ami-ab7599c8,us-west-2:ami-5b775223",
"packer_run_uuid": "82cbdb39-6c5e-be30-1459-7656152bee3b"
}
],
"last_run_uuid": "a485546a-408c-1724-4334-54ee5f18f1c0"
"last_run_uuid": "82cbdb39-6c5e-be30-1459-7656152bee3b"
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
ensure => '2.38.0',
}
package { 'boto3':
ensure => '1.7.65',
ensure => '1.7.67',
}
package { 'botocore':
ensure => '1.10.4',
Expand Down Expand Up @@ -518,7 +518,7 @@
ensure => '11',
}
package { 'jenkins':
ensure => '2.121.1',
ensure => '2.121.2',
}
package { 'jmespath':
ensure => '0.9.3',
Expand All @@ -544,6 +544,9 @@
package { 'krb5-locales':
ensure => '1.13.2+dfsg-5ubuntu2',
}
package { 'kubectl':
ensure => '1.11.1-00',
}
package { 'language-selector-common':
ensure => '0.165.4',
}
Expand Down Expand Up @@ -1064,7 +1067,7 @@
ensure => '1.3.2-1',
}
package { 'libonig2':
ensure => '5.9.6-1',
ensure => '5.9.6-1ubuntu0.1',
}
package { 'libopts25':
ensure => '1:5.18.7-3',
Expand All @@ -1082,7 +1085,7 @@
ensure => '1.1.8-3.2ubuntu2.1',
}
package { 'libpam-systemd':
ensure => '229-4ubuntu21.2',
ensure => '229-4ubuntu21.4',
}
package { 'libpam0g':
ensure => '1.1.8-3.2ubuntu2.1',
Expand Down Expand Up @@ -1274,7 +1277,7 @@
ensure => '5.4.0-6ubuntu1~16.04.10',
}
package { 'libsystemd0':
ensure => '229-4ubuntu21.2',
ensure => '229-4ubuntu21.4',
}
package { 'libtasn1-6':
ensure => '4.7-3ubuntu0.16.04.3',
Expand Down Expand Up @@ -1310,7 +1313,7 @@
ensure => '5.4.0-6ubuntu1~16.04.10',
}
package { 'libudev1':
ensure => '229-4ubuntu21.2',
ensure => '229-4ubuntu21.4',
}
package { 'libusb-0.1-4':
ensure => '2:0.1.12-28',
Expand Down Expand Up @@ -1465,27 +1468,18 @@
package { 'linux-aws':
ensure => '4.4.0.1063.65',
}
package { 'linux-aws-headers-4.4.0-1061':
ensure => '4.4.0-1061.70',
}
package { 'linux-aws-headers-4.4.0-1063':
ensure => '4.4.0-1063.72',
}
package { 'linux-base':
ensure => '4.5ubuntu1~16.04.1',
}
package { 'linux-headers-4.4.0-1061-aws':
ensure => '4.4.0-1061.70',
}
package { 'linux-headers-4.4.0-1063-aws':
ensure => '4.4.0-1063.72',
}
package { 'linux-headers-aws':
ensure => '4.4.0.1063.65',
}
package { 'linux-image-4.4.0-1061-aws':
ensure => '4.4.0-1061.70',
}
package { 'linux-image-4.4.0-1063-aws':
ensure => '4.4.0-1063.72',
}
Expand Down Expand Up @@ -2084,10 +2078,10 @@
ensure => '1.8.16-0ubuntu1.5',
}
package { 'systemd':
ensure => '229-4ubuntu21.2',
ensure => '229-4ubuntu21.4',
}
package { 'systemd-sysv':
ensure => '229-4ubuntu21.2',
ensure => '229-4ubuntu21.4',
}
package { 'sysv-rc':
ensure => '2.88dsf-59.3ubuntu2',
Expand Down Expand Up @@ -2150,7 +2144,7 @@
ensure => '3.0036',
}
package { 'udev':
ensure => '229-4ubuntu21.2',
ensure => '229-4ubuntu21.4',
}
package { 'ufw':
ensure => '0.35-0ubuntu2',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1532460171,
"build_time": 1532713257,
"files": null,
"artifact_id": "ap-northeast-1:ami-fd572310,ap-northeast-2:ami-bf7dcad1,ap-southeast-1:ami-9d094f77,ap-southeast-2:ami-22fc5a40,eu-central-1:ami-82faf969,eu-west-1:ami-72514b98,sa-east-1:ami-c70223ab,us-east-1:ami-663e3319,us-west-1:ami-9f0ee3fc,us-west-2:ami-ee6e3796",
"packer_run_uuid": "800bc542-7d62-27b6-1b23-fadbb0a3a9a0"
"artifact_id": "ap-northeast-1:ami-51a8debc,ap-northeast-2:ami-4443f42a,ap-southeast-1:ami-fa682910,ap-southeast-2:ami-715ef813,eu-central-1:ami-5e989ab5,eu-west-1:ami-ec55b001,sa-east-1:ami-b1deffdd,us-east-1:ami-98232be7,us-west-1:ami-6c8e620f,us-west-2:ami-e4efb79c",
"packer_run_uuid": "a485546a-408c-1724-4334-54ee5f18f1c0"
}
],
"last_run_uuid": "800bc542-7d62-27b6-1b23-fadbb0a3a9a0"
"last_run_uuid": "a485546a-408c-1724-4334-54ee5f18f1c0"
}
Loading

0 comments on commit 43a1773

Please sign in to comment.