From 6ac1a6309659bd63144b9936d2d734aa5caef8f9 Mon Sep 17 00:00:00 2001 From: Miah Johnson Date: Wed, 17 Jul 2019 16:38:30 -0700 Subject: [PATCH] Add expeditor and buildkite verify pipeline Signed-off-by: Miah Johnson --- .expeditor/buildkite/verify.sh | 17 +++++++++++++++ .expeditor/config.yml | 38 ++++++++++++++++++++++++++++++++++ .expeditor/update_version.sh | 9 ++++++++ .expeditor/verify.pipeline.yml | 26 +++++++++++++++++++++++ CHANGELOG.md | 4 +++- VERSION | 1 + 6 files changed, 94 insertions(+), 1 deletion(-) create mode 100755 .expeditor/buildkite/verify.sh create mode 100644 .expeditor/config.yml create mode 100755 .expeditor/update_version.sh create mode 100644 .expeditor/verify.pipeline.yml create mode 100644 VERSION diff --git a/.expeditor/buildkite/verify.sh b/.expeditor/buildkite/verify.sh new file mode 100755 index 000000000..15b6a61a9 --- /dev/null +++ b/.expeditor/buildkite/verify.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -ueo pipefail + +echo "--- system details" +uname -a +ruby -v +bundle --version + +echo "--- bundle install" +bundle install --jobs=7 --retry=3 --without tools maintenance deploy + +echo "+++ bundle exec rake lint" +bundle exec rake lint + +echo "+++ bundle exec rake test:check" +bundle exec rake test:check diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 000000000..30d30657f --- /dev/null +++ b/.expeditor/config.yml @@ -0,0 +1,38 @@ +# Documentation available at https://expeditor.chef.io/docs/getting-started/ +--- + +pipelines: + - verify: + description: Pull Request validation tests + public: true + +slack: + notify_channel: inspec-notify + +github: + delete_branch_on_merge: true + minor_bump_labels: + - "Version: Bump Minor" + version_tag_format: v{{version}} + release_branch: + - master + +changelog: + categories: + - "Type: New Resource": "New Resources" + - "Type: New Feature": "New Features" + - "Type: Enhancement": "Enhancements" + - "Type: Bug": "Bug Fixes" + +merge_actions: + - built_in:bump_version: + ignore_labels: + - "Version: Skip Bump" + - "Expeditor: Skip All" + - bash:.expeditor/update_version.sh: + only_if: built_in:bump_version + - built_in:update_changelog: + ignore_labels: + - "Changelog: Skip Update" + - "Expeditor: Skip All" + diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh new file mode 100755 index 000000000..eb3988138 --- /dev/null +++ b/.expeditor/update_version.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file. +# It then executes this file to update any other files/components with that new version. +# + +set -ev + +sed -i -r "s/version\: .*/version\: $(cat VERSION)/" inspec.yml diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml new file mode 100644 index 000000000..108ffbf25 --- /dev/null +++ b/.expeditor/verify.pipeline.yml @@ -0,0 +1,26 @@ +--- +steps: + +- label: run-tests-ruby-2.4 + command: + - /workdir/.expeditor/buildkite/verify.sh + expeditor: + executor: + docker: + image: ruby:2.4-stretch + +- label: run-tests-ruby-2.5 + command: + - /workdir/.expeditor/buildkite/verify.sh + expeditor: + executor: + docker: + image: ruby:2.5-stretch + +- label: run-tests-ruby-2.6 + command: + - /workdir/.expeditor/buildkite/verify.sh + expeditor: + executor: + docker: + image: ruby:2.6-stretch diff --git a/CHANGELOG.md b/CHANGELOG.md index ff441d704..5a3e46aaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # Change Log + + ## [v0.11.0](https://github.com/inspec/inspec-gcp/tree/v0.11.0) (2019-04-30) [Full Changelog](https://github.com/inspec/inspec-gcp/compare/v0.10.0...v0.11.0) @@ -194,4 +196,4 @@ -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..d9df1bbc0 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.11.0