From 6d035b11cf97b122762b1341771d33f751471a5c Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Thu, 3 May 2018 13:51:46 +0200
Subject: [PATCH] Enable Ci for all branches
---
.gitlab-ci.yml | 4 ----
topfarm/cost_models/fuga/Colonel | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fadbc1a7..c33d5bde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,6 @@ test_topfarm: # name the job what we like
test
script:
- cd tests; py.test --cov-report term-missing:skip-covered --cov=topfarm
- only: # only run for these branches
- - master
- - test_ci
tags: # select which runners can do this job [3]
- python
@@ -28,7 +25,6 @@ pages: # "pages" is a job specifically for GitLab pages [1]
- public
only: # only run for these branches
- master
- - test_ci
tags: # select which runners can do this job [3]
- python
diff --git a/topfarm/cost_models/fuga/Colonel b/topfarm/cost_models/fuga/Colonel
index 63f215a9..b3d528b5 160000
--- a/topfarm/cost_models/fuga/Colonel
+++ b/topfarm/cost_models/fuga/Colonel
@@ -1 +1 @@
-Subproject commit 63f215a900395ad7d8880d7783e57c0835e45c9b
+Subproject commit b3d528b5bddb5d62f4a6d9f476d7989f5d0f2ad7
--
GitLab