diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-05 17:59:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-05 17:59:30 +0000 |
| commit | 8cdda8f79a1f747e2f8e393ca505d3142a958033 (patch) | |
| tree | ac3874815b976f11915524668c589b6812950b6c /lib | |
| parent | 707d747ec99c7bfeb3536d226c6913769643fac4 (diff) | |
| parent | 20edd05db18dd6c27b93ebe7f35c995e91aab3ef (diff) | |
| download | gitlab-ce-8cdda8f79a1f747e2f8e393ca505d3142a958033.tar.gz | |
Merge branch 'feature/gb/serverless-switch-to-gitlabktl' into 'master'
Serverless backend now uses `gitlabktl` tool
Closes #56252 and #58058
See merge request gitlab-org/gitlab-ce!26926
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Serverless.gitlab-ci.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml index 4f3d08d98fe..4c92dcb7941 100644 --- a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml @@ -31,11 +31,14 @@ stages: - echo "$CI_REGISTRY_IMAGE" - tm -n "$KUBE_NAMESPACE" --config "$KUBECONFIG" deploy service "$CI_PROJECT_NAME" --from-image "$CI_REGISTRY_IMAGE" --wait +.serverless:build:functions: + stage: build + environment: development + image: registry.gitlab.com/gitlab-org/gitlabktl:latest + script: /usr/bin/gitlabktl serverless build + .serverless:deploy:functions: stage: deploy environment: development - image: gcr.io/triggermesh/tm:v0.0.9 - script: - - tm -n "$KUBE_NAMESPACE" set registry-auth gitlab-registry --registry "$CI_REGISTRY" --username "$CI_REGISTRY_USER" --password "$CI_JOB_TOKEN" --push - - tm -n "$KUBE_NAMESPACE" set registry-auth gitlab-registry --registry "$CI_REGISTRY" --username "$CI_DEPLOY_USER" --password "$CI_DEPLOY_PASSWORD" --pull - - tm -n "$KUBE_NAMESPACE" deploy --wait + image: registry.gitlab.com/gitlab-org/gitlabktl:latest + script: /usr/bin/gitlabktl serverless deploy |