ols-store-tests

Merge lp:~ricardokirkner/ols-store-tests/fix-makefile-setup-dev-env into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

  1. fix-makefile-setup-dev-env
  2. Merge into store-acceptance-tests
Proposed by Ricardo Kirkner
Status: Merged
Merged at revision: 22
Proposed branch: lp:~ricardokirkner/ols-store-tests/fix-makefile-setup-dev-env
Merge into: lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests
Diff against target: 11 lines (+0/-1)
1 file modified
Makefile (+0/-1)
To merge this branch: bzr merge lp:~ricardokirkner/ols-store-tests/fix-makefile-setup-dev-env
Reviewer Review Type Date Requested Status
Ubuntu One PQM Team Pending
Review via email: mp+299691@code.launchpad.net

Commit message

do not call setup-dev-env explicitly as it is done by ols-vms setup

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2016-07-06 13:43:50 +0000
+++ Makefile 2016-07-11 13:02:45 +0000
@@ -8,7 +8,6 @@
8vm-setup: ols-vms.conf8vm-setup: ols-vms.conf
9 if [ `ols-vms status ${VM}` = 'RUNNING' ] ; then ols-vms stop ${VM} ; fi9 if [ `ols-vms status ${VM}` = 'RUNNING' ] ; then ols-vms stop ${VM} ; fi
10 ols-vms setup ${VM}10 ols-vms setup ${VM}
11 ols-vms shell ${VM} './bin/setup-dev-env'
12 touch vm-setup11 touch vm-setup
1312
14vm-built: vm-setup13vm-built: vm-setup

Subscribers

People subscribed via source and target branches

to all changes: