Skip to content

Commit

Permalink
inital bunp to ruby 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ramonskie committed Feb 10, 2022
1 parent 10a7059 commit 61fc3bc
Show file tree
Hide file tree
Showing 11 changed files with 84 additions and 72 deletions.
6 changes: 6 additions & 0 deletions .final_builds/packages/ruby-3.1.0-r0.81.0/index.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
builds:
9cf1a9582c595fd03eb9c73cd3c4b2d10de10c139f99ab0b9d1a71e5d2b91378:
version: 9cf1a9582c595fd03eb9c73cd3c4b2d10de10c139f99ab0b9d1a71e5d2b91378
blobstore_id: 8d13a10a-b9d3-4e6e-54ec-872838901923
sha1: sha256:85282a8dccc07b1395f26932e83b226a79814dd342eac3369f8330d9e70e7499
format-version: "2"
16 changes: 9 additions & 7 deletions ci/docker/openstack-cpi-release/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM ubuntu:16.04

ENV bosh_cli_version 6.4.15

RUN apt-get -y update && apt-get install -y locales && locale-gen en_US.UTF-8
RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8

Expand Down Expand Up @@ -40,20 +42,20 @@ RUN apt-get install software-properties-common -y; \
# ruby-install
RUN mkdir /tmp/ruby-install && \
cd /tmp/ruby-install && \
curl https://codeload.github.com/postmodern/ruby-install/tar.gz/v0.6.1 | tar -xz && \
curl https://codeload.github.com/postmodern/ruby-install/tar.gz/v0.8.3 | tar -xz && \
cd /tmp/ruby-install/ruby-install-0.6.1 && \
make install && \
rm -rf /tmp/ruby-install

#Ruby
RUN ruby-install --system ruby 2.7.4

#Bundler
RUN ["/bin/bash", "-l", "-c", "gem install bundler -v 2.1.4 --no-document"]
RUN ruby-install --system ruby 3.1.0

#BOSH GO CLI
RUN wget https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-5.5.1-linux-amd64 -O /usr/local/bin/bosh-go
RUN chmod +x /usr/local/bin/bosh-go
RUN \
wget --quiet https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-${bosh_cli_version}-linux-amd64 --output-document="/usr/bin/bosh" && \
chmod +x /usr/bin/bosh && \
cp /usr/bin/bosh /usr/local/bin/bosh-go && \
chmod +x /usr/local/bin/bosh-go

#GitHub CLI
RUN cd /tmp && \
Expand Down
2 changes: 1 addition & 1 deletion jobs/openstack_cpi/spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ templates:
cacert.pem.erb: config/cacert.pem

packages:
- ruby-2.7.4-r0.66.0
- ruby-3.1.0-r0.81.0
- bosh_openstack_cpi

properties:
Expand Down
4 changes: 2 additions & 2 deletions jobs/openstack_cpi/templates/cpi.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ export no_proxy="<%= no_proxy %>"
BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
BOSH_JOBS_DIR=${BOSH_JOBS_DIR:-/var/vcap/jobs}

source "${BOSH_PACKAGES_DIR}/ruby-2.7.4-r0.66.0/bosh/runtime.env"
source "${BOSH_PACKAGES_DIR}/ruby-3.1.0-r0.81.0/bosh/runtime.env"
export HOME=~

export BUNDLE_GEMFILE=$BOSH_PACKAGES_DIR/bosh_openstack_cpi/Gemfile

bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.7.4-r0.66.0/bin/bundle"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-3.1.0-r0.81.0/bin/bundle"

exec $bundle_cmd exec $BOSH_PACKAGES_DIR/bosh_openstack_cpi/bin/openstack_cpi \
$BOSH_JOBS_DIR/openstack_cpi/config/cpi.json \
Expand Down
4 changes: 2 additions & 2 deletions packages/bosh_openstack_cpi/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ set -e -x

BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
# shellcheck disable=SC1090
source "${BOSH_PACKAGES_DIR}/ruby-2.7.4-r0.66.0/bosh/compile.env"
source "${BOSH_PACKAGES_DIR}/ruby-3.1.0-r0.81.0/bosh/compile.env"

cp -a bosh_openstack_cpi/* "${BOSH_INSTALL_TARGET}"

export BUNDLE_CACHE_PATH="vendor/package"
export BUNDLE_WITHOUT="development:test"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.7.4-r0.66.0/bin/bundle"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-3.1.0-r0.81.0/bin/bundle"

cd "${BOSH_INSTALL_TARGET}"

Expand Down
2 changes: 1 addition & 1 deletion packages/bosh_openstack_cpi/spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: bosh_openstack_cpi
dependencies:
- ruby-2.7.4-r0.66.0
- ruby-3.1.0-r0.81.0
files:
- bosh_openstack_cpi/Gemfile
- bosh_openstack_cpi/Gemfile.lock
Expand Down
2 changes: 0 additions & 2 deletions packages/ruby-2.7.4-r0.66.0/spec.lock

This file was deleted.

2 changes: 2 additions & 0 deletions packages/ruby-3.1.0-r0.81.0/spec.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: ruby-3.1.0-r0.81.0
fingerprint: 9cf1a9582c595fd03eb9c73cd3c4b2d10de10c139f99ab0b9d1a71e5d2b91378
2 changes: 1 addition & 1 deletion src/bosh_openstack_cpi/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
3.1.0
8 changes: 4 additions & 4 deletions src/bosh_openstack_cpi/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ group :development, :test do
gem 'pry-byebug'
gem 'rb-readline'
gem 'rake', '~>10.3.2'
gem 'rspec', '~> 3.3.0'
gem 'rspec-its', '~> 1.0.1'
gem 'rspec', '~> 3.10.0'
gem 'rspec-its', '~> 1.3.0'
gem 'rubocop'
gem 'rubocop-git'
gem 'timecop', '~>0.7.1'
gem 'webmock', '~>2.3.2'
gem 'timecop', '~>0.9.4'
gem 'webmock', '~>3.14.0'
gem 'bosh-template'
end
108 changes: 56 additions & 52 deletions src/bosh_openstack_cpi/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GEM
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.0)
ast (2.4.2)
bosh-template (2.2.1)
semi_semantic (~> 1.2.0)
bosh_common (1.3262.24.0)
Expand All @@ -13,11 +13,11 @@ GEM
httpclient (~> 2.8.3)
membrane (~> 1.1.0)
builder (3.2.4)
byebug (11.0.1)
coderay (1.1.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
diff-lcs (1.3)
byebug (11.1.3)
coderay (1.1.3)
crack (0.4.5)
rexml
diff-lcs (1.5.0)
excon (0.71.1)
fog-core (2.2.4)
builder
Expand All @@ -32,69 +32,73 @@ GEM
fog-json (>= 1.0)
ipaddress (>= 0.8)
formatador (0.3.0)
hashdiff (1.0.0)
hashdiff (1.0.1)
httpclient (2.8.3)
ipaddress (0.8.3)
jaro_winkler (1.5.4)
little-plugger (1.1.4)
logging (1.8.2)
little-plugger (>= 1.1.3)
multi_json (>= 1.8.4)
membrane (1.1.0)
method_source (0.9.2)
mime-types (3.3.1)
method_source (1.0.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mime-types-data (3.2022.0105)
minitar (0.5.4)
multi_json (1.14.1)
netaddr (2.0.4)
parallel (1.19.1)
parser (2.6.5.0)
ast (~> 2.4.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.7.0)
multi_json (1.15.0)
netaddr (2.0.5)
parallel (1.21.0)
parser (3.1.0.0)
ast (~> 2.4.1)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.10)
pry (~> 0.13.0)
public_suffix (4.0.6)
rainbow (3.0.0)
rainbow (3.1.1)
rake (10.3.2)
rb-readline (0.5.5)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
regexp_parser (2.2.0)
rexml (3.2.5)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.2)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-its (1.0.1)
rspec-core (>= 2.99.0.beta1)
rspec-expectations (>= 2.99.0.beta1)
rspec-mocks (3.3.2)
rspec-support (~> 3.10.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.10.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubocop (0.76.0)
jaro_winkler (~> 1.5.1)
rspec-support (~> 3.10.0)
rspec-support (3.10.3)
rubocop (1.25.1)
parallel (~> 1.10)
parser (>= 2.6)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.15.1)
parser (>= 3.0.1.1)
rubocop-git (0.1.3)
rubocop (>= 0.24.1)
ruby-progressbar (1.10.1)
safe_yaml (1.0.5)
ruby-progressbar (1.11.0)
semi_semantic (1.2.0)
timecop (0.7.4)
unicode-display_width (1.6.0)
webmock (2.3.2)
addressable (>= 2.3.6)
timecop (0.9.4)
unicode-display_width (2.1.0)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff
hashdiff (>= 0.4.0, < 2.0.0)

PLATFORMS
ruby
Expand All @@ -112,12 +116,12 @@ DEPENDENCIES
pry-byebug
rake (~> 10.3.2)
rb-readline
rspec (~> 3.3.0)
rspec-its (~> 1.0.1)
rspec (~> 3.10.0)
rspec-its (~> 1.3.0)
rubocop
rubocop-git
timecop (~> 0.7.1)
webmock (~> 2.3.2)
timecop (~> 0.9.4)
webmock (~> 3.14.0)

BUNDLED WITH
2.1.4
2.3.7

0 comments on commit 61fc3bc

Please sign in to comment.