From 61fc3bc71957e4182cd5c847f4738ffb3a4639b0 Mon Sep 17 00:00:00 2001 From: ramonskie Date: Thu, 10 Feb 2022 11:45:09 +0100 Subject: [PATCH] inital bunp to ruby 3.1.0 --- .../packages/ruby-3.1.0-r0.81.0/index.yml | 6 + ci/docker/openstack-cpi-release/Dockerfile | 16 +-- jobs/openstack_cpi/spec | 2 +- jobs/openstack_cpi/templates/cpi.erb | 4 +- packages/bosh_openstack_cpi/packaging | 4 +- packages/bosh_openstack_cpi/spec | 2 +- packages/ruby-2.7.4-r0.66.0/spec.lock | 2 - packages/ruby-3.1.0-r0.81.0/spec.lock | 2 + src/bosh_openstack_cpi/.ruby-version | 2 +- src/bosh_openstack_cpi/Gemfile | 8 +- src/bosh_openstack_cpi/Gemfile.lock | 108 +++++++++--------- 11 files changed, 84 insertions(+), 72 deletions(-) create mode 100644 .final_builds/packages/ruby-3.1.0-r0.81.0/index.yml delete mode 100644 packages/ruby-2.7.4-r0.66.0/spec.lock create mode 100644 packages/ruby-3.1.0-r0.81.0/spec.lock diff --git a/.final_builds/packages/ruby-3.1.0-r0.81.0/index.yml b/.final_builds/packages/ruby-3.1.0-r0.81.0/index.yml new file mode 100644 index 00000000..5c566655 --- /dev/null +++ b/.final_builds/packages/ruby-3.1.0-r0.81.0/index.yml @@ -0,0 +1,6 @@ +builds: + 9cf1a9582c595fd03eb9c73cd3c4b2d10de10c139f99ab0b9d1a71e5d2b91378: + version: 9cf1a9582c595fd03eb9c73cd3c4b2d10de10c139f99ab0b9d1a71e5d2b91378 + blobstore_id: 8d13a10a-b9d3-4e6e-54ec-872838901923 + sha1: sha256:85282a8dccc07b1395f26932e83b226a79814dd342eac3369f8330d9e70e7499 +format-version: "2" diff --git a/ci/docker/openstack-cpi-release/Dockerfile b/ci/docker/openstack-cpi-release/Dockerfile index 833feb23..781a39ae 100644 --- a/ci/docker/openstack-cpi-release/Dockerfile +++ b/ci/docker/openstack-cpi-release/Dockerfile @@ -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 @@ -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 && \ diff --git a/jobs/openstack_cpi/spec b/jobs/openstack_cpi/spec index 843c138c..112fef8b 100644 --- a/jobs/openstack_cpi/spec +++ b/jobs/openstack_cpi/spec @@ -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: diff --git a/jobs/openstack_cpi/templates/cpi.erb b/jobs/openstack_cpi/templates/cpi.erb index f0fd60b7..0681a28c 100644 --- a/jobs/openstack_cpi/templates/cpi.erb +++ b/jobs/openstack_cpi/templates/cpi.erb @@ -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 \ diff --git a/packages/bosh_openstack_cpi/packaging b/packages/bosh_openstack_cpi/packaging index 858c6757..de9679da 100644 --- a/packages/bosh_openstack_cpi/packaging +++ b/packages/bosh_openstack_cpi/packaging @@ -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}" diff --git a/packages/bosh_openstack_cpi/spec b/packages/bosh_openstack_cpi/spec index d624cf72..27f63a97 100644 --- a/packages/bosh_openstack_cpi/spec +++ b/packages/bosh_openstack_cpi/spec @@ -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 diff --git a/packages/ruby-2.7.4-r0.66.0/spec.lock b/packages/ruby-2.7.4-r0.66.0/spec.lock deleted file mode 100644 index e9a333b1..00000000 --- a/packages/ruby-2.7.4-r0.66.0/spec.lock +++ /dev/null @@ -1,2 +0,0 @@ -name: ruby-2.7.4-r0.66.0 -fingerprint: f22ee71db5662ea66c48fd9d934b94fd9671f87e94cf3d344f5e2cea36ae0089 diff --git a/packages/ruby-3.1.0-r0.81.0/spec.lock b/packages/ruby-3.1.0-r0.81.0/spec.lock new file mode 100644 index 00000000..2e25df8e --- /dev/null +++ b/packages/ruby-3.1.0-r0.81.0/spec.lock @@ -0,0 +1,2 @@ +name: ruby-3.1.0-r0.81.0 +fingerprint: 9cf1a9582c595fd03eb9c73cd3c4b2d10de10c139f99ab0b9d1a71e5d2b91378 diff --git a/src/bosh_openstack_cpi/.ruby-version b/src/bosh_openstack_cpi/.ruby-version index a4dd9dba..fd2a0186 100644 --- a/src/bosh_openstack_cpi/.ruby-version +++ b/src/bosh_openstack_cpi/.ruby-version @@ -1 +1 @@ -2.7.4 +3.1.0 diff --git a/src/bosh_openstack_cpi/Gemfile b/src/bosh_openstack_cpi/Gemfile index 09a2589d..416b187c 100644 --- a/src/bosh_openstack_cpi/Gemfile +++ b/src/bosh_openstack_cpi/Gemfile @@ -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 diff --git a/src/bosh_openstack_cpi/Gemfile.lock b/src/bosh_openstack_cpi/Gemfile.lock index ef55942a..d86c18e1 100644 --- a/src/bosh_openstack_cpi/Gemfile.lock +++ b/src/bosh_openstack_cpi/Gemfile.lock @@ -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) @@ -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 @@ -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 @@ -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