summaryrefslogtreecommitdiff
path: root/.expeditor
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2020-07-24 13:55:01 -0500
committerTom Duffield <tom@chef.io>2020-07-28 10:54:01 -0500
commitb604456f87fe99247a4af1b97fb3ef6c6e410bf2 (patch)
tree06d9fa99c84a90cb46d310c7cf9b570c2e8a02c7 /.expeditor
parent395f9f54cef1e3cb7333d4f875e4c97e9a7123b3 (diff)
downloadchef-b604456f87fe99247a4af1b97fb3ef6c6e410bf2.tar.gz
Add further clarifications to usage of docker/build pipeline
* Add the new `built_in:promote_docker_images` action * Replace `built_in:build_docker_image` with `trigger_pipeline:docker/build` * Remove unnecessary logic from Dockerfile * Add inline comment context for dobi.yaml Signed-off-by: Tom Duffield <tom@chef.io>
Diffstat (limited to '.expeditor')
-rw-r--r--.expeditor/config.yml14
-rwxr-xr-x.expeditor/update_version.sh12
2 files changed, 14 insertions, 12 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 8a6f5c48d1..b2f0d22c68 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -84,17 +84,17 @@ merge_actions:
subscriptions:
# the omnibus/docker/gem chain
- # - workload: artifact_published:unstable:chef:{{version_constraint}}
- # actions:
- # - built_in:build_docker_image
- # - workload: artifact_published:current:chef:{{version_constraint}}
- # actions:
- # - built_in:tag_docker_image
+ - workload: artifact_published:unstable:chef:{{version_constraint}}
+ actions:
+ - trigger_pipeline:docker/build
+ - workload: artifact_published:current:chef:{{version_constraint}}
+ actions:
+ - built_in:promote_docker_images
- workload: artifact_published:stable:chef:{{version_constraint}}
actions:
- built_in:rollover_changelog
- bash:.expeditor/update_dockerfile.sh
- # - built_in:tag_docker_image
+ - built_in:promote_docker_images
- built_in:publish_rubygems
- built_in:promote_habitat_packages
- built_in:notify_chefio_slack_channels
diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
index d92c019ebb..3312cccbc0 100755
--- a/.expeditor/update_version.sh
+++ b/.expeditor/update_version.sh
@@ -11,13 +11,15 @@
set -evx
-sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-config/lib/chef-config/version.rb
-sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-bin/lib/chef-bin/version.rb
-sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-utils/lib/chef-utils/version.rb
-sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"$(cat VERSION)\")/" lib/chef/version.rb
+VERSION=$(cat VERSION)
+
+sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-config/lib/chef-config/version.rb
+sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-bin/lib/chef-bin/version.rb
+sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"${VERSION}\"/" chef-utils/lib/chef-utils/version.rb
+sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"${VERSION}\")/" lib/chef/version.rb
# Update the version for the dobi
-sed -i -r "s/^(\s*)VERSION: \".+\"/\1VERSION: \"$(cat VERSION)\"/" .expeditor/build.docker.yml
+sed -i -r "s/^(\s*)VERSION: \".+\"/\1VERSION: \"${VERSION}\"/" .expeditor/build.docker.yml
# Update the version inside Gemfile.lock
bundle update chef chef-config chef-utils --jobs=7 --conservative