diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-12-19 03:29:11 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-12-21 09:47:02 +0100 |
| commit | bce0b5b5830a58e19850934c9353e3c2d7eafea5 (patch) | |
| tree | ee79a38508de5d12afa60560baadcfaef8663aa9 | |
| parent | 9694e6d7b60f93ae227c23ab34a75dd7e0cefca2 (diff) | |
| download | jenkins.debian.net-bce0b5b5830a58e19850934c9353e3c2d7eafea5.tar.xz | |
lvc: refactor, reduce redundancy in job-cfg
| -rwxr-xr-x | bin/lvc/run_test_suite | 9 | ||||
| -rw-r--r-- | job-cfg/lvc.yaml | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/bin/lvc/run_test_suite b/bin/lvc/run_test_suite index e7670b0b..957db812 100755 --- a/bin/lvc/run_test_suite +++ b/bin/lvc/run_test_suite @@ -189,11 +189,16 @@ export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" export SIKULI_HOME="/usr/share/java" export SIKULI_IMAGE_PATH="/srv/jenkins/features/images/" export RUBYLIB="/srv/jenkins" +export FEATURE_PATCH="/srv/jenkins/features" export VM_XML_PATH="/srv/jenkins/features/domains" export DISPLAY=${TARGET_DISPLAY} check_dependency cucumber if [ -z "${*}" ]; then - cucumber --format ExtraHooks::Pretty $RUBYLIB/features + cucumber --format ExtraHooks::Pretty $FEATURE_PATH else - cucumber --format ExtraHooks::Pretty $RUBYLIB/features/step_definitions $RUBYLIB/features/support ${*} + FEATURES="" + for f in ${*} ; do + FEATURES="$FEATURES $FEATURE_PATH/$f" + done + cucumber --format ExtraHooks::Pretty $FEATURE_PATH/step_definitions $FEATURE_PATH/support $FEATURES fi diff --git a/job-cfg/lvc.yaml b/job-cfg/lvc.yaml index 2b5bec77..39ddc11b 100644 --- a/job-cfg/lvc.yaml +++ b/job-cfg/lvc.yaml @@ -40,6 +40,6 @@ jobs: - '{name}_debian-live_squeeze': my_time: '23 45 31 12 *' - my_params: '--capture lvc_debian-live_squeeze.webm --iso /var/lib/jenkins/debian-live-7.6.0-amd64-standard.iso /srv/jenkins/features/apt.feature' + my_params: '--capture lvc_debian-live_squeeze.webm --iso /var/lib/jenkins/debian-live-7.6.0-amd64-standard.iso apt.feature' my_description: 'Work in progress...' |