Merge branch 'issue-33' of github.com:nmasse-itix/threescale-cicd into issue-33

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:

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:

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:

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:

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:

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:

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: