From 6e1f493609fb6d05e579a0a110f80ba613f4ea27 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Sat, 8 Dec 2018 17:00:04 +0100
Subject: [PATCH] CI: Do not run build and test on nightly builds. Except test
while building docker image
---
.gitlab-ci.yml | 6 ++++++
extra/docker/Dockerfile.master | 2 +-
extra/docker/Dockerfile.master-cli | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f77aae3ca..fbbb114b87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,9 @@ stages:
before_script:
- apk add --no-cache bash build-base cmake python3 libexecinfo-dev cppunit-dev libxml2-dev tclap-dev readline-dev qt5-qtbase-dev graphviz-dev jsoncpp-dev ${EXTRA_PKGS}
- export CXX=${CXX}
+ except:
+ variables:
+ - $SCHEDULED_NIGHTLY
.build:compatibility: &build-compatibility
<<: *build
@@ -131,6 +134,9 @@ build:doc:
image: alpine:edge
before_script:
- apk add --no-cache bash bc coreutils python3 cmake make libexecinfo cppunit libxml2 tclap readline qt5-qtbase qt5-qtbase-x11 graphviz jsoncpp
+ except:
+ variables:
+ - $SCHEDULED_NIGHTLY
.test:compatibility: &test-compatibility
<<: *test
diff --git a/extra/docker/Dockerfile.master b/extra/docker/Dockerfile.master
index dfa68ebf2e..8cc8a5c22d 100644
--- a/extra/docker/Dockerfile.master
+++ b/extra/docker/Dockerfile.master
@@ -30,7 +30,7 @@ RUN cmake \
-DCMAKE_INSTALL_PREFIX=$BASEDIR/install \
.. && \
make -j $(grep -c processor /proc/cpuinfo) && \
- make test && \
+ make test ARGS="-j $(grep -c processor /proc/cpuinfo)" && \
make install
diff --git a/extra/docker/Dockerfile.master-cli b/extra/docker/Dockerfile.master-cli
index 2caa3c6dda..15d8ed599c 100644
--- a/extra/docker/Dockerfile.master-cli
+++ b/extra/docker/Dockerfile.master-cli
@@ -27,7 +27,7 @@ RUN cmake \
-DCMAKE_INSTALL_PREFIX=$BASEDIR/install \
.. && \
make -j $(grep -c processor /proc/cpuinfo) && \
- make test && \
+ make test ARGS="-j $(grep -c processor /proc/cpuinfo)" && \
make install
--
GitLab