Skip to content

Commit

Permalink
Bump to ruby 2.4.4
Browse files Browse the repository at this point in the history
[#156834193](https://www.pivotaltracker.com/story/show/156834193)

Signed-off-by: Josh Russett <jrussett@pivotal.io>
  • Loading branch information
Josh Aresty authored and jrussett committed Apr 24, 2018
1 parent 36189b4 commit 80ac924
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .envrc
@@ -1,3 +1,3 @@
export RELEASE_DIR=$PWD
export SRC_DIR=$PWD/src/bosh_aws_cpi
export PROJECT_RUBY_VERSION=2.4.2
export PROJECT_RUBY_VERSION=2.4.4
6 changes: 6 additions & 0 deletions .final_builds/packages/ruby-2.4-r4/index.yml
@@ -0,0 +1,6 @@
builds:
0cdc60ed7fdb326e605479e9275346200af30a25:
version: 0cdc60ed7fdb326e605479e9275346200af30a25
blobstore_id: d6024746-6441-476d-6bdf-bf95858330a1
sha1: 3f1809b9d7e326d8a701de516fb51ea4245913c6
format-version: "2"
2 changes: 1 addition & 1 deletion ci/docker/boshcpi.aws-cpi-release/Dockerfile
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && \
apt-get clean && \
pip install awscli

ENV RUBY_INSTALL_VERSION=0.6.1 CHRUBY_VERSION=0.3.9 RUBY_VERSION=2.4.2 JQ_VERSION=1.5
ENV RUBY_INSTALL_VERSION=0.6.1 CHRUBY_VERSION=0.3.9 RUBY_VERSION=2.4.4 JQ_VERSION=1.5

# Import stedolan PGP key (jq)
RUN wget -nv https://raw.githubusercontent.com/stedolan/jq/master/sig/jq-release.key && \
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/build-candidate.sh
Expand Up @@ -4,7 +4,7 @@ set -e

source bosh-cpi-src/ci/utils.sh
source /etc/profile.d/chruby.sh
chruby 2.4.2
chruby 2.4.4

semver=`cat version-semver/number`

Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/promote-candidate.sh
Expand Up @@ -7,7 +7,7 @@ set -e

source bosh-cpi-src/ci/utils.sh
source /etc/profile.d/chruby.sh
chruby 2.4.2
chruby 2.4.4

# Creates an integer version number from the semantic version format
# May be changed when we decide to fully use semantic versions for releases
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/run-integration.sh
Expand Up @@ -16,7 +16,7 @@ release_dir="$( cd $(dirname $0) && cd ../.. && pwd )"

if [[ -f "/etc/profile.d/chruby.sh" ]] ; then
source /etc/profile.d/chruby.sh
chruby 2.4.2
chruby 2.4.4
fi

metadata=$(cat ${METADATA_FILE})
Expand Down
2 changes: 1 addition & 1 deletion docs/development.md
@@ -1,6 +1,6 @@
## Development

The release requires Ruby version 2.4.2 and the Ruby gem Bundler (used by the vendoring script):
The release requires Ruby version 2.4.4 and the Ruby gem Bundler (used by the vendoring script):

```
gem install bundler
Expand Down
2 changes: 1 addition & 1 deletion jobs/aws_cpi/spec
Expand Up @@ -7,7 +7,7 @@ templates:
cpi_ctl.erb: bin/cpi_ctl

packages:
- ruby-2.4-r3
- ruby-2.4-r4
- bosh_aws_cpi

properties:
Expand Down
4 changes: 2 additions & 2 deletions jobs/aws_cpi/templates/cpi.erb
Expand Up @@ -25,12 +25,12 @@ export no_proxy="<%= no_proxy %>"
export BOSH_CA_CERT_FILE=$BOSH_JOBS_DIR/aws_cpi/config/cacert.pem
<% end %>

PATH=$BOSH_PACKAGES_DIR/ruby-2.4-r3/bin:$PATH
PATH=$BOSH_PACKAGES_DIR/ruby-2.4-r4/bin:$PATH
export PATH

export BUNDLE_GEMFILE=$BOSH_PACKAGES_DIR/bosh_aws_cpi/Gemfile

bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4-r3/bin/bundle"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4-r4/bin/bundle"

exec $bundle_cmd exec $BOSH_PACKAGES_DIR/bosh_aws_cpi/bin/aws_cpi \
$BOSH_JOBS_DIR/aws_cpi/config/cpi.json
2 changes: 1 addition & 1 deletion packages/bosh_aws_cpi/packaging
Expand Up @@ -8,7 +8,7 @@ cp -a bosh_aws_cpi/* ${BOSH_INSTALL_TARGET}

export BUNDLE_CACHE_PATH="vendor/package"
export BUNDLE_WITHOUT="development:test"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4-r3/bin/bundle"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4-r4/bin/bundle"

cd ${BOSH_INSTALL_TARGET}

Expand Down
2 changes: 1 addition & 1 deletion packages/bosh_aws_cpi/spec
@@ -1,7 +1,7 @@
---
name: bosh_aws_cpi
dependencies:
- ruby-2.4-r3
- ruby-2.4-r4
files:
- bosh_aws_cpi/Gemfile
- bosh_aws_cpi/Gemfile.lock
Expand Down
2 changes: 2 additions & 0 deletions packages/ruby-2.4-r4/spec.lock
@@ -0,0 +1,2 @@
name: ruby-2.4-r4
fingerprint: 0cdc60ed7fdb326e605479e9275346200af30a25
2 changes: 1 addition & 1 deletion src/bosh_aws_cpi/spec/spec_helper.rb
Expand Up @@ -6,7 +6,7 @@

MOCK_AWS_ACCESS_KEY_ID = 'foo'
MOCK_AWS_SECRET_ACCESS_KEY = 'bar'
PROJECT_RUBY_VERSION = ENV.fetch('PROJECT_RUBY_VERSION', '2.4.2')
PROJECT_RUBY_VERSION = ENV.fetch('PROJECT_RUBY_VERSION', '2.4.4')

def mock_cloud_options
{
Expand Down

0 comments on commit 80ac924

Please sign in to comment.