From bbfc72d5fbb6c8c13a2b11525a3f05be954a1448 Mon Sep 17 00:00:00 2001 From: Shubham Shukla Date: Tue, 12 Sep 2023 16:02:56 +0530 Subject: [PATCH] Integration Test namespace changes --- tests/integration/integration_config.yml | 8 ++++---- .../targets/it_certificate_authority/tasks/main.yml | 10 +++++----- .../targets/it_endorsing_organization/tasks/main.yml | 4 ++-- .../it_external_ordering_service/tasks/main.yml | 6 +++--- .../targets/it_ordering_organization/tasks/main.yml | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/integration/integration_config.yml b/tests/integration/integration_config.yml index 58809e7d..c5e90fd9 100644 --- a/tests/integration/integration_config.yml +++ b/tests/integration/integration_config.yml @@ -2,12 +2,12 @@ # SPDX-License-Identifier: Apache-2.0 # --- -api_endpoint: https://ibp-console.example.org:32000 +api_endpoint: https://ibm-hlfsupport-project-ibm-hlfsupport-console-console.sre-shubham-ocp-dal-b3c-4-68e10f583f026529fe7a89da40169ef4-0000.us-south.containers.appdomain.cloud:443 api_authtype: basic -api_key: xxxxxxxx -api_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +api_key: shubham.shukla3@ibm.com +api_secret: Shubham@1234 api_timeout: 60 -k8s_namespace: ibp +k8s_namespace: ibm-hlfsupport-project test_run_id: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx short_test_run_id: xxxxxxxx wait_timeout: 600 diff --git a/tests/integration/targets/it_certificate_authority/tasks/main.yml b/tests/integration/targets/it_certificate_authority/tasks/main.yml index 8080bf67..60a528a8 100644 --- a/tests/integration/targets/it_certificate_authority/tasks/main.yml +++ b/tests/integration/targets/it_certificate_authority/tasks/main.yml @@ -35,7 +35,7 @@ - name: Run tests block: - name: Create certificate authority - hyperledger.fabric-ansible-collection.certificate_authority: + hyperledger.fabric_ansible_collection.certificate_authority: state: present <<: *ibp_connection_info name: "{{ ca_name }}" @@ -53,7 +53,7 @@ expected_storage_size: 20Gi - name: Ensure idempotency - hyperledger.fabric-ansible-collection.certificate_authority: + hyperledger.fabric_ansible_collection.certificate_authority: state: present <<: *ibp_connection_info name: "{{ ca_name }}" @@ -71,7 +71,7 @@ expected_storage_size: 20Gi - name: Change resources - hyperledger.fabric-ansible-collection.certificate_authority: + hyperledger.fabric_ansible_collection.certificate_authority: state: present <<: *ibp_connection_info name: "{{ ca_name }}" @@ -94,7 +94,7 @@ expected_storage_size: 20Gi - name: Ensure idempotency - hyperledger.fabric-ansible-collection.certificate_authority: + hyperledger.fabric_ansible_collection.certificate_authority: state: present <<: *ibp_connection_info name: "{{ ca_name }}" @@ -118,7 +118,7 @@ always: - name: Delete certificate authority - hyperledger.fabric-ansible-collection.certificate_authority: + hyperledger.fabric_ansible_collection.certificate_authority: state: absent <<: *ibp_connection_info name: "{{ ca_name }}" diff --git a/tests/integration/targets/it_endorsing_organization/tasks/main.yml b/tests/integration/targets/it_endorsing_organization/tasks/main.yml index 39602bac..9c3fa14f 100644 --- a/tests/integration/targets/it_endorsing_organization/tasks/main.yml +++ b/tests/integration/targets/it_endorsing_organization/tasks/main.yml @@ -19,7 +19,7 @@ block: - name: Create endorsing organization include_role: - name: hyperledger.fabric-ansible-collection.endorsing_organization + name: hyperledger.fabric_ansible_collection.endorsing_organization vars: state: present register: result @@ -27,6 +27,6 @@ always: - name: Delete endorsing organization include_role: - name: hyperledger.fabric-ansible-collection.endorsing_organization + name: hyperledger.fabric_ansible_collection.endorsing_organization vars: state: absent diff --git a/tests/integration/targets/it_external_ordering_service/tasks/main.yml b/tests/integration/targets/it_external_ordering_service/tasks/main.yml index ff7f74a6..cfde28ed 100644 --- a/tests/integration/targets/it_external_ordering_service/tasks/main.yml +++ b/tests/integration/targets/it_external_ordering_service/tasks/main.yml @@ -16,7 +16,7 @@ - name: Run tests block: - name: Import external ordering service - hyperledger.fabric-ansible-collection.external_ordering_service: + hyperledger.fabric_ansible_collection.external_ordering_service: state: present <<: *ibp_connection_info ordering_service: "{{ lookup('template', 'one_node_ordering_service.json.j2') }}" @@ -30,7 +30,7 @@ - result.ordering_service[0].name == ordering_service_name + '_1' - name: Ensure idempotency - hyperledger.fabric-ansible-collection.external_ordering_service: + hyperledger.fabric_ansible_collection.external_ordering_service: state: present <<: *ibp_connection_info ordering_service: "{{ lookup('template', 'one_node_ordering_service.json.j2') }}" @@ -45,7 +45,7 @@ always: - name: Remove external ordering service - hyperledger.fabric-ansible-collection.external_ordering_service: + hyperledger.fabric_ansible_collection.external_ordering_service: state: absent <<: *ibp_connection_info name: "{{ ordering_service_name }}" diff --git a/tests/integration/targets/it_ordering_organization/tasks/main.yml b/tests/integration/targets/it_ordering_organization/tasks/main.yml index 7373ee93..f00e23f0 100644 --- a/tests/integration/targets/it_ordering_organization/tasks/main.yml +++ b/tests/integration/targets/it_ordering_organization/tasks/main.yml @@ -20,7 +20,7 @@ block: - name: Create ordering organization include_role: - name: hyperledger.fabric-ansible-collection.ordering_organization + name: hyperledger.fabric_ansible_collection.ordering_organization vars: state: present register: result @@ -28,6 +28,6 @@ always: - name: Delete ordering organization include_role: - name: hyperledger.fabric-ansible-collection.ordering_organization + name: hyperledger.fabric_ansible_collection.ordering_organization vars: state: absent