diff options
| author | varac <varacanero@zeromail.org> | 2016-07-05 15:44:48 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-07-05 17:07:16 +0200 |
| commit | 4f8a0036ef6b6617ec913ef627823d1182ccde87 (patch) | |
| tree | da0eeb3d562b9dbbaa8f7f1a5bc7a4673d809284 | |
| parent | dd68ec1b0b9f8c44187de29429e28dd0a2f7b2e7 (diff) | |
Polish platform buils config file
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | tests/puppet/provider/.platform-test.conf | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d1c725f..462d39f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ before_script: - echo 'Running global before_script' - - ruby -v - bundle install --path vendor/bundle --jobs $(nproc) "${FLAGS[@]}" - git submodule update --init @@ -45,12 +44,11 @@ catalog: build: stage: build before_script: - - echo $CI_BUILD_REF_NAME + - env script: - - cd ${CI_BUILD_REPO}/tests/puppet/provider # use simple_deploy to speed up local development #- leap-platform-test simple_deploy - - leap-platform-test reset_deploy - - leap-platform-test test + - leap-platform-test -v reset_deploy + - leap-platform-test -v test - leap info - leap local stop diff --git a/tests/puppet/provider/.platform-test.conf b/tests/puppet/provider/.platform-test.conf index 03ec4c52..a40b6b32 100644 --- a/tests/puppet/provider/.platform-test.conf +++ b/tests/puppet/provider/.platform-test.conf @@ -1,5 +1,4 @@ -# i.e. /home/varac/leap/git/leap_platform -export ROOTDIR=$CI_BUILD_REPO +export ROOTDIR=$(pwd) export PROVIDERDIR="${ROOTDIR}/tests/puppet/provider" export PLATFORMDIR="$ROOTDIR" @@ -12,12 +11,7 @@ export OPTS='--yes' export FILTER_COMMON="" -#PROVIDER='rewire' -#DOMAIN='rewire.org' - -#LEAP_SRC='/usr/local/src/leap_cli_develop/' export LEAP_CMD="leap" -#IP_SUFFIX_START='30' # Nodes to bootstrap # NODES='rewdevcouch1:couchdb,soledad rewdevmx1:mx rewdevvpn1:openvpn,tor rewdevweb1:webapp,monitor rewdevplain1: rewdevstatic1:static' |