From 1fd39d9d39b55102739c696fb14a76b47edcf1f7 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 13 Jul 2016 15:32:01 +0200 Subject: Use bundled version of leap_cli for tests --- .gitlab-ci.yml | 9 +++------ tests/puppet/provider/.platform-test.conf | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccbbc70e..9f121b9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ before_script: stages: - syntax -# - rspec - build # doesn't work in docker atm @@ -42,12 +41,10 @@ catalog: build: stage: build - before_script: - - env script: # use simple_deploy to speed up local development #- leap-platform-test simple_deploy - - leap-platform-test -v reset_deploy + - leap-platform-test -v init_deploy - leap-platform-test -v test - - leap info - - leap local stop + - bundle exec leap info + - bundle exec leap local stop diff --git a/tests/puppet/provider/.platform-test.conf b/tests/puppet/provider/.platform-test.conf index a40b6b32..6d4ecae3 100644 --- a/tests/puppet/provider/.platform-test.conf +++ b/tests/puppet/provider/.platform-test.conf @@ -11,7 +11,7 @@ export OPTS='--yes' export FILTER_COMMON="" -export LEAP_CMD="leap" +export LEAP_CMD="bundle exec leap" # Nodes to bootstrap # NODES='rewdevcouch1:couchdb,soledad rewdevmx1:mx rewdevvpn1:openvpn,tor rewdevweb1:webapp,monitor rewdevplain1: rewdevstatic1:static' -- cgit v1.2.3