From 159c6ab78ab8769f741c3a7714aa6bbc83fbd4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Mon, 7 Jan 2019 14:37:14 +0100 Subject: [PATCH] see #33: use a different system_name for each test case to prevent side effects --- tests/3scale-saas-with-hosted-apicast-apikey.yml | 1 + tests/3scale-saas-with-hosted-apicast-multi-environment.yml | 2 +- tests/3scale-saas-with-hosted-apicast-oidc.yml | 1 + tests/3scale-saas-with-hosted-apicast-with-basePath.yml | 1 + tests/3scale-saas-with-hosted-apicast-with-cors-policy.yml | 3 ++- ...e-saas-with-hosted-apicast-with-smoketest-in-extra-vars.yml | 3 ++- tests/3scale-saas-with-hosted-apicast-without-smoketest.yml | 1 + 7 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/3scale-saas-with-hosted-apicast-apikey.yml b/tests/3scale-saas-with-hosted-apicast-apikey.yml index 594b9fc..fbecdcd 100644 --- a/tests/3scale-saas-with-hosted-apicast-apikey.yml +++ b/tests/3scale-saas-with-hosted-apicast-apikey.yml @@ -8,6 +8,7 @@ threescale_cicd_openapi_file_format: 'JSON' threescale_cicd_api_backend_hostname: echo-api.3scale.net threescale_cicd_openapi_smoketest_operation: GET_beer + threescale_cicd_api_base_system_name: beer_catalog_apikey tasks: # Test a first deployment - import_role: diff --git a/tests/3scale-saas-with-hosted-apicast-multi-environment.yml b/tests/3scale-saas-with-hosted-apicast-multi-environment.yml index da34296..7f45ea2 100644 --- a/tests/3scale-saas-with-hosted-apicast-multi-environment.yml +++ b/tests/3scale-saas-with-hosted-apicast-multi-environment.yml @@ -8,7 +8,7 @@ threescale_cicd_openapi_file_format: 'JSON' threescale_cicd_api_backend_hostname: echo-api.3scale.net threescale_cicd_openapi_smoketest_operation: GET_beer - threescale_cicd_api_base_system_name: beer_catalog + threescale_cicd_api_base_system_name: beer_catalog_envs tasks: # Deploy in DEV - import_role: diff --git a/tests/3scale-saas-with-hosted-apicast-oidc.yml b/tests/3scale-saas-with-hosted-apicast-oidc.yml index ba2633e..028c0b4 100644 --- a/tests/3scale-saas-with-hosted-apicast-oidc.yml +++ b/tests/3scale-saas-with-hosted-apicast-oidc.yml @@ -5,6 +5,7 @@ gather_facts: no vars: threescale_cicd_openapi_file: '{{ playbook_dir }}/api/echo-api-oidc.yaml' + threescale_cicd_api_base_system_name: echo_api_oidc tasks: # Test a first deployment - import_role: diff --git a/tests/3scale-saas-with-hosted-apicast-with-basePath.yml b/tests/3scale-saas-with-hosted-apicast-with-basePath.yml index dfb7ff4..0d114d9 100644 --- a/tests/3scale-saas-with-hosted-apicast-with-basePath.yml +++ b/tests/3scale-saas-with-hosted-apicast-with-basePath.yml @@ -5,6 +5,7 @@ gather_facts: no vars: threescale_cicd_openapi_file: '{{ playbook_dir }}/api/echo-api-with-basePath.yaml' + threescale_cicd_api_base_system_name: echo_api_with_basepath tasks: # Test a first deployment - import_role: diff --git a/tests/3scale-saas-with-hosted-apicast-with-cors-policy.yml b/tests/3scale-saas-with-hosted-apicast-with-cors-policy.yml index 6c9e5fe..055c222 100644 --- a/tests/3scale-saas-with-hosted-apicast-with-cors-policy.yml +++ b/tests/3scale-saas-with-hosted-apicast-with-cors-policy.yml @@ -1,12 +1,13 @@ --- -- name: Deploy the Echo API to a 3scale SaaS instance, with hosted APIcasts and no smoketests +- name: Deploy the Echo API to a 3scale SaaS instance, with hosted APIcasts and CORS hosts: threescale gather_facts: no vars: threescale_cicd_openapi_smoketest_operation: Echo threescale_cicd_apicast_policies_cors: yes threescale_cicd_openapi_file: '{{ playbook_dir }}/api/echo-api-bare.yaml' + threescale_cicd_api_base_system_name: echo_api_cors tasks: # Deploy the service - import_role: diff --git a/tests/3scale-saas-with-hosted-apicast-with-smoketest-in-extra-vars.yml b/tests/3scale-saas-with-hosted-apicast-with-smoketest-in-extra-vars.yml index 310ca6a..fdbc53e 100644 --- a/tests/3scale-saas-with-hosted-apicast-with-smoketest-in-extra-vars.yml +++ b/tests/3scale-saas-with-hosted-apicast-with-smoketest-in-extra-vars.yml @@ -1,11 +1,12 @@ --- -- name: Deploy the Echo API to a 3scale SaaS instance, with hosted APIcasts and no smoketests +- name: Deploy the Echo API to a 3scale SaaS instance, with hosted APIcasts and smoketests in extra vars hosts: threescale gather_facts: no vars: threescale_cicd_openapi_smoketest_operation: Echo threescale_cicd_openapi_file: '{{ playbook_dir }}/api/echo-api-bare.yaml' + threescale_cicd_api_base_system_name: echo_api_bare_extra tasks: # Deploy the service - import_role: diff --git a/tests/3scale-saas-with-hosted-apicast-without-smoketest.yml b/tests/3scale-saas-with-hosted-apicast-without-smoketest.yml index e79c6ba..07c0cfa 100644 --- a/tests/3scale-saas-with-hosted-apicast-without-smoketest.yml +++ b/tests/3scale-saas-with-hosted-apicast-without-smoketest.yml @@ -6,6 +6,7 @@ vars: # There is no "threescale_cicd_openapi_smoketest_operation" variable threescale_cicd_openapi_file: '{{ playbook_dir }}/api/echo-api-bare.yaml' + threescale_cicd_api_base_system_name: echo_api_no_smoketests tasks: # Deploy the service - import_role: