Skip to content

Commit

Permalink
Merge pull request #91 from bcgov/chore/increase-deploy-timeout
Browse files Browse the repository at this point in the history
chore: increasing deployment timeouts, helm and shipit
  • Loading branch information
pbastia authored Nov 1, 2022
2 parents 47d8ff6 + 4c35232 commit bcae87c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ install:
dagConfig=$$(echo '{"org": "bcgov", "repo": "cas-metabase", "ref": "$(GIT_SHA1)", "path": "dags/cas_metabase_dags.py"}' | base64 -w0); \
helm dep up ./helm/cas-metabase; \
if [[ $(ENVIRONMENT) == test ]]; then \
helm upgrade --install --atomic --wait-for-jobs --timeout 300s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
helm upgrade --install --atomic --wait-for-jobs --timeout 1800s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
--set gcsProdBackupSAKey="gcp-$(GGIRCS_NAMESPACE_PREFIX)-prod-read-only-service-account-key" \
--set ciipDatabaseHost="cas-ciip-portal-patroni-readonly.$(CIIP_NAMESPACE_PREFIX)-$(ENVIRONMENT).svc.cluster.local" \
--set cifDatabaseHost="cas-cif-postgres-replicas.$(CIF_NAMESPACE_PREFIX)-$(ENVIRONMENT).svc.cluster.local" \
--set download-cas-metabase-dags.dagConfiguration="$$dagConfig" \
--values ./helm/cas-metabase/values-$(ENVIRONMENT).yaml \
cas-metabase ./helm/cas-metabase; \
else \
helm upgrade --install --atomic --wait-for-jobs --timeout 300s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
helm upgrade --install --atomic --wait-for-jobs --timeout 1800s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
--set download-cas-metabase-dags.dagConfiguration="$$dagConfig" \
--values ./helm/cas-metabase/values-$(ENVIRONMENT).yaml \
cas-metabase ./helm/cas-metabase; \
Expand Down
2 changes: 1 addition & 1 deletion helm/cas-metabase/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: cas-metabase
description: A Helm chart for the CAS Metabase instance
type: application
version: 0.3.1
version: 0.3.2
appVersion: 0.44.2
dependencies:
- name: cas-postgres
Expand Down
19 changes: 8 additions & 11 deletions shipit.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ deploy:
override:
- git submodule update --init
- make install:
timeout: 300
timeout: 2000 # just a little over the 1800s timing out the helm release
review:
checklist: []

Expand All @@ -15,13 +15,10 @@ tasks:
steps:
- ./broken_questions/broken_questions.sh $METABASE_PATH $METABASE_API_USER $METABASE_API_PASS
variables:
-
name: METABASE_PATH
title: URL of the Metabase instance
default: https://cas-metabase-test.apps.silver.devops.gov.bc.ca
-
name: METABASE_API_USER
title: The username of the Metabase user used to access the API
-
name: METABASE_API_PASS
title: The password for the Metabase user used to access the API
- name: METABASE_PATH
title: URL of the Metabase instance
default: https://cas-metabase-test.apps.silver.devops.gov.bc.ca
- name: METABASE_API_USER
title: The username of the Metabase user used to access the API
- name: METABASE_API_PASS
title: The password for the Metabase user used to access the API
2 changes: 1 addition & 1 deletion shipit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ deploy:
override:
- git submodule update --init
- make install:
timeout: 300
timeout: 2000 # just a little over the 1800s timing out the helm release
review:
checklist: []

0 comments on commit bcae87c

Please sign in to comment.