diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-18 13:27:54 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-18 13:27:54 +0300 |
| commit | 69c113fc8cff7c7646bf252d32b1956b255eaf37 (patch) | |
| tree | 661ad5973f55990c284fe96a694e76150e14f992 /lib | |
| parent | 7b784334364e8d9b9680877ae8fff6def7d50c46 (diff) | |
| parent | d2400a990822dc291382761753e3fc08250fc7f2 (diff) | |
Merge branch 'feature/gb/serverless-app-deployment-template' into 'master'
Deploy serverless apps with `gitlabktl`
Closes #64494
See merge request gitlab-org/gitlab-ce!30740
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Serverless.gitlab-ci.yml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml index a3db2705bf6..280e75d46f5 100644 --- a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml @@ -8,26 +8,23 @@ stages: - deploy .serverless:build:image: - stage: build image: registry.gitlab.com/gitlab-org/gitlabktl:latest + stage: build script: /usr/bin/gitlabktl app build .serverless:deploy:image: + image: registry.gitlab.com/gitlab-org/gitlabktl:latest stage: deploy - image: gcr.io/triggermesh/tm@sha256:3cfdd470a66b741004fb02354319d79f1598c70117ce79978d2e07e192bfb336 # v0.0.11 environment: development - script: - - echo "$CI_REGISTRY_IMAGE" - - tm -n "$KUBE_NAMESPACE" --config "$KUBECONFIG" deploy service "$CI_PROJECT_NAME" --from-image "$CI_REGISTRY_IMAGE" --wait + script: /usr/bin/gitlabktl app deploy .serverless:build:functions: - stage: build - environment: development image: registry.gitlab.com/gitlab-org/gitlabktl:latest + stage: build script: /usr/bin/gitlabktl serverless build .serverless:deploy:functions: + image: registry.gitlab.com/gitlab-org/gitlabktl:latest stage: deploy environment: development - image: registry.gitlab.com/gitlab-org/gitlabktl:latest script: /usr/bin/gitlabktl serverless deploy |