Permalink
Browse files

add dev/full-start which includes workers for TF

  • Loading branch information...
1 parent fa8b8d5 commit 7a42f44d72e915d652fd907f9c312f10346ab04a @vito vito committed Oct 19, 2016
Showing with 23 additions and 6 deletions.
  1. +6 −0 CONTRIBUTING.md
  2. +6 −0 dev/Procfile.testflight
  3. +2 −1 dev/atc
  4. +1 −1 dev/db
  5. +3 −0 dev/full-start
  6. +1 −1 dev/start
  7. +2 −1 dev/tsa
  8. +1 −1 dev/worker
  9. +1 −1 src/github.com/concourse/testflight
View
@@ -116,6 +116,12 @@ that one separately:
Then you can just `Ctrl+C` the `./dev/atc` process and restart it as you make
changes.
+To start everything needed for a full Testflight run, run `./dev/full-start`.
+The only difference is two additional workers: one with a tag, and another with
+a proxiy configured. If your changes don't seem like they'd need those workers,
+you can stick with `./dev/start` - the tests will automatically skip themselves
+if the workers are not present.
+
## Making changes to Concourse
@@ -0,0 +1,6 @@
+atc: ./atc
+tsa: ./tsa
+worker: ./worker
+tagged-worker: ./worker --tag tagged
+proxy-worker: ./worker --tag proxy --http-proxy proxy.example.com --no-proxy .docker.io --no-proxy .docker.com --no-proxy .cloudfront.net
+db: ./db
View
@@ -24,4 +24,5 @@ atc \
--development-mode \
--external-url "http://${external_ip}:8080" \
--session-signing-key $KEYSDIR/web/session_signing_key \
- --postgres-data-source "user=postgres dbname=atc port=${pg_port} sslmode=disable"
+ --postgres-data-source "user=postgres dbname=atc port=${pg_port} sslmode=disable" \
+ "$@"
View
@@ -9,4 +9,4 @@ DBDIR=$DEVDIR/db
[ -d $DBDIR ] || initdb -U postgres -D $DBDIR -E UTF8 --no-local
-postgres -D $DBDIR -h 127.0.0.1 -p ${POSTGRES_PORT:-6543}
+postgres -D $DBDIR -h 127.0.0.1 -p ${POSTGRES_PORT:-6543} "$@"
View
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+PROCFILE=Procfile.testflight $(dirname $0)/start
View
@@ -18,4 +18,4 @@ cd $ROOT/dev
sudo true
# start everything up
-goreman start "$@"
+goreman -f ${PROCFILE:-Procfile} start "$@"
View
@@ -17,4 +17,5 @@ tsa \
--host-key $KEYSDIR/web/tsa_host_key \
--peer-ip 127.0.0.1 \
--authorized-keys $KEYSDIR/web/authorized_worker_keys \
- --session-signing-key $KEYSDIR/web/session_signing_key
+ --session-signing-key $KEYSDIR/web/session_signing_key \
+ "$@"
View
@@ -10,4 +10,4 @@ KEYSDIR=$DEVDIR/keys
external_ip="$($ROOT/dev/util/external-ip)"
$ROOT/dev/util/docker run --rm --privileged -v $KEYSDIR/worker:/concourse-keys \
- concourse/concourse worker --tsa-host "$external_ip"
+ concourse/concourse worker --tsa-host "$external_ip" "$@"

0 comments on commit 7a42f44

Please sign in to comment.