diff options
author | verhoek <30193551+verhoek@users.noreply.github.com> | 2019-12-07 01:28:31 +0300 |
---|---|---|
committer | verhoek <30193551+verhoek@users.noreply.github.com> | 2019-12-07 01:33:39 +0300 |
commit | 1668c9b4d820382057a4727c2cdb91dab0d6d9a5 (patch) | |
tree | 8ec37b8cb650d31142b2f76c15edfe840ff6ad29 | |
parent | 38247381581e104892b99ef3e194c7950e525050 (diff) |
Reduce number of unit test scripts by favouring parameters.
-rw-r--r-- | .travis.yml | 11 | ||||
-rw-r--r-- | pipeline/.local_config.sh | 4 | ||||
-rwxr-xr-x | pipeline/jobs/_imports.sh | 10 | ||||
-rwxr-xr-x | pipeline/jobs/build_job.sh | 5 | ||||
-rwxr-xr-x | pipeline/jobs/params.sh | 13 | ||||
-rwxr-xr-x | pipeline/jobs/selenium_job.sh | 2 | ||||
-rwxr-xr-x | pipeline/jobs/unittest1_job.sh | 10 | ||||
-rwxr-xr-x | pipeline/jobs/unittest2_job.sh | 10 | ||||
-rwxr-xr-x | pipeline/jobs/unittest3_job.sh | 10 | ||||
-rwxr-xr-x | pipeline/jobs/unittest5_job.sh | 10 | ||||
-rwxr-xr-x | pipeline/jobs/unittest_job.sh (renamed from pipeline/jobs/unittest4_job.sh) | 5 | ||||
-rwxr-xr-x | pipeline/start.sh | 10 |
12 files changed, 28 insertions, 72 deletions
diff --git a/.travis.yml b/.travis.yml index 5e1bf6c13..d7d15bd9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,35 +46,36 @@ jobs: - $HOME/download/ - $BUILD_DIR script: - - ${ROOT_DIR}/pipeline/jobs/unittest1_job.sh + - ${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories BulkNormal --testdata data.zip - stage: tests cache: directories: - $HOME/download/ - $BUILD_DIR script: - - ${ROOT_DIR}/pipeline/jobs/unittest2_job.sh + - ${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories BulkNoSize --testdata data.zip - stage: tests cache: directories: - $HOME/download/ - $BUILD_DIR script: - - ${ROOT_DIR}/pipeline/jobs/unittest3_job.sh + - ${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories SVNDataLong,SVNData --testdata DSMCBE.zip - stage: tests cache: directories: - $HOME/download/ - $BUILD_DIR script: - - ${ROOT_DIR}/pipeline/jobs/unittest4_job.sh + - ${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories Border - stage: tests cache: directories: - $HOME/download/ - $BUILD_DIR script: - - ${ROOT_DIR}/pipeline/jobs/unittest5_job.sh + - ${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testctegories Filter,Targeted,Purge,Serialization,WebApi,Utility,UriUtility,IO,ImportExport,Disruption + - stage: tests cache: directories: diff --git a/pipeline/.local_config.sh b/pipeline/.local_config.sh index 3e4be43f8..35475b945 100644 --- a/pipeline/.local_config.sh +++ b/pipeline/.local_config.sh @@ -1,8 +1,8 @@ export ROOT_DIR=${SCRIPT_DIR}/../ # caches -export BUILD_DIR=${ROOT_DIR}/.duplicati_build -export TEST_DIR=${ROOT_DIR}/.duplicati_test +export BUILD_DIR=/tmp/.duplicati_build +export TEST_DIR=/tmp/.duplicati_test export ARCHIVE_DIR=${ROOT_DIR}/.duplicati_zip export PACKAGES_DIR=${ROOT_DIR}/.duplicati_packages export SIGN_DIR=${ROOT_DIR}/.duplicati_sign diff --git a/pipeline/jobs/_imports.sh b/pipeline/jobs/_imports.sh new file mode 100755 index 000000000..8d3a04fe8 --- /dev/null +++ b/pipeline/jobs/_imports.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +export PATH="$PATH:${ROOT_DIR}/pipeline/docker-run" +. error_handling.sh + +which ts > /dev/null +if [[ $? -ne 0 ]]; then + echo "please install ts. e.g. brew install moreutils/apt-get install moreutils" + exit 1 +fi
\ No newline at end of file diff --git a/pipeline/jobs/build_job.sh b/pipeline/jobs/build_job.sh index 41faaee30..46717ce4f 100755 --- a/pipeline/jobs/build_job.sh +++ b/pipeline/jobs/build_job.sh @@ -1,8 +1,7 @@ #!/bin/bash SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" -. "${SCRIPT_DIR}/params.sh" +. "${SCRIPT_DIR}/_imports.sh" ${ROOT_DIR}/pipeline/stage_build/trigger.sh \ -${FORWARD_OPTS[@]} \ --sourcedir "${ROOT_DIR}" \ ---targetdir "${BUILD_DIR}" | ts +--targetdir "${BUILD_DIR}" $@ | ts diff --git a/pipeline/jobs/params.sh b/pipeline/jobs/params.sh deleted file mode 100755 index 1b6ec88c9..000000000 --- a/pipeline/jobs/params.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -export PATH="$PATH:${ROOT_DIR}/pipeline/docker-run" -. error_handling.sh - -function add_option () { - FORWARD_OPTS[${#FORWARD_OPTS[@]}]="$1" - FORWARD_OPTS[${#FORWARD_OPTS[@]}]="$2" -} - -FORWARD_OPTS=() - -export FORWARD_OPTS diff --git a/pipeline/jobs/selenium_job.sh b/pipeline/jobs/selenium_job.sh index 977dafe1c..26a28b909 100755 --- a/pipeline/jobs/selenium_job.sh +++ b/pipeline/jobs/selenium_job.sh @@ -5,4 +5,4 @@ SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" ${ROOT_DIR}/pipeline/stage_integrationtests/trigger.sh \ ${FORWARD_OPTS[@]} \ --sourcedir "${BUILD_DIR}" \ ---targetdir "${TEST_DIR}"| ts +--targetdir "${TEST_DIR}" $@ | ts diff --git a/pipeline/jobs/unittest1_job.sh b/pipeline/jobs/unittest1_job.sh deleted file mode 100755 index 1d7d85c87..000000000 --- a/pipeline/jobs/unittest1_job.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" -. "${SCRIPT_DIR}/params.sh" - -${ROOT_DIR}/pipeline/stage_unittests/trigger.sh \ -${FORWARD_OPTS[@]} \ ---sourcedir $BUILD_DIR \ ---targetdir $TEST_DIR \ ---testcategories BulkNormal \ ---testdata data.zip | ts diff --git a/pipeline/jobs/unittest2_job.sh b/pipeline/jobs/unittest2_job.sh deleted file mode 100755 index 1266e9444..000000000 --- a/pipeline/jobs/unittest2_job.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" -. "${SCRIPT_DIR}/params.sh" - -${ROOT_DIR}/pipeline/stage_unittests/trigger.sh \ -${FORWARD_OPTS[@]} \ ---sourcedir $BUILD_DIR \ ---targetdir $TEST_DIR \ ---testcategories BulkNoSize \ ---testdata data.zip | ts diff --git a/pipeline/jobs/unittest3_job.sh b/pipeline/jobs/unittest3_job.sh deleted file mode 100755 index e21a0520e..000000000 --- a/pipeline/jobs/unittest3_job.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" -. "${SCRIPT_DIR}/params.sh" - -${ROOT_DIR}/pipeline/stage_unittests/trigger.sh \ -${FORWARD_OPTS[@]} \ ---sourcedir $BUILD_DIR \ ---targetdir $TEST_DIR \ ---testcategories SVNDataLong,SVNData \ ---testdata DSMCBE.zip | ts diff --git a/pipeline/jobs/unittest5_job.sh b/pipeline/jobs/unittest5_job.sh deleted file mode 100755 index 709dd7127..000000000 --- a/pipeline/jobs/unittest5_job.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" -. "${SCRIPT_DIR}/params.sh" - -${ROOT_DIR}/pipeline/stage_unittests/trigger.sh \ -${FORWARD_OPTS[@]} \ ---sourcedir $BUILD_DIR \ ---targetdir $TEST_DIR \ ---testcategories Filter,Targeted,Purge,Serialization,WebApi,Utility,UriUtility,IO,ImportExport,Disruption | ts - diff --git a/pipeline/jobs/unittest4_job.sh b/pipeline/jobs/unittest_job.sh index f21bc9484..88964cf75 100755 --- a/pipeline/jobs/unittest4_job.sh +++ b/pipeline/jobs/unittest_job.sh @@ -1,9 +1,8 @@ #!/bin/bash SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" -. "${SCRIPT_DIR}/params.sh" +. "${SCRIPT_DIR}/_imports.sh" ${ROOT_DIR}/pipeline/stage_unittests/trigger.sh \ ${FORWARD_OPTS[@]} \ --sourcedir $BUILD_DIR \ ---targetdir $TEST_DIR \ ---testcategories Border | ts +--targetdir $TEST_DIR | ts diff --git a/pipeline/start.sh b/pipeline/start.sh index 9cfbc3cd1..c2c7a6ed9 100755 --- a/pipeline/start.sh +++ b/pipeline/start.sh @@ -4,9 +4,9 @@ SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" . "${SCRIPT_DIR}/.local_config.sh" ${ROOT_DIR}/pipeline/jobs/build_job.sh -${ROOT_DIR}/pipeline/jobs/unittest1_job.sh -${ROOT_DIR}/pipeline/jobs/unittest2_job.sh -${ROOT_DIR}/pipeline/jobs/unittest3_job.sh -${ROOT_DIR}/pipeline/jobs/unittest4_job.sh -${ROOT_DIR}/pipeline/jobs/unittest5_job.sh +${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories BulkNormal --testdata data.zip +${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories BulkNoSize --testdata data.zip +${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories SVNDataLong,SVNData --testdata DSMCBE.zip +${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testcategories Border +${ROOT_DIR}/pipeline/jobs/unittest_job.sh --testctegories Filter,Targeted,Purge,Serialization,WebApi,Utility,UriUtility,IO,ImportExport,Disruption |