diff --git a/ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/paas/urls.py b/ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/paas/urls.py index f6b98ccb3..d3f03a6c5 100644 --- a/ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/paas/urls.py +++ b/ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/paas/urls.py @@ -12,4 +12,4 @@ def _localstack() -> bool: def api_registry() -> str: if _localstack(): return "http://localhost:9000" - return "https://api-registry.prod.api.platform.nhs.uk:9000" + return "https://api-registry.ptl.api.platform.nhs.uk:9000" diff --git a/ansible/roles/remove-old-pr-portal-apis/tasks/main.yml b/ansible/roles/remove-old-pr-portal-apis/tasks/main.yml index 9d6ec145d..b3081f9d4 100644 --- a/ansible/roles/remove-old-pr-portal-apis/tasks/main.yml +++ b/ansible/roles/remove-old-pr-portal-apis/tasks/main.yml @@ -1,15 +1,3 @@ -- name: list portals - uri: - url: "{{ portals_list_uri }}" - headers: - Authorization: "Bearer {{ APIGEE_ACCESS_TOKEN }}" - return_content: yes - register: portals - -- name: set portal_id - set_fact: - portal_id: "{{ portals.json.data[0].id }}" - - name: get apidocs uri: url: "{{ portals_base_uri }}/{{ portal_id }}/apidocs" diff --git a/ansible/roles/remove-old-pr-portal-apis/vars/main.yml b/ansible/roles/remove-old-pr-portal-apis/vars/main.yml index 0dd2ed2d0..437f6bf0a 100644 --- a/ansible/roles/remove-old-pr-portal-apis/vars/main.yml +++ b/ansible/roles/remove-old-pr-portal-apis/vars/main.yml @@ -1,3 +1,4 @@ portals_base_uri: "https://apigee.com/portals/api/sites" portals_list_uri: "{{ portals_base_uri }}?orgname={{ APIGEE_ORGANIZATION }}" +portal_id: "{{ APIGEE_ORGANIZATION }}-developerportal" retain_hours: "{{ (lookup('env', 'retain_hours') or 72) }}" diff --git a/azure/utils-pr-pipeline.yml b/azure/utils-pr-pipeline.yml index 02f7e6522..285a2ac39 100644 --- a/azure/utils-pr-pipeline.yml +++ b/azure/utils-pr-pipeline.yml @@ -103,12 +103,12 @@ jobs: displayName: Install utils pre-requisites - bash: | - poetry run ansible-test units --python=3.8 + ANSIBLE_FORCE_COLOR=yes poetry run ansible-test units --python=3.8 workingDirectory: ansible/collections/ansible_collections/nhsd/apigee displayName: Unit test ansible - bash: | - poetry run ansible-test integration --python=3.8 + ANSIBLE_FORCE_COLOR=yes poetry run ansible-test integration --python=3.8 workingDirectory: ansible/collections/ansible_collections/nhsd/apigee displayName: Integration test ansible