summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-06-27 13:57:43 +0200
committerVarac <varac@leap.se>2017-06-27 13:57:43 +0200
commit3bed48fba6ae35813b8c4413887aba5262c43689 (patch)
tree75595f81892da069002af27f361c41ac6381cd96 /.gitlab-ci.yml
parent5d001efb65f4ac2afa39d17b7b62d4f861f450a3 (diff)
parentf3db3309f3a3fc5ee0f621593ed83805798f7890 (diff)
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49bf2e3..05430fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,5 @@
-image: leapcode/ruby
+image: ruby:2.1
before_script:
- - "[ -d /var/cache/gitlab-runner ] || sudo mkdir /var/cache/gitlab-runner"
- - sudo chown cirunner:cirunner -R /var/cache/gitlab-runner
- bundle install --jobs $(nproc) --without system_tests --path=/var/cache/gitlab-runner/ "${FLAGS[@]}"
.job_template: &job_definition
@@ -39,4 +37,3 @@ test:puppet4x:
PUPPET_VERSION: "> 4"
FACTER_VERSION: '> 2'
<<: *job_definition
-