ci: fix pgats configuration

valeriap · valeriap · commit 7a2c9d81712b · 2020-08-13T14:22:52.000+02:00
diff --git a/ci/pipelines/acceptance-tests.yml b/ci/pipelines/acceptance-tests.yml
@@ -9,20 +9,20 @@ jobs:
 - name: run-acceptance-tests
   serial_groups: [pgats]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: postgres-release
       resource: postgres-release-develop
       trigger: true
   - task: create-postgres-dev-release-tarball
     file: postgres-release/ci/scripts/create-dev-release-tarball/task.yml
     input_mapping: {dev-release: postgres-release}
     output_mapping: {dev-release-tarball: postgres-tarball}
-    params: &bosh1_params
-      BOSH_DIRECTOR_IP: {{bosh1_director}}
-      BOSH_DIRECTOR_NAME: {{bosh1_director}}
-      BOSH_CLIENT: {{bosh1_user}}
-      BOSH_CLIENT_SECRET: {{bosh1_password}}
-      BOSH_CA_CERT: {{bosh1_ca_cert}}
+    params: &bosh2_params
+      BOSH_DIRECTOR_IP: {{bosh2_director}}
+      BOSH_DIRECTOR_NAME: {{bosh2_director_name}}
+      BOSH_CLIENT: {{bosh2_user}}
+      BOSH_CLIENT_SECRET: {{bosh2_password}}
+      BOSH_CA_CERT: {{bosh2_ca_cert}}
       REL_NAME: postgres
       REL_VERSION: v99+dev.1
       BBR_VERSION: 1.3.2
@@ -32,17 +32,17 @@ jobs:
     file: postgres-release/ci/scripts/upload-dev-release-tarball/task.yml
     input_mapping: {dev-release-tarball: postgres-tarball}
     params:
-      <<: *bosh1_params
+      <<: *bosh2_params
   - task: upload-stemcell
     file: postgres-release/ci/scripts/upload-stemcell/task.yml
     params:
-      <<: *bosh1_params
+      <<: *bosh2_params
   - task: run-acceptance-tests
     file: postgres-release/ci/scripts/run-acceptance-tests/task.yml
     params:
-      <<: *bosh1_params
+      <<: *bosh2_params
     ensure:
       task: delete-postgres-dev-release
       file: postgres-release/ci/scripts/run-bosh-delete-release/task.yml
       params:
-        <<: *bosh1_params
+        <<: *bosh2_params
diff --git a/ci/pipelines/cf-deployment.yml b/ci/pipelines/cf-deployment.yml
@@ -39,7 +39,7 @@ jobs:
 - name: upload-stemcells-releases
   serial_groups: [cf]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: postgres-release
       resource: postgres-release-develop
     - get: cf-deployment
@@ -82,7 +82,7 @@ jobs:
 - name: deploy-fresh-cf
   serial_groups: [cf]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: cf-deployment
       resource: cf-deployment-rc
     - get: postgres-release
@@ -98,7 +98,7 @@ jobs:
 - name: test-fresh-run-cats
   serial_groups: [cf]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: cf-acceptance-tests
     - get: cf-deployment-concourse-tasks
     - get: postgres-release
@@ -122,7 +122,7 @@ jobs:
 - name: delete-deployment-fresh
   serial_groups: [cf]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: postgres-release
       resource: postgres-release-develop
       passed: [test-fresh-run-cats]
@@ -135,7 +135,7 @@ jobs:
 - name: test-old-deployment
   serial_groups: [cf]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: cf-deployment-old
     - get: cf-deployment-rc
     - get: postgres-release
@@ -167,7 +167,7 @@ jobs:
 - name: delete-deployment-old
   serial_groups: [cf]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: postgres-release
       resource: postgres-release-develop
       passed: [test-old-deployment]
@@ -180,7 +180,7 @@ jobs:
 - name: cleanup-releases
   serial_groups: [cf]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: postgres-release
       resource: postgres-release-develop
       passed: [delete-deployment-old]
diff --git a/ci/pipelines/cleanup.yml b/ci/pipelines/cleanup.yml
@@ -9,7 +9,7 @@ jobs:
 - name: delete-cf-deployment
   serial_groups: [cleanup]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: postgres-release
       resource: postgres-release
   - task: delete-cf-deployment
@@ -24,7 +24,7 @@ jobs:
 - name: cleanup-resources
   serial_groups: [cleanup]
   plan:
-  - aggregate:
+  - in_parallel:
     - get: postgres-release
       resource: postgres-release
       passed: [delete-cf-deployment]
diff --git a/ci/scripts/run-acceptance-tests/task.sh b/ci/scripts/run-acceptance-tests/task.sh
@@ -3,14 +3,16 @@
 root="${PWD}"
 
 function create_config_file() {
-  indented_cert=$(echo "$BOSH_CA_CERT" | awk '$0="    "$0')
+  indented_cert=$(echo "$BOSH_CA_CERT" | awk '$0="      "$0')
   cat <<EOF
 ---
 bosh:
   target: $BOSH_DIRECTOR_IP
-  username: $BOSH_CLIENT
-  password: $BOSH_CLIENT_SECRET
-  director_ca_cert: |+
+  use_uaa: true
+  credentials:
+    client: $BOSH_CLIENT
+    client_secret: $BOSH_CLIENT_SECRET
+    ca_cert: |+
 $indented_cert
 cloud_configs:
   default_vm_type: "pgats"
diff --git a/jobs/postgres/spec b/jobs/postgres/spec
@@ -123,7 +123,7 @@ properties:
       Format for timestamp in component logs.
       This includes pre-start, postgres_ctl, pg_janitor_ctl, janitor, and hooks; PostgreSQL logs are not included.
       Valid values are 'rfc3339', and 'deprecated'."
-      'rfc3339' is the recommended format.ormat, which is human readable.
+      'rfc3339' is the recommended format, which is human readable.
       'deprecated' will result in all timestamps being in the format they were before the rfc3339 flag was introduced.
     default: "rfc3339"
   janitor.script:
