From ffdbefaedf45b3805ee78db05d2ecf9de5603e3d Mon Sep 17 00:00:00 2001 From: Ayumu Ueha Date: Wed, 8 Feb 2023 16:01:16 +0000 Subject: [PATCH] Stabilize sol-kubernetes-v2 job The following test at sol-kubernetes-v2 takes longer. ``` tacker.tests.functional.sol_kubernetes_v2.test_vnflcm_basic .VnfLcmKubernetesTest.test_basic_lcms_max [830.095575s] ... ok ``` This occurs because the service takes a long time to delete. If it takes more longer, the test will fail. This patch changes the following to stabilize sol-kubernetes-v2 job. * Set ``service.type`` to ``NodePort`` of service manifest file to reduce the time it takes to complete the deletion of resources. And also change ``service.type`` to ``NodePort`` along with the other manifest files. Change-Id: Ib04cbbbf08a4e0b62d9b6d55b58593757d01a569 --- .../test_cnf/Files/kubernetes/replicaset_service_secret.yaml | 4 ++-- .../etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta | 2 +- .../contents/Files/kubernetes/replicaset_service_secret.yaml | 4 ++-- .../contents/TOSCA-Metadata/TOSCA.meta | 2 +- .../sample2/Files/kubernetes/replicaset_service_secret.yaml | 4 ++-- .../sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta | 2 +- .../kubernetes/kubernetes_api_resource/service.yaml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/replicaset_service_secret.yaml b/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/replicaset_service_secret.yaml index ab3ea9d90..07a2402a7 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/replicaset_service_secret.yaml +++ b/tacker/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/replicaset_service_secret.yaml @@ -14,7 +14,7 @@ spec: targetPort: 8080 selector: app: webserver - type: ClusterIP + type: NodePort --- apiVersion: v1 data: @@ -48,4 +48,4 @@ spec: valueFrom: secretKeyRef: key: param0 - name: curry-sc-multiple \ No newline at end of file + name: curry-sc-multiple diff --git a/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta b/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta index a049e1aa3..7e5c7946a 100644 --- a/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta @@ -96,7 +96,7 @@ Hash: 6c97b1a8fc8d21a6a9e7ab1c383b49d3ec31f79a83de218f5537d18531ddfbd8 Name: Files/kubernetes/replicaset_service_secret.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 7d83ba61def65be3203b164b496057e4d062249804df82eba1831111cc4614a0 +Hash: 2e0960be98c5c189ee74cd0044b20de737c484c95ef6be5277535ab4138e987c Name: Files/kubernetes/resource-quota.yaml Content-Type: test-data diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/replicaset_service_secret.yaml b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/replicaset_service_secret.yaml index a669a05e5..dec74af33 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/replicaset_service_secret.yaml +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/Files/kubernetes/replicaset_service_secret.yaml @@ -14,7 +14,7 @@ spec: targetPort: 8080 selector: app: webserver - type: ClusterIP + type: NodePort --- apiVersion: v1 data: @@ -53,4 +53,4 @@ spec: valueFrom: secretKeyRef: key: param0 - name: curry-sc-multiple \ No newline at end of file + name: curry-sc-multiple diff --git a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta index 744f31dcc..a979859cd 100644 --- a/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/functional/sol_kubernetes_v2/samples/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta @@ -101,7 +101,7 @@ Hash: 766f27b71a25922a95f847a1b490bf80c3a1a00a2574dee058555602e4da0555 Name: Files/kubernetes/replicaset_service_secret.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 848537a1bb84053cf179a169d0b05036a79637bc234128908dce6c0d5d2abbdb +Hash: d964122bc33733aaa138c028180385d543a474c1dacba7f3395e096aaeb1d9b4 Name: Files/kubernetes/resource-quota.yaml Content-Type: test-data diff --git a/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/replicaset_service_secret.yaml b/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/replicaset_service_secret.yaml index 8a16f321f..d20c071e5 100644 --- a/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/replicaset_service_secret.yaml +++ b/tacker/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/replicaset_service_secret.yaml @@ -14,7 +14,7 @@ spec: targetPort: 8080 selector: app: webserver - type: ClusterIP + type: NodePort --- apiVersion: v1 data: @@ -48,4 +48,4 @@ spec: valueFrom: secretKeyRef: key: param0 - name: curry-sc-multiple \ No newline at end of file + name: curry-sc-multiple diff --git a/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta b/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta index 32b693abf..db1fbbad5 100644 --- a/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta +++ b/tacker/tests/unit/sol_refactored/samples/sample2/TOSCA-Metadata/TOSCA.meta @@ -96,7 +96,7 @@ Hash: 6c97b1a8fc8d21a6a9e7ab1c383b49d3ec31f79a83de218f5537d18531ddfbd8 Name: Files/kubernetes/replicaset_service_secret.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 7d83ba61def65be3203b164b496057e4d062249804df82eba1831111cc4614a0 +Hash: 0b19a45148f284ced24f34f3a387cb7e6358840d333f4027897060ed90283588 Name: Files/kubernetes/resource-quota.yaml Content-Type: test-data diff --git a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/service.yaml b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/service.yaml index 8f93453e9..3fdd8c54b 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/service.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/service.yaml @@ -13,4 +13,4 @@ spec: targetPort: 8080 selector: app: webserver - type: ClusterIP + type: NodePort