diff --git a/Jenkinsfile b/Jenkinsfile index 6c663826a8..90a0d7e12e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,10 +33,11 @@ pipeline { timeout(time: 10, unit: 'MINUTES') { sh 'docker run \ - -v "$HOME/voight-kampff:/root/.mycroft" \ - mycroft-core:${BRANCH_ALIAS} -f \ - allure_behave.formatter:AllureFormatter \ - -o /root/.mycroft/allure-result --tags ~@xfail' + -v "$HOME/voight-kampff/identity:/root/.mycroft/identity" \ + -v "$HOME/voight-kampff/:/root/allure" \ + mycroft-core:${BRANCH_ALIAS} \ + -f allure_behave.formatter:AllureFormatter \ + -o /root/allure/allure-result --tags ~@xfail' } } post { @@ -44,11 +45,11 @@ pipeline { echo 'Report Test Results' echo 'Changing ownership...' sh 'docker run \ - -v "$HOME/voight-kampff:/root/.mycroft" \ + -v "$HOME/voight-kampff/:/root/allure" \ --entrypoint=/bin/bash \ mycroft-core:${BRANCH_ALIAS} \ -x -c "chown $(id -u $USER):$(id -g $USER) \ - -R /root/.mycroft/allure-result"' + -R /root/allure/"' echo 'Transfering...' sh 'mv $HOME/voight-kampff/allure-result allure-result' diff --git a/test/integrationtests/voight_kampff/run_test_suite.sh b/test/integrationtests/voight_kampff/run_test_suite.sh index bcfe189b85..82dfa1c64e 100755 --- a/test/integrationtests/voight_kampff/run_test_suite.sh +++ b/test/integrationtests/voight_kampff/run_test_suite.sh @@ -14,11 +14,6 @@ behave $@ RESULT=$? # Stop all mycroft core services. /opt/mycroft/mycroft-core/stop-mycroft.sh all -# Make the jenkins user the owner of the allure results. This allows the -# jenkins job to build a report from the results -# Remove temporary skill files -rm -rf ~/.mycroft/skills -# Remove intent cache -rm -rf ~/.mycroft/intent_cache +# Reort the result of the behave test as exit status exit $RESULT