diff --git a/acceptance/bin/ci-bootstrap-from-artifacts.sh b/acceptance/bin/ci-bootstrap-from-artifacts.sh index 7936f428f..2340831c2 100755 --- a/acceptance/bin/ci-bootstrap-from-artifacts.sh +++ b/acceptance/bin/ci-bootstrap-from-artifacts.sh @@ -1,54 +1,54 @@ #! /usr/bin/env bash ############################################################################### # Initial preparation for a ci acceptance job in Jenkins. Crucially, it # handles the untarring of the build artifact and bundle install, getting us to # a state where we can then bundle exec rake the particular ci:test we want to # run. # # Having this checked in in a script makes it much easier to have multiple # acceptance jobs. It must be kept agnostic between Linux/Solaris/Windows # builds, however. set -x # If $GEM_SOURCE is not set, fall back to rubygems.org if [ -z $GEM_SOURCE ]; then export GEM_SOURCE='https://rubygems.org' fi echo "SHA: ${SHA}" echo "FORK: ${FORK}" echo "BUILD_SELECTOR: ${BUILD_SELECTOR}" echo "PACKAGE_BUILD_STATUS: ${PACKAGE_BUILD_STATUS}" rm -rf acceptance mkdir acceptance cd acceptance tar -xzf ../acceptance-artifacts.tar.gz echo "===== This artifact is from =====" cat creator.txt bundle install --without=development --path=.bundle/gems if [[ "${platform}" =~ 'solaris' ]]; then repo_proxy=" :repo_proxy => false," fi # If the platform is Windows and $ruby_arch is set, append it if [[ "${platform}" =~ 'win' && ! -z $ruby_arch ]]; then platform="${platform}-${ruby_arch}" fi cat > local_options.rb <<-EOF { :hosts_file => 'config/nodes/${platform}.yaml', :ssh => { - :keys => ["${HOME}/.ssh/id_rsa-old.private"], + :keys => ["${HOME}/.ssh/id_rsa-acceptance"], }, ${repo_proxy} } EOF [[ (-z "${PACKAGE_BUILD_STATUS}") || ("${PACKAGE_BUILD_STATUS}" = "success") ]] || exit 1