summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-29 16:03:48 -0700
committerGitHub <noreply@github.com>2019-04-29 16:03:48 -0700
commite21a548417d271a8dbe085fc6498c3bcb2022e7d (patch)
tree43a60be4bfb838ec956e3264d78d73878008eddb
parent0acc51c23e8149e6d6fe675e801c95b1a4e77e84 (diff)
parentb0d63cf912b20614dcd9551a5f9d7dbb3504acf7 (diff)
downloadchef-e21a548417d271a8dbe085fc6498c3bcb2022e7d.tar.gz
Merge pull request #8414 from chef/expeditor_update
Fix readme OSS links and update slack channel for expeditor
-rw-r--r--.expeditor/config.yml13
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md16
-rw-r--r--README.md4
3 files changed, 7 insertions, 26 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 1ce2a6c964..31c6ecea3e 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -1,5 +1,5 @@
# Documentation available at https://expeditor.chef.io/docs/getting-started/
-
+---
# the name we use for this project when interacting with expeditor chatbot
project:
alias: chef-15
@@ -11,7 +11,7 @@ product_key:
# Slack channel in Chef Software slack to send notifications about build failures, etc
slack:
- notify_channel: chef-notify
+ notify_channel: chef-infra-notify
# Which Ruby Gems, built when the Omnibus package is built, to publish to rubygems.org
# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
@@ -33,12 +33,6 @@ pipelines:
- ADHOC: true
github:
- # The file where the MAJOR.MINOR.PATCH version is kept. The version in this file
- # is bumped automatically via the `built_in:bump_version` merge_action.
- version_file: "VERSION"
- # The file where our CHANGELOG is kept. This file is updated automatically with
- # details from the Pull Request via the `built_in:update_changelog` merge_action.
- changelog_file: "CHANGELOG.md"
# This deletes the GitHub PR branch after successfully merged into the release branch
delete_branch_on_merge: true
# The tag format to use (e.g. v1.0.0)
@@ -58,6 +52,9 @@ github:
- chef-14:
version_constraint: 14*
+changelog:
+ rollup_header: Changes not yet released to rubygems.org
+
# These actions are taken, in order they are specified, anytime a Pull Request is merged.
merge_actions:
- built_in:bump_version:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index ac0fc52309..0000000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-### Description
-
-[Please describe what this change achieves]
-
-### Issues Resolved
-
-[List any existing issues this PR resolves, or any Discourse or
-StackOverflow discussions that are relevant]
-
-### Check List
-
-- [ ] New functionality includes tests
-- [ ] All tests pass
-- [ ] RELEASE\_NOTES.md has been updated if required (not required for bugfixes, required for API changes)
-- [ ] All commits have been signed-off for the Developer Certificate of Origin. See <https://github.com/chef/chef/blob/master/CONTRIBUTING.md#developer-certification-of-origin-dco>
-- [ ] PR title is a worthy inclusion in the CHANGELOG \ No newline at end of file
diff --git a/README.md b/README.md
index 1dabeb23cc..638784f169 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@
**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#active)
-**Issues Response SLA**: 10 business days
+**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
-**Pull Request Response SLA**: 10 business days
+**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
## Getting Started