fix: Adjust the setup

cloudfoundry · May 19, 2024 · f58e208 · f58e208
1 parent 76be3d4
commit f58e208
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/ci/tasks/bump-postgres-packages/task.sh b/ci/tasks/bump-postgres-packages/task.sh
@@ -21,7 +21,7 @@ pushd postgres-release
   if ${NEED_COMMIT}; then
     echo "-----> $(date): Update the PostgreSQL version inside the used_postgresql_versions.yml file"
     current_minor_version=$(cat config/blobs.yml  | grep "postgresql-${MAJOR_VERSION}" | cut -f1 -d: | sed "s/postgres\/postgresql-//g" | sed "s/.tar.gz//g")
-    CURRENT_MINOR_VERSION=$current_minor_version /tmp/yq -i '.postgresql.major_version[env(MAJOR_VERSION)].minor_version = strenv(CURRENT_MINOR_VERSION)' jobs/postgres/used_postgresql_versions.yml
+    CURRENT_MINOR_VERSION=$current_minor_version /tmp/yq -i '.postgresql.major_version[env(MAJOR_VERSION)].minor_version = strenv(CURRENT_MINOR_VERSION)' jobs/postgres/config/used_postgresql_versions.yml
 
     echo "-----> $(date): Creating git commit"
     git config user.name "$GIT_USER_NAME"

diff --git a/ci/tasks/create-final-release/task.sh b/ci/tasks/create-final-release/task.sh
@@ -14,8 +14,8 @@ curl -s -L https://github.com/mikefarah/yq/releases/download/v${latest_yq_versio
 bosh -n create-release --final
 new_release_version="$(find releases -regex ".*postgres-[0-9]*.yml" | egrep -o "[0-9]+" | sort -n | tail -n 1)"
 
-current_major_version=$(/tmp/yq '.postgresql.default' jobs/postgres/used_postgresql_versions.yml)
-current_minor_version=$(CURRENT_MAJOR_VERSION=$current_major_version /tmp/yq '.postgresql.major_version[env(CURRENT_MAJOR_VERSION)].minor_version' jobs/postgres/used_postgresql_versions.yml)
+current_major_version=$(/tmp/yq '.postgresql.default' jobs/postgres/config/used_postgresql_versions.yml)
+current_minor_version=$(CURRENT_MAJOR_VERSION=$current_major_version /tmp/yq '.postgresql.major_version[env(CURRENT_MAJOR_VERSION)].minor_version' jobs/postgres/config/used_postgresql_versions.yml)
 sed -i "/^versions:/a\ \ ${new_release_version}: \"PostgreSQL ${current_minor_version}\"" versions.yml
 git add versions.yml
 

diff --git a/ci/tasks/run-acceptance-tests/task.sh b/ci/tasks/run-acceptance-tests/task.sh
@@ -52,8 +52,8 @@ function main() {
   install_bbr
   upload_release
   bosh upload-stemcell stemcell/stemcell.tgz
-  current_major_version=$(/tmp/yq '.postgresql.default' jobs/postgres/used_postgresql_versions.yml)
-  current_minor_version=$(CURRENT_MAJOR_VERSION=$current_major_version /tmp/yq '.postgresql.major_version[env(CURRENT_MAJOR_VERSION)].minor_version' jobs/postgres/used_postgresql_versions.yml)
+  current_major_version=$(/tmp/yq '.postgresql.default' jobs/postgres/config/used_postgresql_versions.yml)
+  current_minor_version=$(CURRENT_MAJOR_VERSION=$current_major_version /tmp/yq '.postgresql.major_version[env(CURRENT_MAJOR_VERSION)].minor_version' jobs/postgres/config/used_postgresql_versions.yml)
   echo "current_version=${current_minor_version}" > ${root}/pgconfig.sh
   source ${root}/pgconfig.sh
   config_file="${root}/pgats_config.yml"

diff --git a/jobs/bbr-postgres-db/templates/config.sh.erb b/jobs/bbr-postgres-db/templates/config.sh.erb
@@ -23,9 +23,9 @@ end
 
  %>
 
-current_version=postgres-$(MAJOR_VERSION=<%=p('databases.version')%> ${JOB_DIR}/packages/yq-4/bin/yq '.postgresql.major_version[env(MAJOR_VERSION)].minor_version' /var/vcap/jobs/postgres/used_postgresql_versions.yml)
+current_version=postgres-$(MAJOR_VERSION=<%=p('databases.version')%> ${JOB_DIR}/packages/yq-4/bin/yq '.postgresql.major_version[env(MAJOR_VERSION)].minor_version' /var/vcap/jobs/postgres/config/used_postgresql_versions.yml)
 JOB_DIR="/var/vcap/jobs/bbr-postgres-db"
-PACKAGE_DIR="/var/vcap/packages/${current_version}"
+PACKAGE_DIR="/var/vcap/packages/${current_version%.*}"
 PORT="<%= port %>"
 DATABASES=(<%= databases.map{|d| d["name"]}.join(' ')%>)
 DBHOST=<%= dbhost %>

diff --git a/jobs/postgres/spec b/jobs/postgres/spec
@@ -24,6 +24,7 @@ templates:
   hooks/postgres-pre-stop.sh.erb: bin/hooks/postgres-pre-stop.sh
   hooks/postgres-post-start.sh.erb: bin/hooks/postgres-post-start.sh
   hooks/postgres-post-stop.sh.erb: bin/hooks/postgres-post-stop.sh
+  used_postgresql_versions.yml: config/used_postgresql_versions.yml
 
 packages:
   - postgres-common

diff --git a/jobs/postgres/templates/pgconfig.sh.erb b/jobs/postgres/templates/pgconfig.sh.erb
@@ -8,9 +8,9 @@ ENABLE_TRACE=0
 <% end %>
 JOB_DIR=/var/vcap/jobs/postgres
 current_version="<%=p('databases.version')%>"
-pgversion_current=postgres-$(MAJOR_VERSION=<%=p('databases.version')%> ${JOB_DIR}/packages/yq-4/bin/yq '.postgresql.major_version[env(MAJOR_VERSION)].minor_version' /var/vcap/jobs/postgres/used_postgresql_versions.yml)
+pgversion_current=postgres-$(MAJOR_VERSION=<%=p('databases.version')%> ${JOB_DIR}/packages/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/${pgversion_current}"
+PACKAGE_DIR="/var/vcap/packages/${pgversion_current%.*}"
 STORE_DIR=/var/vcap/store
 PG_STORE_DIR=${STORE_DIR}/postgres
 VERSION_FILE=${PG_STORE_DIR}/POSTGRES_DATA_VERSION

diff --git a/jobs/postgres/used_postgresql_versions.yml → ...es/templates/used_postgresql_versions.yml b/jobs/postgres/used_postgresql_versions.yml → ...es/templates/used_postgresql_versions.yml
diff --git a/packages/yq-4/packaging b/packages/yq-4/packaging
@@ -9,7 +9,7 @@ function install() {
 
   echo "Install yq..."
   mkdir -p "${BOSH_INSTALL_TARGET}/bin"
-  cp -a yq/yq-4-* "${BOSH_INSTALL_TARGET}/bin/yq"
+  cp -a yq/yq-4.* "${BOSH_INSTALL_TARGET}/bin/yq"
   chmod +x "${BOSH_INSTALL_TARGET}/bin/yq"
 
 }