Fix the directory that Java assets get copied to (#173)

* Also add logcat.py back in as a background task

Author: borrrden

environment/aws/topology_setup/test_server_platforms/java_register.py

@@ -258,12 +258,7 @@ def _copy_dataset(self) -> None:
         # and instead only copy the one that is going to be built
         # so that way there is no need to keep a manual list of versions
         # here.
-        dest_dir = (
-            JAK_TEST_SERVER_DIR
-            / self.test_server_path
-            / "assets"
-            / self.dataset_version
-        )
+        dest_dir = JAK_TEST_SERVER_DIR / "assets" / self.dataset_version
         dest_dir.mkdir(0o755, parents=True, exist_ok=True)
         copy_dataset(dest_dir, self.dataset_version)
 

jenkins/pipelines/android/android_teardown.sh

@@ -2,6 +2,12 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
+# kill logcat
+logcat_pid=$(cat $SCRIPT_DIR/logcat.pid)
+if [ -n "$logcat_pid" ]; then
+   kill $logcat_pid
+fi
+
 export PYTHONPATH=$SCRIPT_DIR/../../../
 pushd $SCRIPT_DIR/../../../environment/aws
 python3 -m venv venv

jenkins/pipelines/android/android_tests.sh

@@ -1,6 +1,8 @@
-#!/bin/bash
+#!/bin/bash -e
 # Build the Android test server, deploy it, and run the tests
 
+trap 'echo "$BASH_COMMAND (line $LINENO) failed, exiting..."; exit 1' ERR
+
 BUILD_TOOLS_VERSION='34.0.0'
 SDK_MGR="${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --channel=1"
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
@@ -41,11 +43,10 @@ else
 fi
 deactivate
 
-# The following appears to be incomplete as it hangs the script here...
-# echo "Start logcat"
-# pushd $SCRIPT_DIR
-# python3 logcat.py 
-# echo $! > logcat.pid
+echo "Start logcat"
+pushd $SCRIPT_DIR
+python3 logcat.py &
+echo $! > logcat.pid
 
 pushd $SCRIPT_DIR/../../../tests/dev_e2e > /dev/null
 rm -rf venv http_log testserver.log
@@ -56,7 +57,3 @@ pip install -r requirements.txt
 echo "Run the tests"
 adb shell input keyevent KEYCODE_WAKEUP
 pytest --maxfail=7 -W ignore::DeprecationWarning --config config.json
-
-echo "Tests complete: $STATUS"
-exit $STATUS
-

jenkins/pipelines/c/run_test.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+trap 'echo "$BASH_COMMAND (line $LINENO) failed, exiting..."; exit 1' ERR
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 function usage() {

jenkins/pipelines/dotnet/run_test.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+trap 'echo "$BASH_COMMAND (line $LINENO) failed, exiting..."; exit 1' ERR
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 function usage() {

jenkins/pipelines/ios/test.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+trap 'echo "$BASH_COMMAND (line $LINENO) failed, exiting..."; exit 1' ERR
+
 EDITION=${1}
 CBL_VERSION=${2}
 CBL_BLD_NUM=${3}

jenkins/pipelines/java/desktop/run_test.sh

@@ -1,6 +1,10 @@
 #!/bin/bash -e
 
+trap 'echo "$BASH_COMMAND (line $LINENO) failed, exiting..."; exit 1' ERR
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+ROOT_DIR=$SCRIPT_DIR/../../../..
+SHARED_DIR="${SCRIPT_DIR}/../../shared"
 
 function usage() {
     echo "Usage: $0 <version> <dataset_version> <platform> <sgw_version> [private_key_path]"
@@ -23,18 +27,18 @@ cbl_version=$1
 dataset_version=$2
 sgw_version=$3
 
-source $SCRIPT_DIR/../shared/check_python_version.sh
+source $SHARED_DIR/check_python_version.sh
 
 create_venv venv
 source venv/bin/activate
-pip install -r $SCRIPT_DIR/../../../../environment/aws/requirements.txt
+pip install -r $ROOT_DIR/environment/aws/requirements.txt
 if [ -n "$private_key_path" ]; then
     python3 $SCRIPT_DIR/setup_test.py $cbl_version $dataset_version $sgw_version --private_key $private_key_path
 else
     python3 $SCRIPT_DIR/setup_test.py $cbl_version $dataset_version $sgw_version
 fi
 
-pushd $SCRIPT_DIR/../../../../tests/dev_e2e
+pushd $ROOT_DIR/tests/dev_e2e
 pip install -r requirements.txt
 pytest --maxfail=7 -W ignore::DeprecationWarning --config config.json
 deactivate

jenkins/pipelines/java/webservice/run_test.sh

@@ -1,6 +1,10 @@
 #!/bin/bash -e
 
+trap 'echo "$BASH_COMMAND (line $LINENO) failed, exiting..."; exit 1' ERR
+
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+ROOT_DIR=$SCRIPT_DIR/../../../..
+SHARED_DIR="${SCRIPT_DIR}/../../shared"
 
 function usage() {
     echo "Usage: $0 <version> <dataset_version> <sgw_version> [private_key_path]"
@@ -23,18 +27,18 @@ cbl_version=$1
 dataset_version=$2
 sgw_version=$3
 
-source $SCRIPT_DIR/../shared/check_python_version.sh
+source $SHARED_DIR/check_python_version.sh
 
 create_venv venv
 source venv/bin/activate
-pip install -r $SCRIPT_DIR/../../../../environment/aws/requirements.txt
+pip install -r $ROOT_DIR/environment/aws/requirements.txt
 if [ -n "$private_key_path" ]; then
     python3 $SCRIPT_DIR/setup_test.py $cbl_version $dataset_version $sgw_version --private_key $private_key_path
 else
     python3 $SCRIPT_DIR/setup_test.py $cbl_version $dataset_version $sgw_version
 fi
 
-pushd $SCRIPT_DIR/../../../../tests/dev_e2e
+pushd $ROOT_DIR/tests/dev_e2e
 pip install -r requirements.txt
 pytest --maxfail=7 -W ignore::DeprecationWarning --config config.json
 deactivate