← Back to branch summary

~jcsackett/charmworld/bac-tag-constraints

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Tarmac
  • Author(s): Brad Crittenden
  • Date: 2013-07-17 15:05:30 UTC
  • mfrom: (310.1.2 use-charm-objects)
  • Revision ID: tarmac-20130717150530-sirtkpu7vpklu7du
[r=sinzui][bug=][author=bac] In the api internals there was a mixture of raw charm dicts and Charm model objects. This branch ensures all charm usage are model objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
94
94
        $(NOSE) charmworld migrations
95
95
 
96
96
testid: test.ini bin/nosetests
97
 
        # Run specific nose id tests
98
 
        # Call with `make testid ID=3`
 
97
        # Run specific nose id tests.
 
98
        # To set up the index you must run `make testid` once to completion to
 
99
        # setup the index.  Then you can run a group of tests like:
 
100
        # Call with `ID="3 5" make testid`
99
101
        $(NOSE) -v -s -x --with-id $(ID) charmworld migrations
100
102
 
101
103
testdebug: test.ini bin/nosetests
128
130
start_supervisor:
129
131
        bin/supervisord -c charmworld/jobs/supervisord.conf
130
132
 
131
 
stop_supervisor: 
 
133
stop_supervisor:
132
134
        if test -f ./supervisord.pid; \
133
135
                then  cat ./supervisord.pid | xargs kill -HUP; \
134
136
                else echo "No pidfile for supervisor; is the process running?"; \
135
137
        fi
136
138
 
137
 
start_worker: 
 
139
start_worker:
138
140
        bin/supervisorctl -c charmworld/jobs/supervisord.conf start ingest
139
141
 
140
142
stop_worker: