From f68c8f714d5597e2483ba82425543ad3d0527a80 Mon Sep 17 00:00:00 2001 From: Christian Roggia Date: Mon, 23 May 2022 16:21:22 +0200 Subject: [PATCH 1/2] test: add instance group for smoke tests --- manifests/scheduler.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/manifests/scheduler.yml b/manifests/scheduler.yml index 8be424d..5999754 100644 --- a/manifests/scheduler.yml +++ b/manifests/scheduler.yml @@ -18,6 +18,8 @@ params: deployment_type: cf # for crazy people using an non-"cf" cf deployment name core_network: (( vault meta.cf.exodus ":core_network" )) system_domain: (( vault meta.cf.exodus ":system_domain" )) + system_org: (( vault meta.cf.exodus ":system_org" )) + system_space: (( vault meta.cf.exodus ":system_space" )) network: (( grab params.cf.core_network )) nats: client_cert: (( vault meta.cf.exodus ":nats_client_cert" )) @@ -72,6 +74,26 @@ instance_groups: as: scheduler-postgres release: postgres +- name: smoke-tests + instances: 1 + azs: (( grab params.availability_zones || meta.default.azs )) + stemcell: default + networks: + - name: (( grab params.network || "default" )) + vm_type: (( grab params.vm_type || "default" )) + lifecycle: errand + + jobs: + - name: smoke-tests + release: scheduler-boshrelease + properties: + cf: + client_id: (( grab params.uaa.client_id )) + client_secret: (( grab params.uaa.client_secret )) + api: (( concat "https://api." params.cf.system_domain )) + organization: (( grab params.cf.system_org )) + space: (( grab params.cf.system_space )) + update: serial: false canaries: 1 From d8785deec712a02cd6239fed762eaafee7593b7c Mon Sep 17 00:00:00 2001 From: Christian Roggia Date: Tue, 24 May 2022 13:12:04 +0200 Subject: [PATCH 2/2] fix: use login credentials for smoke-tests --- manifests/scheduler.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/scheduler.yml b/manifests/scheduler.yml index 5999754..9420f5d 100644 --- a/manifests/scheduler.yml +++ b/manifests/scheduler.yml @@ -20,6 +20,8 @@ params: system_domain: (( vault meta.cf.exodus ":system_domain" )) system_org: (( vault meta.cf.exodus ":system_org" )) system_space: (( vault meta.cf.exodus ":system_space" )) + username: (( vault meta.cf.exodus ":system_username" )) + password: (( vault meta.cf.exodus ":system_password" )) network: (( grab params.cf.core_network )) nats: client_cert: (( vault meta.cf.exodus ":nats_client_cert" )) @@ -88,11 +90,11 @@ instance_groups: release: scheduler-boshrelease properties: cf: - client_id: (( grab params.uaa.client_id )) - client_secret: (( grab params.uaa.client_secret )) - api: (( concat "https://api." params.cf.system_domain )) + username: (( grab params.cf.username )) + password: (( grab params.cf.password )) + api: (( concat "https://api." params.cf.system_domain )) organization: (( grab params.cf.system_org )) - space: (( grab params.cf.system_space )) + space: (( grab params.cf.system_space )) update: serial: false