diff options
| author | Michael Pavone <pavone@retrodev.com> | 2017-02-26 19:51:05 -0800 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2017-02-26 19:51:05 -0800 |
| commit | 0404555ebdbc0153de3f658913ea1ff332241140 (patch) | |
| tree | bd486735ab5c5a67d1381d00c861ad9386b4e0e2 | |
| parent | 8eaa969d96dacde5119fe516aa35da4004091246 (diff) | |
Fixes for nightly build upload script
| -rwxr-xr-x | build_upload_nightly | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build_upload_nightly b/build_upload_nightly index 3f78e0a..a7111c1 100755 --- a/build_upload_nightly +++ b/build_upload_nightly @@ -1,15 +1,19 @@ #!/bin/sh name=$1 -source $HOME/$name.params +. "$HOME/$name.params" +echo Starting $CONTAINER_NAME lxc-start -n "$CONTAINER_NAME" -if [ $? -ne 0]; then +if [ $? -ne 0 ]; then exit $? fi -build_output=$(lxc-attach -n "$CONTAINER_NAME" -- /home/$BUILD_USER/blastem/build_nightly > /tmp/build_${name}_out.log) -if [ $? -ne 0]; then +echo Starting build by $BUILD_USER in $CONTAINER_NAME +lxc-attach -n "$CONTAINER_NAME" -- /home/$BUILD_USER/blastem/build_nightly $BUILD_USER > /tmp/build_${name}_out.log +if [ $? -ne 0 ]; then + lxc-stop -n "$CONTAINER_NAME" exit $? fi -source $HOME/remote.params +lxc-stop -n "$CONTAINER_NAME" +. $HOME/remote.params artifact=$(tail -n 1 /tmp/build_${name}_out.log) -echo $REMOTE_PASS | scp "$artifact" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/nightlies +echo $REMOTE_PASS | scp "$HOME/.local/share/lxc/$CONTAINER_NAME/rootfs/home/$BUILD_USER/blastem/$artifact" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/nightlies |