bbr can be deployed on a different VM from the postgres job, so it ca…

…nnot depend on the files from the postgres job
cloudfoundry · May 25, 2024 · 5e330a7 · 5e330a7
1 parent bbe4c19
commit 5e330a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/jobs/bbr-postgres-db/spec b/jobs/bbr-postgres-db/spec
@@ -18,7 +18,6 @@ packages:
   - postgres-13
   - postgres-15
   - postgres-16
-  - postgres-yq-4
 
 consumes:
 - name: database

diff --git a/jobs/bbr-postgres-db/templates/config.sh.erb b/jobs/bbr-postgres-db/templates/config.sh.erb
@@ -24,9 +24,8 @@ end
  %>
 
 JOB_DIR="/var/vcap/jobs/bbr-postgres-db"
-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)
 
-PACKAGE_DIR="/var/vcap/packages/${current_version%.*}"
+PACKAGE_DIR="/var/vcap/packages/postgres-<%= p('postgres.version') %>"
 PORT="<%= port %>"
 DATABASES=(<%= databases.map{|d| d["name"]}.join(' ')%>)
 DBHOST=<%= dbhost %>