From 3fdf34daa9986974633abb7c120160a2bd95a637 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Wed, 29 Jan 2020 23:39:35 +0100
Subject: [PATCH] [CI] Allow to build and test everywhere. Push to prod only on
master
---
.gitlab-ci.yml | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9272f30e..34463a72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,10 +64,6 @@ set-variables:
- "**/docker-compose.yml"
when: always
- when: manual
- only:
- refs:
- - master
- - dev-ci
# Build the image that was modified
build:
@@ -89,10 +85,6 @@ build:
- "**/Dockerfile"
when: always
- when: manual
- only:
- refs:
- - master
- - dev-ci
# Run CoreOS' Clair and make the CI failed if a critical vulnerability isn't in the whitelist
clair:
@@ -117,10 +109,6 @@ clair:
- "**/clair-whitelist.yml"
when: always
- when: manual
- only:
- refs:
- - master
- - dev-ci
# Run docker-bench-security and upload the results
docker-bench-security:
@@ -146,15 +134,11 @@ docker-bench-security:
after_script:
- docker logout $REGISTRY
rules:
- - changes:
+ changes:
- "**/Dockerfile"
- "**/docker-compose.yml"
when: always
- when: manual
- only:
- refs:
- - master
- - dev-ci
# Push the generated image on the production registry,
# once it passed all security tests and has been successfully built
@@ -172,5 +156,4 @@ push-prod:
only:
refs:
- master
- - dev-ci
when: manual
--
GitLab