Use Expeditor scripts from master branch

Signed-off-by: Tom Duffield <tom@chef.io>

4 files changed, 18 insertions, 100 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 41abfad9a9..395028eebd 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -52,7 +52,7 @@ merge_actions:
       ignore_labels:
         - "Expeditor: Skip Version Bump"
         - "Expeditor: Skip All"
-  - bash:.expeditor/update_version.sh:
+  - bash:.expeditor/update_version.sh@chef/chef@master:
       only_if: built_in:bump_version
   - built_in:update_changelog:
       ignore_labels:
@@ -80,56 +80,56 @@ subscriptions:
   - workload: artifact_published:stable:chef:{{version_constraint}}
     actions:
       - built_in:rollover_changelog
-      - bash:.expeditor/update_dockerfile.sh
+      - bash:.expeditor/update_dockerfile.sh@chef/chef@master
       - built_in:tag_docker_image
       - built_in:promote_habitat_packages
       - built_in:publish_rubygems
       - built_in:notify_chefio_slack_channels
   - workload: ruby_gem_published:mixlib-archive-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:mixlib-authentication-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:mixlib-cli-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:mixlib-log-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:mixlib-shellout-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:chef-vault-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:chef-zero-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:ohai-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:inspec-core-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:train-core-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:win32-process-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:win32-service-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:win32-taskscheduler-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:ffi-yajl-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:libyajl2-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
   - workload: ruby_gem_published:cheffish-*
     actions:
-      - bash:.expeditor/update_dep.sh
+      - bash:.expeditor/update_dep.sh@chef/chef@master
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh
deleted file mode 100644
index 5b7029525c..0000000000
--- a/.expeditor/update_dep.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-############################################################################
-# What is this script?
-#
-# Chef uses a workflow tool called Expeditor to manage version bumps, changelogs
-# and releases. When a dependency of chef is released, expeditor is triggered
-# against this repository to run this script. It bumps our gem lock files and opens
-# a PR. That way humans can do hard work and bots can open gem bump PRs.
-############################################################################
-
-set -evx
-
-function new_gem_included() {
-  git diff | grep -E '^\+' | grep "${GEM_NAME} (${VERSION})"
-}
-
-release_branch="chef-14"
-new_branch="expeditor/${GEM_NAME}_${VERSION}"
-git checkout "$release_branch"
-git checkout -b "$new_branch"
-
-bundle install
-
-tries=12
-for (( i=1; i<=$tries; i+=1 )); do
-  bundle exec rake dependencies:update_gemfile_lock
-  new_gem_included && break || sleep 20
-  if [ $i -eq $tries ]; then
-    echo "Searching for '${GEM_NAME} (${VERSION})' ${i} times and did not find it"
-    exit 1
-  else
-    echo "Searched ${i} times for '${GEM_NAME} (${VERSION})'"
-  fi
-done
-
-git add .
-
-# give a friendly message for the commit and make sure it's noted for any future audit of our codebase that no
-# DCO sign-off is needed for this sort of PR since it contains no intellectual property
-git commit --message "Bump $GEM_NAME to $VERSION" --message "This pull request was triggered automatically via Expeditor when $GEM_NAME $VERSION was promoted to Rubygems." --message "This change falls under the obvious fix policy so no Developer Certificate of Origin (DCO) sign-off is required."
-
-open_pull_request "$release_branch"
-
-# Get back to master and cleanup the leftovers - any changed files left over at the end of this script will get committed to master.
-git checkout -
-git branch -D "$new_branch"
diff --git a/.expeditor/update_dockerfile.sh b/.expeditor/update_dockerfile.sh
deleted file mode 100755
index 3ed0ed186a..0000000000
--- a/.expeditor/update_dockerfile.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-############################################################################
-# What is this script?
-#
-# Chef uses a workflow tool called Expeditor to manage version bumps, changelogs
-# and releases. When the current release of Chef is promoted to stable this script
-# is run by Expeditor to update the version in the Dockerfile to match the stable
-# release.
-############################################################################
-
-set -evx
-
-sed -i -r "s/^ARG VERSION=.+/ARG VERSION=${VERSION}/" Dockerfile
diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
deleted file mode 100755
index 222ae5cf27..0000000000
--- a/.expeditor/update_version.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-############################################################################
-# What is this script?
-#
-# Chef uses a workflow tool called Expeditor to manage version bumps, changelogs
-# and releases. After a PR is merged in Chef Expeditor calls this script to update
-# the PATCH version in the VERSION file as well as the version.rb file in both chef
-# and chef-config. When that's done it bundle updates to pull in that new chef-config.
-############################################################################
-
-set -evx
-
-sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-config/lib/chef-config/version.rb
-sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"$(cat VERSION)\")/" lib/chef/version.rb
-
-# Update the version inside Gemfile.lock
-bundle update chef chef-config --jobs=7
-
-# Once Expeditor finshes executing this script, it will commit the changes and push
-# the commit as a new tag corresponding to the value in the VERSION file.