From 76978b7b03a2e970044dfc0baad4822720eb681d Mon Sep 17 00:00:00 2001 From: Chris Long Date: Mon, 26 Jul 2021 21:45:09 -0700 Subject: [PATCH] update --- .circleci/config.yml | 4 ++-- ci/build_machine_bootstrap.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index afa42e0..dbb9e78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,11 +113,11 @@ jobs: export STATUS=$(curl -s $IP_ADDRESS) if [ "$STATUS" == "building" ]; then echo "[$(date +%H:%M:%S)]: $STATUS" - scp -q -i ~/.ssh/id_rsa root@"$IP_ADDRESS":/opt/DetectionLab/Vagrant/vagrant_up_*.log /tmp/artifacts/ || echo "Vagrant log not yet present" + scp -q -i ~/.ssh/id_rsa root@"$IP_ADDRESS":/opt/DetectionLab/Vagrant/*.log /tmp/artifacts/ || echo "Vagrant log not yet present" sleep 300 ((MINUTES_PAST += 5)) else - scp -q -i ~/.ssh/id_rsa root@"$IP_ADDRESS":/opt/DetectionLab/Vagrant/vagrant_up_*.log /tmp/artifacts/ || echo "Vagrant log not yet present" + scp -q -i ~/.ssh/id_rsa root@"$IP_ADDRESS":/opt/DetectionLab/Vagrant/*.log /tmp/artifacts/ || echo "Vagrant log not yet present" echo "$STATUS" > /tmp/status break fi diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh index 3dc0007..4514fec 100755 --- a/ci/build_machine_bootstrap.sh +++ b/ci/build_machine_bootstrap.sh @@ -110,7 +110,8 @@ main() { # Build and Test Vagrant hosts cd Vagrant || exit 1 build_vagrant_hosts - /bin/bash "$DL_DIR/Vagrant/post_build_checks.sh" + /bin/bash "$DL_DIR/Vagrant/post_build_checks.sh" > $DL_DIR/Vagrant/post_build.log + exit 0 } main EOF