initial pass at switching to herokuish. closes #1091

This commit is contained in:
Michael Hobbs
2015-04-20 16:32:18 -07:00
parent aa55f027a4
commit 0840d8fd1f
19 changed files with 93 additions and 89 deletions

View File

@@ -33,13 +33,13 @@ case "$CIRCLE_NODE_INDEX" in
;;
2)
echo "=====> make deploy-tests (buildstep release) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
echo "=====> make deploy-tests (herokuish release) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
[[ "$MODE" == "setup" ]] && setup_circle && exit 0
sudo -E make -e deploy-tests
;;
3)
echo "=====> make deploy-tests (buildstep master) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
echo "=====> make deploy-tests (herokuish master) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
[[ "$MODE" == "setup" ]] && setup_circle buildstack && exit 0
sudo -E make -e deploy-tests
;;

View File

@@ -53,7 +53,7 @@ teardown() {
assert_output ""
}
@test "(config) global config (buildstep)" {
@test "(config) global config (herokuish)" {
deploy_app
run bash -c "dokku run $TEST_APP env | egrep '^global_test=true'"
echo "output: "$output

View File

@@ -10,7 +10,7 @@ teardown() {
destroy_app
}
# @test "(ps) buildstep" {
# @test "(ps) herokuish" {
# # CI support: 'Ah. I just spoke with our Docker expert --
# # looks like docker exec is built to work with docker-under-libcontainer,
# # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
@@ -21,7 +21,7 @@ teardown() {
# assert_success
# }
@test "(ps) buildstep" {
@test "(ps) herokuish" {
deploy_app
run bash -c "dokku ps:stop $TEST_APP"
echo "output: "$output
@@ -68,7 +68,7 @@ teardown() {
done
}
@test "(ps:scale) buildstep" {
@test "(ps:scale) herokuish" {
run bash -c "dokku ps:scale $TEST_APP web=2 worker=2"
echo "output: "$output
echo "status: "$status