Skip to content

Commit

Permalink
Merge pull request #811 from ashetty1/update_os_tests
Browse files Browse the repository at this point in the history
emptvols -> volumes=yes
  • Loading branch information
cdrage authored Sep 11, 2017
2 parents cf7d0d1 + 1d20de9 commit 2ed0a32
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion script/test_in_openshift/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ function convert::kompose_up () {
# Usage: convert::kompose_up <docker_compose_file>
local compose_file=$1
convert::print_msg "Running kompose up ..."
./kompose up --provider=openshift --emptyvols -f $compose_file
./kompose up --provider=openshift --volumes empty -f $compose_file
exit_status=$?

if [ $exit_status -ne 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion script/test_in_openshift/tests/redis-replica-2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ source $KOMPOSE_ROOT/script/test_in_openshift/lib.sh
convert::print_msg "Running tests for replica option"

# Run kompose up
./kompose up --provider=openshift --emptyvols --replicas 2 -f ${KOMPOSE_ROOT}/examples/docker-compose-counter.yaml; exit_status=$?
./kompose up --provider=openshift --volumes empty --replicas 2 -f ${KOMPOSE_ROOT}/examples/docker-compose-counter.yaml; exit_status=$?

if [ $exit_status -ne 0 ]; then
convert::print_fail "kompose up has failed"
Expand Down

0 comments on commit 2ed0a32

Please sign in to comment.