VOL-5155 - triage failure in periodic-voltha-test-bbsim-2.12

jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
--------------------------------------------------
  o Fixed a brace matching problem for timeout(10) block.
    Some long shell() blocks were split into distinct sections to fail
    independently and carnage ensued.    On branch dev-joey

jjb/voltha-test/voltha-certification.yaml
jjb/voltha-test/voltha-certification/master.yaml
jjb/voltha-test/voltha-certification/voltha-2.11.yaml
jjb/voltha-test/voltha-certification/voltha-2.12.yaml
-----------------------------------------------------
  o Include some cosmetic config refactoring to force
    regeneraiton of job pipelines.

Change-Id: I59f8f7a23b51aab03c49805f0eec6fb2a4276a59
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index 0023c04..2fe0a16 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -272,10 +272,11 @@
 ** -----------------------------------------------------------------------
 ''')
 	    sh('''ps e -ww -A | grep "_TAG=kail-startup"''')
-	}
+	} // script
 
         // -----------------------------------------------------------------------
-        // stop logging
+	// stop logging
+	// [TODO] Replace this block with pgrep/pkill one-liner(s)	
         // -----------------------------------------------------------------------
 	sh("""
           P_IDS="\$(ps e -ww -A | grep "_TAG=kail-startup" | grep -v grep | awk '{print \$1}')"
@@ -287,6 +288,9 @@
           fi
 """)
 
+        // -----------------------------------------------------------------------
+	// Bundle onos-voltha / kail logs
+        // -----------------------------------------------------------------------
 	sh("""
 cat <<EOM
 
@@ -299,7 +303,7 @@
           rm onos-voltha-startup-combined.log
           popd
         """)
-       }
+	} // timeout(10)
 
 
         // -----------------------------------------------------------------------