|
|
@@ -84,76 +84,54 @@ node{
|
|
|
// }
|
|
|
// }
|
|
|
|
|
|
- stage('Test')
|
|
|
+ stage('Test')
|
|
|
{
|
|
|
- dir("${env.WORKSPACE}/angular-client"){
|
|
|
-
|
|
|
- docker.image('trion/ng-cli-karma').inside {
|
|
|
- sh 'npm install'
|
|
|
-
|
|
|
- try
|
|
|
+
|
|
|
+ dir("${env.WORKSPACE}/angular-client")
|
|
|
+ {
|
|
|
+ sh 'npm i @angular-devkit/build-angular'
|
|
|
+
|
|
|
+ try
|
|
|
{
|
|
|
sh 'npm run test-ci'
|
|
|
}
|
|
|
catch(err)
|
|
|
{
|
|
|
- sh 'echo TEST FAILED'
|
|
|
- junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
|
|
|
+ sh 'echo TEST FAILED'
|
|
|
+ junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
|
|
|
throw err
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- // dir("${env.WORKSPACE}/angular-client")
|
|
|
- // {
|
|
|
- // sh 'npm install'
|
|
|
-
|
|
|
- // try
|
|
|
- // {
|
|
|
- // sh 'npm run test-ci'
|
|
|
- // }
|
|
|
- // catch(err)
|
|
|
- // {
|
|
|
- // sh 'echo TEST FAILED'
|
|
|
- // junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
|
|
|
- // throw err
|
|
|
- // }
|
|
|
|
|
|
- // // def karma = docker.image('trion/ng-cli-karma')
|
|
|
- // // karma.pull()
|
|
|
+ /*def karma = docker.image('trion/ng-cli-karma')
|
|
|
+ karma.pull()
|
|
|
|
|
|
- // // try
|
|
|
- // // {
|
|
|
- // // karma.run(' -u $(id -u) -v ${WORKSPACE}:/app trion/ng-cli-karma ')
|
|
|
- // // karma.inside
|
|
|
- // // {
|
|
|
- // // sh 'npm install'
|
|
|
+ try
|
|
|
+ {
|
|
|
+ karma.run(' -u $(id -u) -v ${WORKSPACE}:/app trion/ng-cli-karma ')
|
|
|
+ karma.inside
|
|
|
+ {
|
|
|
+ sh 'npm install'
|
|
|
|
|
|
- // // try
|
|
|
- // // {
|
|
|
- // // sh ('./node_modules/karma/bin/karma ng test --karma-config karma.conf.js --browsers Chrome_with_debugging')
|
|
|
- // // }
|
|
|
- // // catch(err)
|
|
|
- // // {
|
|
|
- // // sh 'echo TEST FAILED'
|
|
|
- // // step([$class: 'JUnitResultArchiver', testResults: 'target/surefire-reports/TESTS-TestSuite.xml/*.xml', healthScaleFactor: 1.0])
|
|
|
- // // throw err
|
|
|
- // // }
|
|
|
- // // sh 'echo DO SOMETHING ELSE AFTER TEST'
|
|
|
- // // }
|
|
|
- // // sh 'ls -al '
|
|
|
- // // }
|
|
|
- // // catch(err)
|
|
|
- // // {
|
|
|
- // // sh 'echo RUN DOCKER FAILED'
|
|
|
- // // throw err
|
|
|
- // // }
|
|
|
- // }
|
|
|
+ try
|
|
|
+ {
|
|
|
+ sh ('./node_modules/karma/bin/karma start karma.conf.js')
|
|
|
+ }
|
|
|
+ catch(err)
|
|
|
+ {
|
|
|
+ sh 'echo TEST FAILED'
|
|
|
+ step([$class: 'JUnitResultArchiver', testResults: 'target/surefire-reports/TESTS-TestSuite.xml/*.xml', healthScaleFactor: 1.0])
|
|
|
+ throw err
|
|
|
+ }
|
|
|
+ sh 'echo DO SOMETHING ELSE AFTER TEST'
|
|
|
+ }
|
|
|
+ sh 'ls -al '
|
|
|
+ }
|
|
|
+ catch(err)
|
|
|
+ {
|
|
|
+ sh 'echo RUN DOCKER FAILED'
|
|
|
+ throw err
|
|
|
+ }*/
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- stage('ls')
|
|
|
- {
|
|
|
- sh 'ls -ls'
|
|
|
- }
|
|
|
-}
|
|
|
+}
|
