From 7d34d09d281082e26620c94a98ee89d768d1e543 Mon Sep 17 00:00:00 2001
From: aram price <aram.price@broadcom.com>
Date: Mon, 27 Apr 2026 13:54:29 -0700
Subject: [PATCH] Remove alias / duplicate `spec.yml` files

The bosh convention is `${JOB}/spec`.
---
 jobs/blobstore/spec.yml                       |  1 -
 jobs/director/spec.yml                        |  1 -
 jobs/health_monitor/spec.yml                  |  1 -
 jobs/nats/spec.yml                            |  1 -
 jobs/postgres-13/spec.yml                     | 34 ------------------
 jobs/postgres/spec.yml                        | 35 -------------------
 .../postgres_version_helper.rb                |  4 +--
 7 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 120000 jobs/blobstore/spec.yml
 delete mode 120000 jobs/director/spec.yml
 delete mode 120000 jobs/health_monitor/spec.yml
 delete mode 120000 jobs/nats/spec.yml
 delete mode 100644 jobs/postgres-13/spec.yml
 delete mode 100644 jobs/postgres/spec.yml

diff --git a/jobs/blobstore/spec.yml b/jobs/blobstore/spec.yml
deleted file mode 120000
index 15acefd8bbf..00000000000
--- a/jobs/blobstore/spec.yml
+++ /dev/null
@@ -1 +0,0 @@
-spec
\ No newline at end of file
diff --git a/jobs/director/spec.yml b/jobs/director/spec.yml
deleted file mode 120000
index 15acefd8bbf..00000000000
--- a/jobs/director/spec.yml
+++ /dev/null
@@ -1 +0,0 @@
-spec
\ No newline at end of file
diff --git a/jobs/health_monitor/spec.yml b/jobs/health_monitor/spec.yml
deleted file mode 120000
index 15acefd8bbf..00000000000
--- a/jobs/health_monitor/spec.yml
+++ /dev/null
@@ -1 +0,0 @@
-spec
\ No newline at end of file
diff --git a/jobs/nats/spec.yml b/jobs/nats/spec.yml
deleted file mode 120000
index 15acefd8bbf..00000000000
--- a/jobs/nats/spec.yml
+++ /dev/null
@@ -1 +0,0 @@
-spec
\ No newline at end of file
diff --git a/jobs/postgres-13/spec.yml b/jobs/postgres-13/spec.yml
deleted file mode 100644
index efc3d021b84..00000000000
--- a/jobs/postgres-13/spec.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: postgres-13
-
-templates:
-  bpm.yml: config/bpm.yml
-  pre-start.erb: bin/pre-start
-  create-database.erb: bin/create-database
-  postgres.erb: bin/postgres
-  postgresql.conf.erb: config/postgresql.conf
-
-packages:
-  - postgres-13
-
-properties:
-  postgres.user:
-    description: Username clients must use to access Postgres
-    default: bosh
-  postgres.password:
-    description: Password clients must use to access Postgres
-  postgres.listen_address:
-    description: IP address Postgres listens on; use 0.0.0.0 to listen on all IP addresses
-    default: 127.0.0.1
-  postgres.port:
-    description: TCP port Postgres listens on
-    default: 5432
-  postgres.database:
-    description: Default Postgres database (it will be created during the startup process)
-    default: bosh
-  postgres.additional_databases:
-    description: Additional Postgres databases to be created (during the startup process)
-    default: []
-  postgres.max_connections:
-    description: Set max concurrent connections for database
-    default: 200
diff --git a/jobs/postgres/spec.yml b/jobs/postgres/spec.yml
deleted file mode 100644
index 6938ef83029..00000000000
--- a/jobs/postgres/spec.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: postgres
-
-templates:
-  bpm.yml: config/bpm.yml
-  pre-start.erb: bin/pre-start
-  create-database.erb: bin/create-database
-  postgres.erb: bin/postgres
-  postgresql.conf.erb: config/postgresql.conf
-
-packages:
-  - postgres-15
-  - postgres-13
-
-properties:
-  postgres.user:
-    description: Username clients must use to access Postgres
-    default: bosh
-  postgres.password:
-    description: Password clients must use to access Postgres
-  postgres.listen_address:
-    description: IP address Postgres listens on; use 0.0.0.0 to listen on all IP addresses
-    default: 127.0.0.1
-  postgres.port:
-    description: TCP port Postgres listens on
-    default: 5432
-  postgres.database:
-    description: Default Postgres database (it will be created during the startup process)
-    default: bosh
-  postgres.additional_databases:
-    description: Additional Postgres databases to be created (during the startup process)
-    default: []
-  postgres.max_connections:
-    description: Set max concurrent connections for database
-    default: 200
diff --git a/src/spec/integration_support/postgres_version_helper.rb b/src/spec/integration_support/postgres_version_helper.rb
index 7e0c1cb2b18..4603305548a 100644
--- a/src/spec/integration_support/postgres_version_helper.rb
+++ b/src/spec/integration_support/postgres_version_helper.rb
@@ -8,7 +8,7 @@ def ensure_version_match!(env_db)
         return unless env_db == 'postgresql'
 
         unless local_major_version == release_major_version
-          raise "Postgres major version mismatch: jobs/postgres?spec.yml: #{local_version}; local: #{release_version}."
+          raise "Postgres major version mismatch: jobs/postgres/spec: #{local_version}; local: #{release_version}."
         end
       end
 
@@ -28,7 +28,7 @@ def release_version
         @release_version ||= begin
           postgres_release_config =
             YAML.load_file(
-              File.join(IntegrationSupport::Constants::BOSH_REPO_ROOT, 'jobs', 'postgres', 'spec.yml'),
+              File.join(IntegrationSupport::Constants::BOSH_REPO_ROOT, 'jobs', 'postgres', 'spec'),
               permitted_classes: [Symbol],
               aliases: true,
             )