diff --git a/.gitignore b/.gitignore index 50d3f3f91..864883743 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ npm-debug.log .eslintcache datasources.*.json print.*.json -db.json \ No newline at end of file +db.json +junitresults.xml \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 72988ce92..ec61639f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,21 @@ pipeline { TAG = "${env.BRANCH_NAME}" } stages { + environment { + FIREFOX_BIN = "firefox/firefox-bin" + } + stage('Test') { + // apt-get update + // apt-get install libgtk-3-0 libdbus-glib-1-2 xvfb + // wget https://ftp.mozilla.org/pub/firefox/releases/64.0.2/linux-x86_64/en-US/firefox-64.0.2.tar.bz2 + // tar xvjf firefox-64.0.2.tar.bz2 + // rm firefox-64.0.2.tar.bz2 + + sh "karma start" + sh "gulp docker" + sh "gulp backendUnitTest --junit" + sh "docker rm -f salix-db" + } stage('Checkout') { steps { script {