From c90f8309131c04b0b98a6e7d28f36c3bcb971f45 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 29 May 2021 22:40:23 +0300
Subject: [PATCH] CI improvements.
- Notify on scheduled pipeline failures.
- Seperate the IMAGE and CONTEXT variables. Allow building where the 2
don't match (planning for httpd/buster and httpd/bullseye).
---
.gitlab-ci.yml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cafe659..6f13063 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,8 @@
include:
- project: shore/ci-templates
file: templates/pre-commit.yml
+ - project: shore/ci-templates
+ file: templates/notify.yml
stages:
- test
@@ -14,6 +16,7 @@ stages:
# hard-coded to latest.
variables:
TAG: latest
+ CONTEXT: "$IMAGE"
# Job templates:
@@ -23,7 +26,7 @@ variables:
DOCKER_BUILDKIT: "1"
tags: &tags [ns4.shore.co.il]
script:
- - docker build --pull --no-cache --iidfile iid "$IMAGE"
+ - docker build --pull --no-cache --iidfile iid "$CONTEXT"
after_script:
- echo "HASH=$(cat iid)" > dot.env
artifacts:
@@ -33,8 +36,8 @@ variables:
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_PIPELINE_SOURCE == "push"
changes:
- - $IMAGE/*
- - $IMAGE/**/*
+ - $CONTEXT/*
+ - $CONTEXT/**/*
.push:
stage: deploy
@@ -49,7 +52,7 @@ variables:
build-cgit:
extends: .build
variables:
- IMAGE: cgit
+ CONTEXT: cgit
push-cgit:
extends: .push
@@ -64,7 +67,7 @@ push-cgit:
build-httpd:
extends: .build
variables:
- IMAGE: httpd
+ CONTEXT: httpd
push-httpd:
extends: .push
--
GitLab