Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bf: Fix timeout not correctly being set #228

Merged
merged 1 commit into from
Jul 27, 2018
Merged

bf: Fix timeout not correctly being set #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eve/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion eve/workers/ci_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ FLAGS="\
--$CLI_FLAG ${CI_PREFIX}AZURE_BACKEND_DESTINATION_LOCATION=$AZURE_BACKEND_DESTINATION_LOCATION \
--$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 ${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"
Expand Down
3 changes: 1 addition & 2 deletions tests/create_buckets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down