summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml8
-rwxr-xr-xbin/ci-build.sh19
-rw-r--r--tests/puppet/provider/.platform-test.conf8
3 files changed, 20 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e47cd8ea..f2a763c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,4 @@ catalog:
build:
stage: build
script:
- # use simple_deploy to speed up local development
- #- leap-platform-test simple_deploy
- - leap-platform-test -v init_deploy
- - leap-platform-test -v test
- - cd tests/puppet/provider
- - bundle exec leap info
- - bundle exec leap local destroy
+ - ./bin/ci-build.sh
diff --git a/bin/ci-build.sh b/bin/ci-build.sh
new file mode 100755
index 00000000..3cb994e5
--- /dev/null
+++ b/bin/ci-build.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. tests/puppet/provider/.platform-test.conf
+
+# create node(s) with unique id so we can run tests in parallel
+export TAG="build${CI_BUILD_ID}"
+[ -d "${PROVIDERDIR}/tags" ] || mkdir "${PROVIDERDIR}/tags"
+echo '{}' > "${PROVIDERDIR}/tags/${TAG}.json"
+
+export IP_SUFFIX_START='100'
+#NODES='rewdevcouch1:couchdb,soledad rewdevmx1:mx rewdevvpn1:openvpn,tor rewdevweb1:webapp,monitor rewdevplain1: rewdevstatic1:static'
+export NODES="single${TAG}:couchdb,soledad,mx,webapp"
+leap-platform-test add_nodes "$NODES"
+
+leap-platform-test -v init_deploy
+leap-platform-test -v test
+cd tests/puppet/provider
+bundle exec leap info
+bundle exec leap local destroy
diff --git a/tests/puppet/provider/.platform-test.conf b/tests/puppet/provider/.platform-test.conf
index 6d4ecae3..621fb7b7 100644
--- a/tests/puppet/provider/.platform-test.conf
+++ b/tests/puppet/provider/.platform-test.conf
@@ -8,14 +8,6 @@ export CONTACTS="sysdev@leap.se"
export MAIL_TO=$CONTACTS
export OPTS='--yes'
-
export FILTER_COMMON=""
export LEAP_CMD="bundle exec leap"
-
-# 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'
-