Wrap installers within a stage/seciton/script block
Change-Id: Id1662279f642819e2404aace7a6a8bc721819ad0
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index d38d004..6fdc190 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -376,31 +376,44 @@
// -----------------------------------------------------------------------
stage ('Install Kail')
{
- String cmd = [
- 'make',
- '-C', "$WORKSPACE/voltha-system-tests",
- "KAIL_PATH=\"$WORKSPACE/bin\"",
- 'kail',
- ].join(' ')
+ steps
+ {
+ script
+ {
+ String cmd = [
+ 'make',
+ '-C', "$WORKSPACE/voltha-system-tests",
+ "KAIL_PATH=\"$WORKSPACE/bin\"",
+ 'kail',
+ ].join(' ')
- println(" ** Running: ${cmd}:\n")
- sh("${cmd}")
- }
+ println(" ** Running: ${cmd}:\n")
+ sh("${cmd}")
+ } // script
+ } // steps
+ } // stage
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
stage ('Install Kind')
{
- String cmd = [
- 'make',
- '-C', "$WORKSPACE/voltha-system-tests",
- "KIND_PATH=\"$WORKSPACE/bin\"",
- 'install-command-kind',
- ].join(' ')
+ steps
+ {
+ script
+ {
- println(" ** Running: ${cmd}:\n")
- sh("${cmd}")
- }
+ String cmd = [
+ 'make',
+ '-C', "$WORKSPACE/voltha-system-tests",
+ "KIND_PATH=\"$WORKSPACE/bin\"",
+ 'install-command-kind',
+ ].join(' ')
+
+ println(" ** Running: ${cmd}:\n")
+ sh("${cmd}")
+ } // script
+ } // steps
+ } // stage
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index eeb2fff..5339161 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -376,31 +376,44 @@
// -----------------------------------------------------------------------
stage ('Install Kail')
{
- String cmd = [
- 'make',
- '-C', "$WORKSPACE/voltha-system-tests",
- "KAIL_PATH=\"$WORKSPACE/bin\"",
- 'kail',
- ].join(' ')
+ steps
+ {
+ script
+ {
+ String cmd = [
+ 'make',
+ '-C', "$WORKSPACE/voltha-system-tests",
+ "KAIL_PATH=\"$WORKSPACE/bin\"",
+ 'kail',
+ ].join(' ')
- println(" ** Running: ${cmd}:\n")
- sh("${cmd}")
- }
+ println(" ** Running: ${cmd}:\n")
+ sh("${cmd}")
+ } // script
+ } // steps
+ } // stage
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
stage ('Install Kind')
{
- String cmd = [
- 'make',
- '-C', "$WORKSPACE/voltha-system-tests",
- "KIND_PATH=\"$WORKSPACE/bin\"",
- 'install-command-kind',
- ].join(' ')
+ steps
+ {
+ script
+ {
- println(" ** Running: ${cmd}:\n")
- sh("${cmd}")
- }
+ String cmd = [
+ 'make',
+ '-C', "$WORKSPACE/voltha-system-tests",
+ "KIND_PATH=\"$WORKSPACE/bin\"",
+ 'install-command-kind',
+ ].join(' ')
+
+ println(" ** Running: ${cmd}:\n")
+ sh("${cmd}")
+ } // script
+ } // steps
+ } // stage
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------