x/solar
Code Issues Proposed changes

Use exported env name, change default name

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/jenkins/run.sh
View File

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

1
utils/jenkins/run_hosts_example.sh
View File

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

1
utils/jenkins/run_openstack_example.sh
View File

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

1
utils/jenkins/run_riak_example.sh
View File

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

2
utils/jenkins/run_wordpress_example.sh
View File

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