From 300340312dfd2d083a8e603fda42a7be948b750b Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 14 Sep 2022 15:06:21 -0400 Subject: [PATCH] Updating azure CPI to ruby 3.1.2 Signed-off-by: Shwetha Gururaj --- .final_builds/packages/ruby-3.1/index.yml | 6 ++++++ jobs/azure_cpi/spec | 2 +- jobs/azure_cpi/templates/cpi.erb | 2 +- packages/bosh_azure_cpi/packaging | 2 +- packages/bosh_azure_cpi/spec | 2 +- packages/ruby-3.1.0-r0.81.0/spec.lock | 2 -- packages/ruby-3.1/spec.lock | 2 ++ 7 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 .final_builds/packages/ruby-3.1/index.yml delete mode 100644 packages/ruby-3.1.0-r0.81.0/spec.lock create mode 100644 packages/ruby-3.1/spec.lock diff --git a/.final_builds/packages/ruby-3.1/index.yml b/.final_builds/packages/ruby-3.1/index.yml new file mode 100644 index 000000000..f3452b4fe --- /dev/null +++ b/.final_builds/packages/ruby-3.1/index.yml @@ -0,0 +1,6 @@ +builds: + 0aaa829929c32f6bcf3e51f82c37ba0535a8007870f86fe699cd194b077dbb96: + version: 0aaa829929c32f6bcf3e51f82c37ba0535a8007870f86fe699cd194b077dbb96 + blobstore_id: 72443c57-4eaa-4e4d-564c-17b3e925a24c + sha1: sha256:0797af077aaf7861e0f552ec0cd78457988eb51ef2d87ca6f45ef12eaa32ebc5 +format-version: "2" diff --git a/jobs/azure_cpi/spec b/jobs/azure_cpi/spec index 733b0ab13..4f9991db9 100644 --- a/jobs/azure_cpi/spec +++ b/jobs/azure_cpi/spec @@ -8,7 +8,7 @@ templates: service_principal_certificate.pem.erb: config/service_principal_certificate.pem packages: -- ruby-3.1.0-r0.81.0 +- ruby-3.1 - bosh_azure_cpi properties: diff --git a/jobs/azure_cpi/templates/cpi.erb b/jobs/azure_cpi/templates/cpi.erb index d4cfc9a73..6ff93086f 100644 --- a/jobs/azure_cpi/templates/cpi.erb +++ b/jobs/azure_cpi/templates/cpi.erb @@ -3,7 +3,7 @@ set -e BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages} -source ${BOSH_PACKAGES_DIR}/ruby-3.1.0-r0.81.0/bosh/runtime.env +source ${BOSH_PACKAGES_DIR}/ruby-3.1/bosh/runtime.env BOSH_JOBS_DIR=${BOSH_JOBS_DIR:-/var/vcap/jobs} export HOME=~ diff --git a/packages/bosh_azure_cpi/packaging b/packages/bosh_azure_cpi/packaging index 502075b8d..c29901206 100644 --- a/packages/bosh_azure_cpi/packaging +++ b/packages/bosh_azure_cpi/packaging @@ -4,7 +4,7 @@ set -e -x BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages} -source "${BOSH_PACKAGES_DIR}/ruby-3.1.0-r0.81.0/bosh/compile.env" +source "${BOSH_PACKAGES_DIR}/ruby-3.1/bosh/compile.env" cp -a bosh_azure_cpi/* "${BOSH_INSTALL_TARGET}" diff --git a/packages/bosh_azure_cpi/spec b/packages/bosh_azure_cpi/spec index 71e142f63..f5670c337 100644 --- a/packages/bosh_azure_cpi/spec +++ b/packages/bosh_azure_cpi/spec @@ -1,7 +1,7 @@ --- name: bosh_azure_cpi dependencies: -- ruby-3.1.0-r0.81.0 +- ruby-3.1 files: - bosh_azure_cpi/Gemfile - bosh_azure_cpi/Gemfile.lock diff --git a/packages/ruby-3.1.0-r0.81.0/spec.lock b/packages/ruby-3.1.0-r0.81.0/spec.lock deleted file mode 100644 index 2e25df8e4..000000000 --- a/packages/ruby-3.1.0-r0.81.0/spec.lock +++ /dev/null @@ -1,2 +0,0 @@ -name: ruby-3.1.0-r0.81.0 -fingerprint: 9cf1a9582c595fd03eb9c73cd3c4b2d10de10c139f99ab0b9d1a71e5d2b91378 diff --git a/packages/ruby-3.1/spec.lock b/packages/ruby-3.1/spec.lock new file mode 100644 index 000000000..afa5b2dab --- /dev/null +++ b/packages/ruby-3.1/spec.lock @@ -0,0 +1,2 @@ +name: ruby-3.1 +fingerprint: 0aaa829929c32f6bcf3e51f82c37ba0535a8007870f86fe699cd194b077dbb96