Skip to content

Commit

Permalink
Merge pull request #205 from cloudfoundry/packages-auto-update
Browse files Browse the repository at this point in the history
Bump packages
  • Loading branch information
s4heid authored Jun 19, 2019
2 parents 0d97e9b + d2ca392 commit 1f3127e
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .final_builds/packages/ruby-2.4.6-r0.11.0/index.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
builds:
a1e381b5031f05a5b7287d4ee8a14f5a2c0bd806c73597274b6dc3edcfc8ce2a:
version: a1e381b5031f05a5b7287d4ee8a14f5a2c0bd806c73597274b6dc3edcfc8ce2a
blobstore_id: 0f19922a-f5e5-448c-5ee8-2a56021736b0
sha1: sha256:fdf3bde0a3a604c7c70863b6c2f697489c4c689d355571a37bb55a750cf5cc24
format-version: "2"
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.4.6-r0.9.0
- ruby-2.4.6-r0.11.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.4.6-r0.9.0/bosh/runtime.env"
source "${BOSH_PACKAGES_DIR}/ruby-2.4.6-r0.11.0/bosh/runtime.env"
export HOME=~

export BUNDLE_GEMFILE=$BOSH_PACKAGES_DIR/bosh_openstack_cpi/Gemfile

bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.6-r0.9.0/bin/bundle"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.6-r0.11.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.4.6-r0.9.0/bosh/compile.env"
source "${BOSH_PACKAGES_DIR}/ruby-2.4.6-r0.11.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.4.6-r0.9.0/bin/bundle"
bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.6-r0.11.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.4.6-r0.9.0
- ruby-2.4.6-r0.11.0
files:
- bosh_openstack_cpi/Gemfile
- bosh_openstack_cpi/Gemfile.lock
Expand Down
2 changes: 2 additions & 0 deletions packages/ruby-2.4.6-r0.11.0/spec.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: ruby-2.4.6-r0.11.0
fingerprint: a1e381b5031f05a5b7287d4ee8a14f5a2c0bd806c73597274b6dc3edcfc8ce2a
2 changes: 0 additions & 2 deletions packages/ruby-2.4.6-r0.9.0/spec.lock

This file was deleted.

0 comments on commit 1f3127e

Please sign in to comment.