Use exported env name, change default name

Change-Id: I066ba3f023847ac01a85fbfb954686a12d2d46fe
This commit is contained in:
Łukasz Oleś 2016-01-20 23:33:09 +01:00
parent 3cf4ae3a1e
commit 0394d0c5a6
5 changed files with 1 additions and 6 deletions

View File

@ -7,7 +7,7 @@ ADMIN_PASSWORD=vagrant
ADMIN_USER=vagrant
INSTALL_DIR=/vagrant
ENV_NAME=${ENV_NAME:-solar-test}
ENV_NAME=${ENV_NAME:-solar-example}
SLAVES_COUNT=${SLAVES_COUNT:-0}
CONF_PATH=${CONF_PATH:-utils/jenkins/default.yaml}

View File

@ -1,7 +1,6 @@
#!/bin/bash
set -xe
export ENV_NAME="solar-example"
export SLAVES_COUNT=2
export DEPLOY_TIMEOUT=180
export TEST_SCRIPT="/usr/bin/python /vagrant/solar-resources/examples/hosts_file/hosts.py"

View File

@ -1,7 +1,6 @@
#!/bin/bash
set -xe
export ENV_NAME="solar-example"
export SLAVES_COUNT=2
export DEPLOY_TIMEOUT=2400
export TEST_SCRIPT="/usr/bin/python /vagrant/solar-resources/examples/openstack/openstack.py create_all"

View File

@ -1,7 +1,6 @@
#!/bin/bash
set -xe
export ENV_NAME="solar-example"
export SLAVES_COUNT=3
export DEPLOY_TIMEOUT=300
export TEST_SCRIPT="/usr/bin/python /vagrant/solar-resources/examples/riak/riaks.py create_all"

View File

@ -1,10 +1,8 @@
#!/bin/bash
set -xe
export ENV_NAME="solar-example"
export SLAVES_COUNT=1
export DEPLOY_TIMEOUT=300
export TEST_SCRIPT="/bin/bash /vagrant/solar-resources/examples/wordpress/run.sh"
./utils/jenkins/run.sh