bf: Fix timeout not correctly being set

scality · Jul 27, 2018 · 4e6ba04 · 4e6ba04
1 parent 41fcca5
commit 4e6ba04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/eve/main.yml b/eve/main.yml
@@ -46,7 +46,6 @@ models:
       GCP_CRR_SRC_BUCKET_NAME: ci-zenko-gcp-crr-src-bucket
       GCP_MPU_BUCKET_NAME: ci-zenko-gcp-mpu-bucket
       GCP_MPU_BUCKET_NAME_2: ci-zenko-gcp-mpu-bucket-2
-      INSTALL_TIMEOUT: "600"
       MULTI_CRR_SRC_BUCKET: ci-zenko-multi-crr-src-bucket
       TRANSIENT_SRC_BUCKET: ci-zenko-transient-src-bucket
       ZENKO_ACCESS_KEY: HEYIMAACCESSKEY
@@ -66,6 +65,7 @@ models:
       ZENKO_HELM_RELEASE: 'zenko-test'
       ZENKO_K8S_NAMESPACE: '%(prop:testNamespace)s'
       TILLER_NAMESPACE: '%(prop:testNamespace)s'
+      INSTALL_TIMEOUT: "600"
 
   - env: &global_env # contains all env values
       <<: [*secrets_env, *docker_env, *k8s_env]

diff --git a/eve/workers/ci_env.sh b/eve/workers/ci_env.sh
@@ -57,6 +57,7 @@ FLAGS="\
 --$CLI_FLAG ${CI_PREFIX}GCP_BACKEND_DESTINATION_LOCATION=$GCP_BACKEND_DESTINATION_LOCATION \
 --$CLI_FLAG ${CI_PREFIX}GCP_BACKEND_SERVICE_KEY=$GCP_PRIV_KEY \
 --$CLI_FLAG ${CI_PREFIX}GCP_BACKEND_SERVICE_EMAIL=$GCP_BACKEND_SERVICE_EMAIL"
+--$CLI_FLAG INSTALL_TIMEOUT=$INSTALL_TIMEOUT"
 
 if [ ! -z "$ZENKO_ACCESS_KEY" ]; then
 	FLAGS="$FLAGS --$CLI_FLAG ${CI_PREFIX}ZENKO_ACCESS_KEY=$ZENKO_ACCESS_KEY"

diff --git a/tests/create_buckets.py b/tests/create_buckets.py
@@ -55,8 +55,7 @@ def wait_for_pods(delete, timeout):
     else:
       _log.info('Zenko services have stabilized successfully')
 
-
-TIMEOUT = get_env('INSTALL_TIMEOUT') or 240  # 4 Minutes
+TIMEOUT = int(get_env('INSTALL_TIMEOUT'))
 
 K8S_NAMESPACE = os.getenv('ZENKO_K8S_NAMESPACE')
 ZENKO_HELM_RELEASE = os.getenv('ZENKO_HELM_RELEASE')