From ae3c07b85331fbf31c7332aa04762f9d6d4f759e Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Thu, 11 Jul 2019 09:54:51 -0500 Subject: [PATCH] Ceph: Update default test pod timeout for provisioners This mvoes the default timeout for the ceph provisioners helm test pod to 600 seconds, as 120 seconds is fairly aggressive. This also adds the required --timeout flag to the helm test command in each job for the ceph provisioners, as well as adding the required helm test configuration to the armada-lma manifest Change-Id: I5a3b98de9132fe83cf09b1e5b3fcc513bd496650 Signed-off-by: Steve Wilkerson --- ceph-provisioners/values.yaml | 2 +- tools/deployment/armada/manifests/armada-lma.yaml | 3 +++ tools/deployment/multinode/035-ceph-ns-activate.sh | 2 +- tools/deployment/openstack-support/025-ceph-ns-activate.sh | 2 +- tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh | 2 +- tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 0f80389185..bab87f7c66 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -53,7 +53,7 @@ labels: pod: test_pod: - wait_timeout: 120 + wait_timeout: 600 rbd: name: rbd-prov-test-pod pvc_name: rbd-prov-test-pvc diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml index 6ac0db288d..79aeddcc79 100644 --- a/tools/deployment/armada/manifests/armada-lma.yaml +++ b/tools/deployment/armada/manifests/armada-lma.yaml @@ -61,6 +61,9 @@ data: chart_name: osh-infra-ceph-config release: osh-infra-ceph-config namespace: osh-infra + test: + enabled: true + timeout: 600 wait: timeout: 1800 labels: diff --git a/tools/deployment/multinode/035-ceph-ns-activate.sh b/tools/deployment/multinode/035-ceph-ns-activate.sh index b0c432b636..1a869334a4 100755 --- a/tools/deployment/multinode/035-ceph-ns-activate.sh +++ b/tools/deployment/multinode/035-ceph-ns-activate.sh @@ -51,4 +51,4 @@ helm upgrade --install ceph-osh-infra-config ./ceph-provisioners \ #NOTE: Validate Deployment info helm status ceph-osh-infra-config -helm test ceph-osh-infra-config +helm test ceph-osh-infra-config --timeout 600 diff --git a/tools/deployment/openstack-support/025-ceph-ns-activate.sh b/tools/deployment/openstack-support/025-ceph-ns-activate.sh index d758d802c9..10371488a2 100755 --- a/tools/deployment/openstack-support/025-ceph-ns-activate.sh +++ b/tools/deployment/openstack-support/025-ceph-ns-activate.sh @@ -50,7 +50,7 @@ helm upgrade --install ceph-openstack-config ./ceph-provisioners \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -helm test ceph-openstack-config +helm test ceph-openstack-config --timeout 600 #NOTE: Validate Deployment info kubectl get -n openstack jobs --show-all diff --git a/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh b/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh index c2d4c7e856..fe8a587146 100755 --- a/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh +++ b/tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh @@ -50,7 +50,7 @@ helm upgrade --install ceph-osh-infra-config ./ceph-provisioners \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -helm test ceph-osh-infra-config +helm test ceph-osh-infra-config --timeout 600 #NOTE: Validate Deployment info kubectl get -n osh-infra jobs --show-all diff --git a/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh b/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh index 61008023e6..e22d63b906 100755 --- a/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh +++ b/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh @@ -76,4 +76,4 @@ helm upgrade --install tenant-ceph-openstack-config ./ceph-provisioners \ #NOTE: Validate Deployment info helm status tenant-ceph-openstack-config -helm test tenant-ceph-openstack-config +helm test tenant-ceph-openstack-config --timeout 600