formation 2 лет назад
Родитель
Сommit
a3cdf9442a
1 измененных файлов с 70 добавлено и 78 удалено
  1. 70 78
      Jenkinsfile

+ 70 - 78
Jenkinsfile

@@ -18,11 +18,6 @@ node{
         sh 'docker ps | grep "workflow_" -v | awk -F " " \'{ if(NR>1) print $1}\' |xargs docker kill |xargs docker rm || true'
         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'
         sh 'docker system prune -f'
     }
     }
-
-	 stage('Build')
-    {
-        sh 'docker run -v "$PWD":/app -w /app node:12.14.1 npm install'
-    }
 	 
 	 
 	// stage("Stop Preprod Container")
 	// stage("Stop Preprod Container")
 	// {
 	// {
@@ -34,26 +29,79 @@ node{
 	// 	sh "docker kill server-apache-preprod server-express-preprod | docker rm server-apache-preprod server-express-preprod || true"
 	// 	sh "docker kill server-apache-preprod server-express-preprod | docker rm server-apache-preprod server-express-preprod || true"
 	// 	sh 'docker system prune -f'
 	// 	sh 'docker system prune -f'
 	// }
 	// }
+	 stage('Test') 
+    {
+	
+        
+       
+	   
+    //    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/node:12.14.1')
+            karma.pull()
 
 
+            try 
+            {
+                karma.run(' -u $(id -u) -v ${WORKSPACE}:/app node:12.14.1 ')
+                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
+            }
+       }
+    }
 
 
-    // def imageApache = stage("Build apache preprod")
-	// {
-	// 	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 imageApache = stage("Build apache preprod")
+	{
+		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")
-	// }
-    // stage("Run Container express preprod")
-	// {
-	// 	containerSql=imageExpress.run("--name server-express-preprod -v /home/formation/workflow/mysql:/var/lib/mysql --network=web")
-	// }
+	def imageExpress = stage("Build express preprod")
+	{
+		docker.build("server-express-preprod", "--no-cache -f express-server/Dockerfile express-server")
+	}
+    stage("Run Container express preprod")
+	{
+		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 apache preprod")
+	{
+		containerApache=imageApache.run("--name server-apache-preprod --link server-mysql-preprod:mysql --network=web")
+	}
 	
 	
 	/*stage("Run Container express preprod")
 	/*stage("Run Container express preprod")
 	{
 	{
@@ -89,63 +137,7 @@ node{
 	// 	}
 	// 	}
 	// }
 	// }
 
 
-     stage('Test') 
-    {
-		
-                sh 'docker run -v "$PWD":/app -w /app node:12.14.1 node_modules/karma/bin/karma start'
-			
-	 			junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
-				
-        
-       
-	   
-    //    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()
-
-    //         // 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')
 	stage('ls')
 	{
 	{