Merge pull request #802 from grahamc/run-command-hacking

Development-time improvements

README.md

@@ -100,7 +100,7 @@ $ foreman start
 Have a look at the [Procfile](./Procfile) if you want to see how the processes are being started. In order to avoid
 conflicts with services that might be running on your host, hydra and postgress are started on custom ports:
 
-- hydra-server: 63333
+- hydra-server: 63333 with the username "alice" and the password "foobar"
 - postgresql: 64444
 
 Note that this is only ever meant as an ad-hoc way of executing Hydra during development. Please make use of the

foreman/start-evaluator.sh

@@ -3,5 +3,4 @@
 # wait for hydra-server to listen
 while ! nc -z localhost 63333; do sleep 1; done
 
-touch .hydra-data/hydra.conf
 HYDRA_CONFIG=$(pwd)/.hydra-data/hydra.conf exec hydra-evaluator

foreman/start-hydra.sh

@@ -8,5 +8,11 @@ createdb -h $(pwd)/.hydra-data/postgres -p 64444 hydra
 hydra-init
 hydra-create-user alice --password foobar --role admin
 
-touch .hydra-data/hydra.conf
+if [ ! -f ./.hydra-data/hydra.conf ]; then
+    echo "Creating a default hydra.conf"
+    cat << EOF > .hydra-data/hydra.conf
+# test-time instances likely don't want to bootstrap nixpkgs from scratch
+use-substitutes = true
+EOF
+fi
 HYDRA_CONFIG=$(pwd)/.hydra-data/hydra.conf exec hydra-dev-server --port 63333

foreman/start-notify.sh

@@ -3,5 +3,4 @@
 # wait for hydra-server to listen
 while ! nc -z localhost 63333; do sleep 1; done
 
-touch .hydra-data/hydra.conf
 HYDRA_CONFIG=$(pwd)/.hydra-data/hydra.conf exec hydra-notify

foreman/start-queue-runner.sh

@@ -3,5 +3,4 @@
 # wait until hydra is listening on port 63333
 while ! nc -z localhost 63333; do sleep 1; done
 
-touch .hydra-data/hydra.conf
-HYDRA_CONFIG=$(pwd)/.hydra-data/hydra.conf exec hydra-queue-runner
+NIX_REMOTE_SYSTEMS="" HYDRA_CONFIG=$(pwd)/.hydra-data/hydra.conf exec hydra-queue-runner

src/script/hydra-notify

@@ -8,6 +8,7 @@ use Hydra::Helper::AddBuilds;
 use IO::Select;
 
 STDERR->autoflush(1);
+STDOUT->autoflush(1);
 binmode STDERR, ":encoding(utf8)";
 
 my $config = getHydraConfig();