diff --git a/base/docker.yml b/base/docker.yml index 27fa328aa43433a51fbe861a4661d1d76fbf1f94..d4e59b6de2884884b732a436a4bcfbcf704ddcb0 100644 --- a/base/docker.yml +++ b/base/docker.yml @@ -14,6 +14,8 @@ image: docker:19.03 - docker push $IMAGE_COMMIT .docker_release: + variables: + NEW_IMAGE: NEW_IMAGE script: - docker pull $IMAGE_COMMIT - docker tag $IMAGE_COMMIT $NEW_IMAGE diff --git a/mixins/deploy/gcp-k8s-deploy.yml b/mixins/deploy/gcp-k8s-deploy.yml index 593867ecacfd5d9d1bc48cadf140d37de37c6335..0e2c966085542a9aa91bd197e41a5667bd9bd0ac 100644 --- a/mixins/deploy/gcp-k8s-deploy.yml +++ b/mixins/deploy/gcp-k8s-deploy.yml @@ -23,6 +23,8 @@ include: extends: .gcp_k8s_auth stage: deploy variables: + APP: APP_TO_DEPLOY + OVERLAY: OVERLAY_TO_DEPLOY OLD_IMAGE: $CI_REGISTRY_IMAGE NEW_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA script: diff --git a/mixins/test/gcp-k8s-diff.yml b/mixins/test/gcp-k8s-diff.yml index 95e5132dcd75db591169b0da8d490c44e0c392b8..4f151ab030572f79c090809f331a554a8a498667 100644 --- a/mixins/test/gcp-k8s-diff.yml +++ b/mixins/test/gcp-k8s-diff.yml @@ -4,7 +4,7 @@ include: # This CI template consists of two parts: # - Auth -# - Diff test +# - K8s test # [[ AUTH ]] - authenticates against a GCP cluster # - ZONE - GCP cluster zone (e.g. us-east1-b) @@ -18,6 +18,9 @@ include: .gcp_k8s_diff: extends: .gcp_k8s_auth + variables: + APP: APP_TO_TEST + OVERLAY: OVERLAY_TO_TEST script: - cd k8s/$APP/overlays/$OVERLAY/ - |