Skip to content

Commit

Permalink
Bump ruby from 2.4.4 to 2.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Maya Rosecrance committed Apr 8, 2021
1 parent 40f0938 commit ca6886a
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 15 deletions.
6 changes: 6 additions & 0 deletions .final_builds/packages/ruby-2.7.3-r0.43.0/index.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
builds:
99c4d7fe18ef5287f062b73101b2b697fca340e7eac03b3ee87284b71e1c18d8:
version: 99c4d7fe18ef5287f062b73101b2b697fca340e7eac03b3ee87284b71e1c18d8
blobstore_id: 8747e880-6489-4c32-74df-b6a878f9d7e2
sha1: sha256:2507840353929a72a2378481168e6d4ae1f2faa47939dfabb358a4724c1b634e
format-version: "2"
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent { docker { image 'ruby:2.4.4' } }
agent { docker { image 'ruby:2.7.3' } }
stages {
stage('rubocop') {
steps {
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/boshcpi.azure-cpi-release/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN /bin/bash -l -c " \
"

# ruby
ENV RUBY_VERSION 2.4.4
ENV RUBY_VERSION 2.7.3
RUN ruby-install ruby ${RUBY_VERSION}

# Bundler
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/run-az-bats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -e

source pipelines/shared/utils.sh
source /etc/profile.d/chruby.sh
chruby 2.4.4
chruby 2.7.3

metadata="$( cat environment/metadata )"
mkdir -p bats-config
Expand Down
8 changes: 4 additions & 4 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

1. Install ruby

Please make sure you have installed ruby `2.4.4` before you start.
Please make sure you have installed ruby `2.7.3` before you start.

```bash
cd ~/workspace
Expand All @@ -67,8 +67,8 @@
sudo make install
popd
ruby-install ruby 2.4.4
echo 'chruby 2.4.4' >> ~/.profile
ruby-install ruby 2.7.3
echo 'chruby 2.7.3' >> ~/.profile
source ~/.profile
ruby -v
```
Expand Down Expand Up @@ -142,7 +142,7 @@ You can use `bosh_azure_console` to test your code changes quickly.
gem install pg --version 0.20.0 --no-ri --no-rdoc
# Workaround for the issue https://github.com/cloudfoundry/bosh/issues/1621
sed -i -e '23s/^/#/' ~/.gem/ruby/2.4.4/gems/bosh-registry-1.3262.24.0/lib/bosh/registry.rb
sed -i -e '23s/^/#/' ~/.gem/ruby/2.7.3/gems/bosh-registry-1.3262.24.0/lib/bosh/registry.rb
cat > ~/workspace/registry.cfg <<EOS
---
Expand Down
2 changes: 1 addition & 1 deletion jobs/azure_cpi/spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ templates:
service_principal_certificate.pem.erb: config/service_principal_certificate.pem

packages:
- ruby-2.4-r4
- ruby-2.7.3-r0.43.0
- bosh_azure_cpi

properties:
Expand Down
2 changes: 1 addition & 1 deletion jobs/azure_cpi/templates/cpi.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
source ${BOSH_PACKAGES_DIR}/ruby-2.4-r4/bosh/runtime.env
source ${BOSH_PACKAGES_DIR}/ruby-2.7.3-r0.43.0/bosh/runtime.env
BOSH_JOBS_DIR=${BOSH_JOBS_DIR:-/var/vcap/jobs}
export HOME=~

Expand Down
2 changes: 1 addition & 1 deletion packages/bosh_azure_cpi/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e -x

BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}

source ${BOSH_PACKAGES_DIR}/ruby-2.4-r4/bosh/compile.env
source ${BOSH_PACKAGES_DIR}/ruby-2.7.3-r0.43.0/bosh/compile.env

cp -a bosh_azure_cpi/* ${BOSH_INSTALL_TARGET}

Expand Down
2 changes: 1 addition & 1 deletion packages/bosh_azure_cpi/spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: bosh_azure_cpi
dependencies:
- ruby-2.4-r4
- ruby-2.7.3-r0.43.0
files:
- bosh_azure_cpi/Gemfile
- bosh_azure_cpi/Gemfile.lock
Expand Down
2 changes: 0 additions & 2 deletions packages/ruby-2.4-r4/spec.lock

This file was deleted.

2 changes: 2 additions & 0 deletions packages/ruby-2.7.3-r0.43.0/spec.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: ruby-2.7.3-r0.43.0
fingerprint: 99c4d7fe18ef5287f062b73101b2b697fca340e7eac03b3ee87284b71e1c18d8
2 changes: 1 addition & 1 deletion src/bosh_azure_cpi/.rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 2.4.4
TargetRubyVersion: 2.7.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
chruby 2.4.4
chruby 2.7.3
source ./run_performance.pri.sh

export SERVICE_HOST_BASE="core.windows.net"
Expand Down

0 comments on commit ca6886a

Please sign in to comment.