summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-09-10 12:41:39 -0700
committerGitHub <noreply@github.com>2018-09-10 12:41:39 -0700
commitaa8e75b4a198645b4df00465307c75799ee7e903 (patch)
treee4b405308119bdef8d2ca915dcf00d2d7a7bd3d8
parente13f2ee11428d58ea087034a930272c0eff05065 (diff)
parent7794bea9ab28d1c886014cfa7c6b39398da79c97 (diff)
downloadchef-aa8e75b4a198645b4df00465307c75799ee7e903.tar.gz
Merge pull request #7632 from chef/expeditor_fix
Update expeditor config to use subscriptions
-rw-r--r--.expeditor/config.yml27
-rw-r--r--.expeditor/update_dep.sh2
2 files changed, 14 insertions, 15 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index c90235d03f..061694fb25 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -67,21 +67,20 @@ merge_actions:
- "Expeditor: Skip All"
only_if: built_in:bump_version
-# These actions are taken, in the order specified, when an Omnibus artifact is promoted
-# within Chef's internal artifact storage system.
-artifact_actions:
- promoted_to_unstable:
- - built_in:build_docker_image
- promoted_to_current:
- - built_in:tag_docker_image
- promoted_to_stable:
- - built_in:rollover_changelog
- - bash:.expeditor/update_dockerfile.sh
- - built_in:tag_docker_image
- - built_in:publish_rubygems
- - built_in:notify_chefio_slack_channels
-
subscriptions:
+ - workload: artifact_published:unstable:chef:14*
+ actions:
+ - built_in:build_docker_image
+ - workload: artifact_published:current:chef:14*
+ actions:
+ - built_in:tag_docker_image
+ - workload: artifact_published:stable:chef:14*
+ actions:
+ - built_in:rollover_changelog
+ - bash:.expeditor/update_dockerfile.sh
+ - built_in:tag_docker_image
+ - built_in:publish_rubygems
+ - built_in:notify_chefio_slack_channels
- workload: ruby_gem_published:mixlib-archive-*
actions:
- bash:.expeditor/update_dep.sh
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh
index de820c6bd9..a95ef794e9 100644
--- a/.expeditor/update_dep.sh
+++ b/.expeditor/update_dep.sh
@@ -18,7 +18,7 @@ bundle install
# it appears that the gem that triggers this script fires off this script before
# the gem is actually available via bundler on rubygems.org.
-sleep 120
+sleep 240
gem install rake
rake dependencies:update_gemfile_lock