Skip to content

Commit

Permalink
Merge pull request #144 from jobtome-labs/feat/docker-helm-retries
Browse files Browse the repository at this point in the history
Retries for Docker Build and Helm Deploy Jobs
  • Loading branch information
daniel-toncu authored Feb 27, 2023
2 parents 6c6a8db + 4344e1c commit 34b2cda
Show file tree
Hide file tree
Showing 52 changed files with 67 additions and 57 deletions.
2 changes: 1 addition & 1 deletion bucket-production.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/bucket-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/bucket-quality.yml'

deploy:production:
extends: .deploy
Expand Down
2 changes: 1 addition & 1 deletion bucket-quality.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/bucket.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/bucket.yml'

deploy:quality:
extends: .deploy
Expand Down
4 changes: 2 additions & 2 deletions cloudrun-production.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/cloudrun.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/cloudrun.yml"

deploy:production:
extends: .cloudrun:deploy
Expand Down
4 changes: 2 additions & 2 deletions cloudrun-quality.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/cloudrun.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/cloudrun.yml"

deploy:quality:
extends: .cloudrun:deploy
Expand Down
2 changes: 1 addition & 1 deletion container-registry-push.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/container-registry-push.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/container-registry-push.yml"

container-registry:push:quality:
extends: .container-registry:push
Expand Down
2 changes: 1 addition & 1 deletion dataflow-production.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/dataflow-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/dataflow-quality.yml'

deploy:production:dataflow:
extends: .deploy:dataflow
Expand Down
2 changes: 1 addition & 1 deletion dataflow-quality.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/dataflow.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/dataflow.yml'

deploy:quality:dataflow:
extends: .deploy:dataflow
Expand Down
7 changes: 6 additions & 1 deletion docker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/docker.yml"

variables:
DOCKER_BUILD_JOB_RETRY: 0

build:
stage: build
Expand Down Expand Up @@ -131,6 +134,8 @@ build:
variables:
- $SKIP_CI_BUILD == "true"

retry: ${DOCKER_BUILD_JOB_RETRY}

build:cache:
stage: build
extends: .docker
Expand Down
2 changes: 1 addition & 1 deletion endpoints-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/endpoints-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/endpoints-quality.yml"

# EUROPE

Expand Down
2 changes: 1 addition & 1 deletion endpoints-quality.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/endpoints.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/endpoints.yml"

endpoints:validate:quality:
extends: .endpoints:validate
Expand Down
2 changes: 1 addition & 1 deletion endpoints-regional.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/endpoints-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/endpoints-quality.yml"

endpoints:validate:production:
extends: .endpoints:validate
Expand Down
2 changes: 1 addition & 1 deletion endpoints-validate.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/endpoints.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/endpoints.yml"

endpoints:validate:
extends: .endpoints:validate
Expand Down
2 changes: 1 addition & 1 deletion helm-fullstack-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/helm-fullstack-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/helm-fullstack-quality.yml"

# EUROPE

Expand Down
4 changes: 2 additions & 2 deletions helm-fullstack-quality.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/helm.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/helm.yml"

deploy:helm:api:quality:
extends: .deploy:quality:helm
Expand Down
2 changes: 1 addition & 1 deletion helm-fullstack-regional.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/helm-fullstack-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/helm-fullstack-quality.yml"

deploy:helm:api:production:
extends: .deploy:production:helm
Expand Down
2 changes: 1 addition & 1 deletion helm-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/helm-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/helm-quality.yml"

# EUROPE

Expand Down
2 changes: 1 addition & 1 deletion helm-only-internal.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/helm.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/helm.yml"

deploy:internal:helm:
extends: .deploy:internal:helm
Expand Down
2 changes: 1 addition & 1 deletion helm-only-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/helm-only-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/helm-only-quality.yml"

# EUROPE
deploy:production:europe:helm:
Expand Down
2 changes: 1 addition & 1 deletion helm-only-quality.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/helm.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/helm.yml"

deploy:quality:helm:
extends: .deploy:quality:helm
Expand Down
2 changes: 1 addition & 1 deletion helm-only-regional.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/helm-only-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/helm-only-quality.yml"

deploy:production:helm:
extends: .deploy:production:helm
Expand Down
4 changes: 2 additions & 2 deletions helm-quality.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/helm.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/docker.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/helm.yml"

deploy:quality:helm:
extends: .deploy:quality:helm
Expand Down
2 changes: 1 addition & 1 deletion helm-regional.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/helm-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/helm-quality.yml"

deploy:production:helm:
extends: .deploy:production:helm
Expand Down
2 changes: 1 addition & 1 deletion kubernetes-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/kubernetes-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/kubernetes-quality.yml"

# EUROPE
deploy:production:europe:image:
Expand Down
4 changes: 2 additions & 2 deletions kubernetes-quality.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/docker.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/kubernetes.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/docker.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/kubernetes.yml'

deploy:quality:image:
extends: .deploy:image
Expand Down
2 changes: 1 addition & 1 deletion kubernetes-regional.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/kubernetes-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/kubernetes-quality.yml'

deploy:production:image:
extends: .deploy:image
Expand Down
2 changes: 1 addition & 1 deletion kubernetes-task-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/kubernetes-task-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/kubernetes-task-quality.yml'

task:production:europe:
extends: .task
Expand Down
2 changes: 1 addition & 1 deletion kubernetes-task-production.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/kubernetes-task-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/kubernetes-task-quality.yml'

task:production:
extends: .task
Expand Down
2 changes: 1 addition & 1 deletion kubernetes-task-quality.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/kubernetes-task.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/kubernetes-task.yml'

task:quality:
extends: .task
Expand Down
2 changes: 1 addition & 1 deletion lint-generic.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/lint.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/lint.yml"

lint:
extends: .lint
Expand Down
2 changes: 1 addition & 1 deletion lint-go.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/lint.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/lint.yml"

lint:go:
extends: .lint
Expand Down
2 changes: 1 addition & 1 deletion lint-javascript.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/lint.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/lint.yml"

lint:eslint:
extends: .lint
Expand Down
2 changes: 1 addition & 1 deletion lint-python.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/lint.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/lint.yml"

lint:python:
extends: .lint
Expand Down
2 changes: 1 addition & 1 deletion lint-typescript.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/lint.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/lint.yml"

lint:typecheck:
extends: .lint
Expand Down
2 changes: 1 addition & 1 deletion sast.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/sast.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/sast.yml"

sast:
extends: .sast
Expand Down
2 changes: 1 addition & 1 deletion secrets-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/secrets-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/secrets-quality.yml"

# EUROPE
deploy:production:europe:secrets:
Expand Down
2 changes: 1 addition & 1 deletion secrets-quality.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/secrets.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/secrets.yml"

deploy:quality:secrets:
extends: .deploy:quality:secrets
Expand Down
2 changes: 1 addition & 1 deletion secrets-regional.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/secrets-quality.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/secrets-quality.yml"

deploy:production:secrets:
extends: .deploy:production:secrets
Expand Down
2 changes: 1 addition & 1 deletion sentry-fullstack.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/sentry.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/sentry.yml"

sentry:api:release:set:
extends: .sentry:release:set
Expand Down
2 changes: 1 addition & 1 deletion sentry.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/sentry.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/sentry.yml"

sentry:release:set:
extends: .sentry:release:set
Expand Down
2 changes: 1 addition & 1 deletion serverless-multiregion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/serverless-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/serverless-quality.yml'

# EUROPE
deploy:production:europe:
Expand Down
2 changes: 1 addition & 1 deletion serverless-quality.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/serverless.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/serverless.yml'

deploy:quality:
extends: .serverless:deploy
Expand Down
2 changes: 1 addition & 1 deletion serverless-regional.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/serverless-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/serverless-quality.yml'

deploy:production:
extends: .serverless:deploy
Expand Down
4 changes: 2 additions & 2 deletions shell-job.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/lint-shell.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/terraform.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/lint-shell.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/terraform.yml'

job:shell:
stage: deploy
Expand Down
2 changes: 1 addition & 1 deletion ssh-production.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/ssh-quality.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/ssh-quality.yml'

ssh:production:
extends: .ssh:exec
Expand Down
2 changes: 1 addition & 1 deletion ssh-quality.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/ssh.yml'
- remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/ssh.yml'

ssh:quality:
extends: .ssh:exec
Expand Down
5 changes: 5 additions & 0 deletions templates/helm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
variables:
HELM_DEPLOY_JOB_RETRY: 0

.helm:
image: jobtomelabs/helm:v3.8.1

Expand Down Expand Up @@ -195,6 +198,8 @@

fi

retry: ${HELM_DEPLOY_JOB_RETRY}

.deploy:quality:helm:
extends: .helm:deploy
only:
Expand Down
2 changes: 1 addition & 1 deletion terraform.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include:
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/terraform.yml"
- remote: "https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/terraform.yml"

cache:
key: ${CI_PIPELINE_ID}
Expand Down
2 changes: 1 addition & 1 deletion test-terraform-security.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The following is commented because it is already included by terraform.yml
# and most often you want to include terraform along with security
# include:
# - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.22.0/templates/terraform.yml'
# - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v3.23.0/templates/terraform.yml'

test:terraform-security:
extends: .terraform-security
Expand Down
Loading

0 comments on commit 34b2cda

Please sign in to comment.