test p

Jenkinsfile

@@ -78,55 +78,55 @@ node{
 	// 	}
 	// }
 
-    //  stage('Test') 
-    // {
+     stage('Test') 
+    {
         
-    //    dir("${env.WORKSPACE}/angular-client")
-    //    {
-    //         // sh 'npm i @angular-devkit/build-angular'
+       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'
-	// 			throw err
-	// 		}
+			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 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
-    //         }*/
-    //    }
-    // }
+                    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')