Skip to content

Commit 5e330a7

Browse files
author
Joseph Palermo
committed
bbr can be deployed on a different VM from the postgres job, so it cannot depend on the files from the postgres job
1 parent bbe4c19 commit 5e330a7

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

jobs/bbr-postgres-db/spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ packages:
1818
- postgres-13
1919
- postgres-15
2020
- postgres-16
21-
- postgres-yq-4
2221

2322
consumes:
2423
- name: database

jobs/bbr-postgres-db/templates/config.sh.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ end
2424
%>
2525

2626
JOB_DIR="/var/vcap/jobs/bbr-postgres-db"
27-
current_version=postgres-$(MAJOR_VERSION=<%=p('postgres.version')%> ${JOB_DIR}/packages/postgres-yq-4/bin/yq '.postgresql.major_version[env(MAJOR_VERSION)].minor_version' /var/vcap/jobs/postgres/config/used_postgresql_versions.yml)
2827

29-
PACKAGE_DIR="/var/vcap/packages/${current_version%.*}"
28+
PACKAGE_DIR="/var/vcap/packages/postgres-<%= p('postgres.version') %>"
3029
PORT="<%= port %>"
3130
DATABASES=(<%= databases.map{|d| d["name"]}.join(' ')%>)
3231
DBHOST=<%= dbhost %>

0 commit comments

Comments
 (0)