From 7c97c5991392c2e03a75d29fb030bb879bff35bc Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@nextcairn.com>
Date: Wed, 26 Aug 2020 14:32:50 +0200
Subject: [PATCH] Run docker builds on MR CI
---
.gitlab-ci.yml | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e313ad29d..028302265b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,13 +121,6 @@ backend-build:
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375/
- # Run this on master and tags except base tags
- rules:
- - if: '$CI_COMMIT_BRANCH == "master"'
- when: on_success
- - if: '$CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^base-.*/'
- when: on_success
- - when: never
script:
- ci/build.sh Dockerfile
@@ -141,13 +134,6 @@ backend-build-binary:
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375/
- # Run this on master and tags except base tags
- rules:
- - if: '$CI_COMMIT_BRANCH == "master"'
- when: on_success
- - if: '$CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^base-.*/'
- when: on_success
- - when: never
script:
- ci/build.sh Dockerfile.binary "-binary"
--
GitLab