jenkins: parallel tb, take #2

RandomReaper · Jan 9, 2019 · 5314b6a · 5314b6a
1 parent 87d50b5
commit 5314b6a
Showing 1 changed file with 48 additions and 45 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -29,66 +29,69 @@ pipeline
 				sh '#apt-get install -y git'
 			}
         }
-        parallel
+        stage('tb')
         {
-    		stage('tb-unmanaged')
-    		{
-    			steps
-    			{
-    				sh '''
-    					cd /repo
-    					./ci/${STAGE_NAME}.sh
-    				'''
-    			}
-    			post
-    			{
-    				failure
-    				{
-    					sh '''
-    						cd /repo
-    						VERBOSE=1 ./ci/${STAGE_NAME}.sh
-    					'''
-    				}
-    			}
-    		}
-            stage('tb-managed_reset')
+            parallel
             {
-                steps
+        		stage('tb-unmanaged')
+        		{
+        			steps
+        			{
+        				sh '''
+        					cd /repo
+        					./ci/${STAGE_NAME}.sh
+        				'''
+        			}
+        			post
+        			{
+        				failure
+        				{
+        					sh '''
+        						cd /repo
+        						VERBOSE=1 ./ci/${STAGE_NAME}.sh
+        					'''
+        				}
+        			}
+        		}
+                stage('tb-managed_reset')
                 {
-                    sh '''
-                        cd /repo
-                        ./ci/${STAGE_NAME}.sh
-                    '''
-                }
-                post
-                {
-                    failure
+                    steps
                     {
                         sh '''
                             cd /repo
-                            VERBOSE=1 ./ci/${STAGE_NAME}.sh
+                            ./ci/${STAGE_NAME}.sh
                         '''
                     }
+                    post
+                    {
+                        failure
+                        {
+                            sh '''
+                                cd /repo
+                                VERBOSE=1 ./ci/${STAGE_NAME}.sh
+                            '''
+                        }
+                    }
                 }
-            }
-            stage('tb-managed_no_reset')
-            {
-                steps
-                {
-                    sh '''
-                        cd /repo
-                        ./ci/${STAGE_NAME}.sh
-                    '''
-                }
-                post
+                stage('tb-managed_no_reset')
                 {
-                    failure
+                    steps
                     {
                         sh '''
                             cd /repo
-                            VERBOSE=1 ./ci/${STAGE_NAME}.sh
+                            ./ci/${STAGE_NAME}.sh
                         '''
                     }
+                    post
+                    {
+                        failure
+                        {
+                            sh '''
+                                cd /repo
+                                VERBOSE=1 ./ci/${STAGE_NAME}.sh
+                            '''
+                        }
+                    }
                 }
             }
         }