From f0dda1dd4ec063233b0d266b092d809c6243c354 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 2 Jul 2016 21:22:51 +0200
Subject: Update .gitlab-ci.yml and build config for local builds

---
 .gitignore                                |  1 +
 .gitlab-ci.yml                            | 17 ++++++++++++-----
 tests/puppet/provider/.platform-test.conf | 27 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 tests/puppet/provider/.platform-test.conf

diff --git a/.gitignore b/.gitignore
index 8090545e..eff8f474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /tests/puppet/provider/secrets.json
 /tests/puppet/provider/files/ssh/authorized_keys
 /tests/puppet/provider/files/nodes/
+/tests/puppet/provider/users/
 /tests/puppet/provider/test
 /tests/puppet/provider/users/gitlab-runner/
 /builds
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c17ce155..914ffdd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
-before_script:
-  - ruby -v
-  - bundle install --path vendor/bundle --jobs $(nproc)  "${FLAGS[@]}"
-  - git submodule update --init
+#before_script:
+  #- echo 'Running global before_script'
+  #- ruby -v
+  #- bundle install --path vendor/bundle --jobs $(nproc)  "${FLAGS[@]}"
+  #- git submodule update --init
 
 stages:
   - syntax
@@ -46,4 +47,10 @@ build:
   before_script:
     - echo $CI_BUILD_REF_NAME
   script:
-    - /usr/local/bin/platform_test/buildscripts/build-platform.sh $CI_BUILD_REF_NAME -x
+    - 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 info
+    - leap local stop
diff --git a/tests/puppet/provider/.platform-test.conf b/tests/puppet/provider/.platform-test.conf
new file mode 100644
index 00000000..03ec4c52
--- /dev/null
+++ b/tests/puppet/provider/.platform-test.conf
@@ -0,0 +1,27 @@
+# i.e. /home/varac/leap/git/leap_platform
+export ROOTDIR=$CI_BUILD_REPO
+
+export PROVIDERDIR="${ROOTDIR}/tests/puppet/provider"
+export PLATFORMDIR="$ROOTDIR"
+export LOGDIR="$ROOTDIR/builds/log"
+
+export CONTACTS="sysdev@leap.se"
+export MAIL_TO=$CONTACTS
+
+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'
+
+# tag/environment to deploy to
+export TAG='local'
+
-- 
cgit v1.2.3