CHANGELOG.md

+## [5.0.1](https://gitlab.com/to-be-continuous/gcloud/compare/5.0.0...5.0.1) (2023-10-16)
+
+
+### Bug Fixes
+
+* declare all TBC stages ([fd6b85f](https://gitlab.com/to-be-continuous/gcloud/commit/fd6b85f15a3e3702b9e3695f0815aa82e13452db))
+
 # [5.0.0](https://gitlab.com/to-be-continuous/gcloud/compare/4.1.0...5.0.0) (2023-09-26)
 
 

README.md

@@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `gi
 ```yaml
 include:
   - project: 'to-be-continuous/gcloud'
-    ref: '5.0.0'
+    ref: '5.0.1'
     file: '/templates/gitlab-ci-gcloud.yml'
 ```
 
@@ -295,7 +295,7 @@ Let's imagine a backend service:
 include:
   # Include Google Cloud template
   - project: 'to-be-continuous/gcloud'
-    ref: '5.0.0'
+    ref: '5.0.1'
     file: '/templates/gitlab-ci-gcloud.yml'
   ...
 
@@ -314,15 +314,6 @@ variables:
   # Postman
   REVIEW_ENABLED: "true"
 
-# Pipeline steps
-stages:
-  - build
-  - test
-  - deploy
-  - acceptance
-  - publish
-  - production
-
 # define review environment url (uses $CI_ENVIRONMENT_SLUG as app version)
 gcp-review:
   environment:
@@ -440,11 +431,11 @@ The variant supports the following configuration:
 include:
   # main template
   - project: 'to-be-continuous/gcloud'
-    ref: '5.0.0'
+    ref: '5.0.1'
     file: '/templates/gitlab-ci-gcloud.yml'
   # Vault variant
   - project: 'to-be-continuous/gcloud'
-    ref: '5.0.0'
+    ref: '5.0.1'
     file: '/templates/gitlab-ci-gcloud-oidc.yml'
 
 variables:
@@ -495,11 +486,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/gcloud'
-    ref: '5.0.0'
+    ref: '5.0.1'
     file: '/templates/gitlab-ci-gcloud.yml'
   # Vault variant
   - project: 'to-be-continuous/gcloud'
-    ref: '5.0.0'
+    ref: '5.0.1'
     file: '/templates/gitlab-ci-gcloud-vault.yml'
 
 variables:
@@ -509,11 +500,4 @@ variables:
     SOME_SECRET_USED_IN_MY_APP: "@url@http://vault-secrets-provider/api/secrets/b7ecb6ebabc231/prod/gcloud/secret?field=my.app.secret"
     VAULT_BASE_URL: "https://vault.acme.host/v1"
     # $VAULT_ROLE_ID and $VAULT_SECRET_ID defined as a secret CI/CD variable
-
-# enable VAULT_JWT_TOKEN ID token for GCP jobs only
-.gcp-base:
-  id_tokens:
-    VAULT_JWT_TOKEN:
-      # use your own audience url here
-      aud: https://gitlab.com
 ```

templates/gitlab-ci-gcloud-vault.yml

@@ -13,7 +13,7 @@ variables:
 .gcp-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "gcloud", "5.0.0" ]
+      command: ["--service", "gcloud", "5.0.1" ]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
   variables:

templates/gitlab-ci-gcloud.yml

@@ -57,9 +57,16 @@ variables:
   # default integration ref name (pattern)
   INTEG_REF: '/^develop$/'
 
-# allowed stages depend on your template type (see: to-be-continuous.gitlab.io/doc/dev-guidelines/#stages)
 stages:
+  - build
+  - test
+  - package-build
+  - package-test
+  - infra
   - deploy
+  - acceptance
+  - publish
+  - infra-prod
   - production
 
 .gcp-scripts: &gcp-scripts |
@@ -393,7 +400,7 @@ stages:
   image: $GCP_CLI_IMAGE
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "gcloud", "5.0.0" ]
+      command: ["--service", "gcloud", "5.0.1" ]
   before_script:
     - *gcp-scripts
     - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"