fix packaging script

orange-cloudfoundry · Jan 16, 2020 · b800c92 · b800c92
1 parent fbf1194
commit b800c92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/jobs/boshupdate_exporter/spec b/jobs/boshupdate_exporter/spec
@@ -93,16 +93,6 @@ properties:
           - manifests/operators/enable-cf-route-registrar.yml
           - manifests/operators/use-sqlite3.yml
         matchers: [ "prometheus(-.*)?" ]
-      bosh:
-        owner: cloudfoundry
-        repo: bosh-deployment
-        manifest: bosh.yml
-        ops:
-          - vsphere/cpi.yml
-          - uaa.yml
-          - credhub.yml
-          - bbr.yml
-        matchers: [ "bosh(-.*)?" ]
   boshupdate_exporter.github.generic_releases:
     description: "Generic github releases configuration"
     default:
@@ -119,5 +109,5 @@ properties:
         owner: cloudfoundry
         repo: bosh-linux-stemcell-builder
         format:
-          match: "stable-([0-9+.]+)"
+          match: "ubuntu-xenial/v([0-9+.]+)"
           replace: "${1}"
diff --git a/packages/boshupdate_exporter/packaging b/packages/boshupdate_exporter/packaging
@@ -1,8 +1,8 @@
-#!/bin/bash -e
+#!/bin/bash -eu
 
 ostype=$(uname  | tr '[:upper:]' '[:lower:]')
-if [ -z "${BOSH_PACKAGES_DIR}" ]; then
-    pkg_dir=$(readlink -nf /var/vcap/packages/golang-1.12-${ostype})
+if [ -z "${BOSH_PACKAGES_DIR-}" ]; then
+  pkg_dir=$(readlink -nf /var/vcap/packages/golang-1.12-${ostype})
 else
   pkg_dir=${BOSH_PACKAGES_DIR}/golang-1.12-${ostype}
 fi