Merge branch 'master' into dmius-paths-fix

Author: dmius

.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
       - run:
           name: Install software
           command: |
-            apt-get update && apt-get install -y sudo wget \
+            apt-get update && apt-get install -y sudo wget jq \
             && wget get.docker.com -q -S -O - | sudo sh
       - checkout
       - setup_remote_docker

nancy_run.sh

@@ -625,7 +625,9 @@ function copyFile() {
       docker_exec s3cmd sync $1 $MACHINE_HOME/
     else
       if [ "$RUN_ON" = "localhost" ]; then
-        ln ${1/file:\/\//} "$TMP_PATH/nancy_$containerHash/" # TODO: option – hard links OR regular `cp`
+        #ln ${1/file:\/\//} "$TMP_PATH/nancy_$containerHash/"
+        # TODO: option – hard links OR regular `cp`
+        docker cp ${1/file:\/\//} $containerHash:$MACHINE_HOME/
       elif [ "$RUN_ON" = "aws" ]; then
         docker-machine scp $1 $DOCKER_MACHINE:/home/ubuntu/nancy_${containerHash}
       else
@@ -724,8 +726,11 @@ else
     )
     docker_exec bash -c "gzip -c $logpath > $MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz"
     if [ "$RUN_ON" = "localhost" ]; then
-      cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
-      cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
+      docker cp $containerHash:$MACHINE_HOME/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
+      docker cp $containerHash:$MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
+      # TODO option: ln / cp
+      #cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
+      #cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
     elif [ "$RUN_ON" = "aws" ]; then
       docker-machine scp $DOCKER_MACHINE:/home/ubuntu/nancy_$containerHash/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
       docker-machine scp $DOCKER_MACHINE:/home/ubuntu/nancy_$containerHash/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/

tests/nancy_run_localhost_simple_dump.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-echo "SKIP" && exit 0
-
 thisDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 parentDir="$(dirname "$thisDir")"
 srcDir="$parentDir/.circleci"
@@ -13,7 +11,7 @@ nancyRun="$parentDir/nancy_run.sh"
 output=$(
   $nancyRun --workload-custom-sql "file://$srcDir/custom.sql" \
     --db-dump-path "file://$srcDir/test.dump.bz2" \
-    --tmp-path $srcDir/tmp
+    --tmp-path $srcDir/tmp 2>&1
 )
 
 if [[ $output =~ "Queries duration:" ]]; then

tests/nancy_run_localhost_simple_dump_with_index.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-echo "SKIP" && exit 0
-
 thisDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 parentDir="$(dirname "$thisDir")"
 srcDir="$parentDir/.circleci"
@@ -15,7 +13,7 @@ output=$(
     --tmp-path ${srcDir}/tmp \
     --db-dump-path "file://$srcDir/test.dump.bz2" \
     --target-ddl-do "file://$srcDir/ddl_create_index.sql" \
-    --target-ddl-undo "file://$srcDir/ddl_drop_index.sql"
+    --target-ddl-undo "file://$srcDir/ddl_drop_index.sql" 2>&1
 )
 
 if [[ $output =~ "Queries duration:" ]]; then