From 38b4b5a98e9c9efa26d14773bb46100a947332d1 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 7 Dec 2021 10:45:01 -0500 Subject: [PATCH 1/2] Update Gemfile to include GCE provider This also updates the info about the other two gems to be more current. --- docker/test-all-providers/Gemfile | 6 ++- docker/test-all-providers/Gemfile.lock | 68 +++++++++++++++++++++----- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/docker/test-all-providers/Gemfile b/docker/test-all-providers/Gemfile index e29590a..54ed8fb 100644 --- a/docker/test-all-providers/Gemfile +++ b/docker/test-all-providers/Gemfile @@ -1,4 +1,6 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'extract-vsphere-provider' -gem 'vmpooler-vsphere-provider', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git' +gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git' +gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git' +gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git' + diff --git a/docker/test-all-providers/Gemfile.lock b/docker/test-all-providers/Gemfile.lock index d2d58ee..8d77b7c 100644 --- a/docker/test-all-providers/Gemfile.lock +++ b/docker/test-all-providers/Gemfile.lock @@ -1,14 +1,21 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler-provider-gce.git + revision: 2a0e9f5bdc45c5c9c656f3763df296a6ab2a522a + specs: + vmpooler-provider-gce (0.1.0) + google-apis-compute_v1 (~> 0.14) + googleauth (~> 0.16.2) + GIT remote: https://github.com/puppetlabs/vmpooler-provider-vsphere.git - revision: a08cba099f867b1db01a50940ec3ae9239245db5 + revision: 4fa14cc94f2649188efc9f9555ec598b30213e69 specs: - vmpooler-vsphere-provider (1.3.0) + vmpooler-provider-vsphere (1.3.0) rbvmomi (>= 2.1, < 4.0) GIT remote: https://github.com/puppetlabs/vmpooler.git - revision: d1c86eaf9b8fc1945213dad009db1172dffac7f2 - branch: extract-vsphere-provider + revision: 5f8913184bc530efdf45a1712bb3f01c6635524a specs: vmpooler (1.3.0) concurrent-ruby (~> 1.1) @@ -34,10 +41,13 @@ GIT GEM remote: https://rubygems.org/ specs: + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) bindata (2.4.10) builder (3.2.4) concurrent-ruby (1.1.9) connection_pool (2.2.5) + declarative (0.0.20) faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -57,20 +67,39 @@ GEM faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) + google-apis-compute_v1 (0.21.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-core (0.4.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - json (2.6.1) + googleauth (0.16.2) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.14) + httpclient (2.8.3) json (2.6.1-java) + jwt (2.3.0) + memoist (0.16.2) + mini_mime (1.1.2) + multi_json (1.15.0) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) net-ldap (0.17.0) - nio4r (2.5.8) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) - nokogiri (1.12.5-x86_64-linux) - racc (~> 1.4) opentelemetry-api (0.17.0) opentelemetry-common (0.17.0) opentelemetry-api (~> 0.17.0) @@ -99,13 +128,12 @@ GEM opentelemetry-common (~> 0.17.0) opentelemetry-instrumentation-base (~> 0.17.0) optimist (3.0.1) + os (1.1.4) pickup (0.0.11) prometheus-client (2.1.0) - puma (5.5.2) - nio4r (~> 2.0) + public_suffix (4.0.6) puma (5.5.2-java) nio4r (~> 2.0) - racc (1.6.0) racc (1.6.0-java) rack (2.2.3) rack-protection (2.1.0) @@ -117,7 +145,18 @@ GEM nokogiri (~> 1.10) optimist (~> 3.0) redis (4.5.1) + representable (3.1.1) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) ruby2_keywords (0.0.5) + signet (0.16.0) + addressable (~> 2.8) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) sinatra (2.1.0) mustermann (~> 1.0) rack (~> 2.2) @@ -128,14 +167,17 @@ GEM statsd-ruby (1.5.0) thrift (0.15.0) tilt (2.0.10) + trailblazer-option (0.1.2) + uber (0.1.0) + webrick (1.7.0) PLATFORMS universal-java-1.8 - x86_64-linux DEPENDENCIES vmpooler! - vmpooler-vsphere-provider! + vmpooler-provider-gce! + vmpooler-provider-vsphere! BUNDLED WITH 2.2.32 From b0fe46435f316baa20a55adaf9b7049e0cf27edc Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 7 Dec 2021 10:47:21 -0500 Subject: [PATCH 2/2] Run bundle update too, print exit code This modifies the update script so that it explicitly runs 'bundle update' in addition to 'bundle install' and makes the last step to be printing of the exit code. --- docker/test-all-providers/update-gemfile-lock.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/test-all-providers/update-gemfile-lock.sh b/docker/test-all-providers/update-gemfile-lock.sh index a148d6c..064103b 100755 --- a/docker/test-all-providers/update-gemfile-lock.sh +++ b/docker/test-all-providers/update-gemfile-lock.sh @@ -3,4 +3,4 @@ docker run -it --rm \ -v $(pwd):/app \ $(grep ^FROM ./Dockerfile |cut -d ' ' -f2) \ - /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make && cd /app && gem install bundler && bundle install --jobs 3' + /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'