From bba8fb31004c5030e3921dc6606ac374d0831134 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 24 May 2025 15:11:56 +0300
Subject: [PATCH] fixup! A few updates.
---
.gitlab-ci.yml | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b762d7b..e18d665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,21 @@ include:
- remote: |-
https://git.shore.co.il/shore/ci-templates/-/raw/master/templates/notify.yml
+stages:
+ - build-base
+ - deploy-base
+ - build
+ - deploy
+ - test
+
+.container-build-base:
+ extends: .container-build
+ stage: build-base
+
+.container-push-base:
+ extends: .container-push
+ stage: deploy-base
+
lint templates:
image: registry.shore.co.il/ci-images:pre-commit
stage: test
@@ -42,12 +57,12 @@ lint templates:
# bats image:
build-bats:
- extends: .container-build
+ extends: .container-build-base
variables:
CONTEXT: images/bats
push-bats:
- extends: .container-push
+ extends: .container-push-base
variables:
CONTEXT: images/bats
IMAGE: ci-images
@@ -59,12 +74,12 @@ push-bats:
# docker image:
build-docker:
- extends: .container-build
+ extends: .container-build-base
variables:
CONTEXT: images/docker
push-docker:
- extends: .container-push
+ extends: .container-push-base
variables:
CONTEXT: images/docker
IMAGE: ci-images
@@ -110,8 +125,6 @@ push-k8s:
# pre-commit image:
build-pre-commit:
- needs:
- - push-python3
extends: .container-build
variables:
CONTEXT: images/pre-commit
@@ -129,12 +142,12 @@ push-pre-commit:
# python3 image:
build-python3:
- extends: .container-build
+ extends: .container-build-base
variables:
CONTEXT: images/python3
push-python3:
- extends: .container-push
+ extends: .container-push-base
variables:
CONTEXT: images/python3
IMAGE: ci-images
--
GitLab