Merge branch 'fix/gb/remove-serverless-app-build-policies-from-templa…

…te' into 'master' Remove build policies from serverless app template Closes #62792 See merge request gitlab-org/gitlab-ce!29253
joolstorrentecalo · Jun 6, 2019 · 52e88df · 52e88df
2 parents 48ca0dd + 7f52685
commit 52e88df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml b/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml
@@ -0,0 +1,5 @@
+---
+title: Remove build policies from serverless app template
+merge_request: 29253
+author:
+type: fixed
diff --git a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml
@@ -14,19 +14,13 @@ stages:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
-  only:
-    refs:
-      - master
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/$DOCKERFILE --destination $CI_REGISTRY_IMAGE
 
 .serverless:deploy:image:
   stage: deploy
   image: gcr.io/triggermesh/tm@sha256:e3ee74db94d215bd297738d93577481f3e4db38013326c90d57f873df7ab41d5
-  only:
-    refs:
-      - master
   environment: development
   script:
     - echo "$CI_REGISTRY_IMAGE"