diff --git a/operations/test/README.md b/operations/test/README.md index 02b4e59b4c..f8b45b1f9f 100644 --- a/operations/test/README.md +++ b/operations/test/README.md @@ -18,5 +18,3 @@ They may change without notice. | [`enable-nfs-test-server.yml`](enable-nfs-test-server.yml) | adds an NFS server to the deployment | nfstestserver can be reached at nfstestserver.service.cf.internal for acceptance testing purposes | | [`enable-nfs-test-ldapserver.yml`](enable-nfs-test-ldapserver.yml) | Adds an LDAP server to the deployment to allow testing of NFS volume services configured with LDAP authentication | Requires enable-nfs-volume-service.yml and enable-nfs-test-server.yml. nfstestldapserver can be reached at nfstestldapserver.service.cf.internal | | [`enable-smb-test-server.yml`](enable-smb-test-server.yml) | adds an SMB server to the deployment | smbtestserver can be reached at smbtestserver.service.cf.internal for acceptance testing purposes | -| [`remove-logging-pipeline-with-danger.yml`](remove-logging-pipeline-with-danger.yml) | Remove logging pipeline v2 jobs. | | -| [`remove-logging-pipeline-with-danger-windows2019.yml`](remove-logging-pipeline-with-danger-windows2019.yml) | Remove logging pipeline v2 jobs from the Windows 2019 Diego Cell. | Requires `remove-logging-pipeline-with-danger.yml` | diff --git a/operations/test/remove-logging-pipeline-with-danger-windows2019.yml b/operations/test/remove-logging-pipeline-with-danger-windows2019.yml deleted file mode 100644 index e017c347ec..0000000000 --- a/operations/test/remove-logging-pipeline-with-danger-windows2019.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: replace - path: /instance_groups/name=windows2019-cell/jobs/name=prom_scraper_windows/properties/loggregator_agent? - value: - tls: - ca_cert: "((loggregator_tls_agent.ca))" - cert: "((loggregator_tls_agent.certificate))" - key: "((loggregator_tls_agent.private_key))" - -- type: remove - path: /instance_groups/name=windows2019-cell/jobs/name=loggregator_agent_windows? - -# update syslog agents -- type: replace - path: /addons/name=loggr-syslog-agent-windows2019/jobs/name=loggr-syslog-agent-windows/properties/drain_ca_cert? - value: "((log_cache_syslog_tls.ca))" diff --git a/operations/test/remove-logging-pipeline-with-danger.yml b/operations/test/remove-logging-pipeline-with-danger.yml deleted file mode 100644 index d1f89edd74..0000000000 --- a/operations/test/remove-logging-pipeline-with-danger.yml +++ /dev/null @@ -1,150 +0,0 @@ ---- -# Linux -- type: remove - path: /addons/name=loggregator_agent? - -- type: replace - path: /addons/name=prom_scraper/jobs/name=prom_scraper/properties/loggregator_agent? - value: - tls: - ca_cert: "((loggregator_tls_agent.ca))" - cert: "((loggregator_tls_agent.certificate))" - key: "((loggregator_tls_agent.private_key))" - -- type: remove - path: /instance_groups/name=log-api? - -- type: remove - path: /variables/name=loggregator_agent_metrics_tls? - -- type: remove - path: /instance_groups/name=scheduler/jobs/name=loggr-system-metric-scraper? - -- type: remove - path: /instance_groups/name=doppler? - -# metric-store is dependent on Loggregator, it won't work if the v2 firehose is disabled -- type: remove - path: /instance_groups/name=metric-store? - -- type: replace - path: /instance_groups/name=log-cache? - value: - name: log-cache - azs: - - z1 - - z2 - instances: 4 - vm_type: minimal - stemcell: default - networks: - - name: default - jobs: - - name: log-cache-syslog-server - release: log-cache - properties: - tls: - cert: "((log_cache_syslog_tls.certificate))" - key: "((log_cache_syslog_tls.private_key))" - metrics: - ca_cert: "((log_cache_syslog_server_metrics_tls.ca))" - cert: "((log_cache_syslog_server_metrics_tls.certificate))" - key: "((log_cache_syslog_server_metrics_tls.private_key))" - server_name: log_cache_syslog_server_metrics - - name: log-cache - provides: - log-cache: {shared: true} - properties: - metrics: - ca_cert: "((log_cache_metrics_tls.ca))" - cert: "((log_cache_metrics_tls.certificate))" - key: "((log_cache_metrics_tls.private_key))" - server_name: log_cache_metrics - health_addr: localhost:6060 - tls: - ca_cert: ((log_cache.ca)) - cert: ((log_cache.certificate)) - key: ((log_cache.private_key)) - release: log-cache - - name: log-cache-gateway - properties: - gateway_addr: localhost:8081 - proxy_cert: "((log_cache_proxy_tls.certificate))" - proxy_key: "((log_cache_proxy_tls.private_key))" - metrics: - ca_cert: "((log_cache_gateway_metrics_tls.ca))" - cert: "((log_cache_gateway_metrics_tls.certificate))" - key: "((log_cache_gateway_metrics_tls.private_key))" - server_name: log_cache_gateway_metrics - release: log-cache - - name: route_registrar - properties: - route_registrar: - routes: - - name: log-cache-reverse-proxy - port: 8083 - tls_port: 8083 - registration_interval: 20s - server_cert_domain_san: log-cache.((system_domain)) - uris: - - log-cache.((system_domain)) - - '*.log-cache.((system_domain))' - release: routing - - name: log-cache-cf-auth-proxy - properties: - metrics: - ca_cert: "((log_cache_cf_auth_proxy_metrics_tls.ca))" - cert: "((log_cache_cf_auth_proxy_metrics_tls.certificate))" - key: "((log_cache_cf_auth_proxy_metrics_tls.private_key))" - server_name: log_cache_cf_auth_proxy_metrics - cc: - ca_cert: ((cc_tls.ca)) - common_name: cloud-controller-ng.service.cf.internal - proxy_ca_cert: "((log_cache.ca))" - proxy_port: 8083 - external_cert: ((logcache_ssl.certificate)) - external_key: ((logcache_ssl.private_key)) - uaa: - ca_cert: ((uaa_ssl.ca)) - client_id: doppler - client_secret: ((uaa_clients_doppler_secret)) - internal_addr: https://uaa.service.cf.internal:8443 - release: log-cache - -# Variables -- type: replace - path: /variables/name=log_cache_syslog_tls? - value: - name: log_cache_syslog_tls - type: certificate - update_mode: converge - options: - ca: loggregator_ca - common_name: q-s3.log-cache.default.cf.bosh - alternative_names: - - q-s3.log-cache.default.cf.bosh - extended_key_usage: - - server_auth - -- type: replace - path: /variables/name=log_cache_syslog_server_metrics_tls? - value: - name: log_cache_syslog_server_metrics_tls - type: certificate - update_mode: converge - options: - ca: metric_scraper_ca - common_name: log_cache_syslog_server_metrics - alternative_names: - - log_cache_syslog_server_metrics - extended_key_usage: - - server_auth - -# update syslog agents -- type: replace - path: /instance_groups/name=scheduler/jobs/name=loggr-syslog-binding-cache/properties/aggregate_drains? - value: "syslog-tls://q-s3.log-cache.default.cf.bosh:6067" - -- type: replace - path: /addons/name=loggr-syslog-agent/jobs/name=loggr-syslog-agent/properties/drain_ca_cert? - value: "((log_cache_syslog_tls.ca))" diff --git a/units/tests/test_test/operations.yml b/units/tests/test_test/operations.yml index 760bae5376..58e3b1e5d4 100644 --- a/units/tests/test_test/operations.yml +++ b/units/tests/test_test/operations.yml @@ -22,7 +22,3 @@ enable-smb-test-server.yml: vars: - smb-password=FOO.PASS - smb-username=BAR.USER -remove-logging-pipeline-with-danger.yml: {} -remove-logging-pipeline-with-danger-windows2019.yml: - ops: - - ../windows2019-cell.yml