new

Jenkinsfile

@@ -18,12 +18,12 @@ node{
         sh 'docker ps | grep "workflow_" -v | awk -F " " \'{ if(NR>1) print $1}\' |xargs docker kill |xargs docker rm || true'
         sh 'docker system prune -f'
     }
-
+	 
 	// stage("Stop Preprod Container")
 	// {
 	// 	echo e ;
 	// }
-
+	
 	// stage("Stop Preprod Container")
 	// {
 	// 	sh "docker kill server-apache-preprod server-express-preprod | docker rm server-apache-preprod server-express-preprod || true"
@@ -35,7 +35,7 @@ node{
 	{
 		docker.build("server-apache-preprod", "--no-cache --label traefik.enable=true --label traefik.http.routers.server-apache-preprod.rule='Host(`angular-preprod.foodgame.fr`)' --label traefik.http.routers.server-apache-preprod.entrypoints=websecure --label traefik.http.routers.server-apache-preprod.tls.certresolver=myresolver -f build/docker/httpd/Dockerfile .")
 	}
-
+	
 	def imageExpress = stage("Build express preprod")
 	{
 		docker.build("server-express-preprod", "--no-cache -f express-server/Dockerfile express-server")
@@ -44,24 +44,24 @@ node{
 	{
 		containerSql=imageExpress.run("--name server-express-preprod -v /home/formation/workflow/mysql:/var/lib/mysql --network=web")
 	}
-
+	
 	stage("Run Container apache preprod")
 	{
 		containerApache=imageApache.run("--name server-apache-preprod --link server-mysql-preprod:mysql --network=web")
 	}
-
+	
 	/*stage("Run Container express preprod")
 	{
 		containerSql=imageExpress.run("--name server-express-preprod -v /home/projet/fatboar/${e}/mysql:/var/lib/mysql --network=web")
 	}
-
+	
 	stage("Run Container apache preprod")
 	{
 		containerApache=imageApache.run("--name server-apache-preprod --link server-mysql-preprod:mysql --network=web")
 	}*/
 
-
-
+ 
+	
 	// stage("Wait mysql"){
 	// imageSql.inside {
 	// sh 'while ! mysqladmin ping -h0.0.0.0 --silent; do sleep 1; done'
@@ -73,8 +73,8 @@ node{
 	// sh "php /var/www/src/bin/phpunit"
 	// }
 	// }
-
-
+	
+	
 	// stage("Push preprod images to nexus")
 	// {
 	// 	docker.withRegistry('http://localhost:8083','885ef60c-9352-489a-bd1c-e4b695747c21')
@@ -84,76 +84,74 @@ node{
 	// 	}
 	// }
 
-     stage('Test')
+     stage('Test') 
     {
-	 	dir("${env.WORKSPACE}/angular-client"){
-
-    //      docker.image('trion/ng-cli-karma').inside {
-
-	// 		sh 'npm install -g @angular/cli@9.1.4'
-    //         sh 'npm install @angular-devkit/build-angular@0.901.4'
-	// 		sh 'ng test --karma-config=karma-ci.conf.js --no-progress'
-
+		dir("${env.WORKSPACE}/angular-client"){ 
+		
+         docker.image('trion/ng-cli-karma').inside {
+            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
+			}
+        }
+       
+	   } 
+    //    dir("${env.WORKSPACE}/angular-client")
+    //    {     
+    //           sh 'npm install'
+          		
 	// 		try
 	// 		{
-	// 			 sh 'ng test --karma-config=karma-ci.conf.js --no-progress'
-	// 		}
-	// 		catch(err)
+	// 			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
 	// 		}
-    //     }
-
-	//    }
-       
-            //   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()
-
-            try
-            {
-                karma.run(' -u $(id -u) -v ${WORKSPACE}:/app trion/ng-cli-karma ')
-                karma.inside
-                {
-                    sh 'npm install -g @angular/cli@9.1.4'
-
-                    try
-                    {   sh 'npm list karma'
-                        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
-            }
-       
+            
+    //         // 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 
+    //         //         {
+    //         //             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
+    //         // }
+    //    }
     }
 
-
+	
 	stage('ls')
 	{
 	    sh 'ls -ls'