Merge "Added debugging for v-s-t sanity-test failure."
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index b99bb25..c24a586 100755
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -27,7 +27,33 @@
def infraNamespace = "default"
def volthaNamespace = "voltha"
def logsDir = "$WORKSPACE/${testTarget}"
- stage('Cleanup') {
+
+ stage('IAM')
+ {
+ script
+ {
+ String iam = [
+ 'ci-management',
+ 'jjb',
+ 'pipeline',
+ 'voltha',
+ 'master',
+ 'bbsim-tests.groovy'
+ ].join('/')
+ println("** ${iam}: ENTER")
+
+ String cmd = "which pkill"
+ def stream = sh(
+ returnStatus:false,
+ returnStdout: true,
+ script: cmd)
+ println(" ** ${cmd}:\n${stream}")
+
+ println("** ${iam}: LEAVE")
+ }
+ }
+
+ stage('Cleanup') {
if (teardown) {
timeout(15) {
script {
diff --git a/jjb/pipeline/voltha/voltha-2.10/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.10/bbsim-tests.groovy
index 5f68dbc..98b0b23 100755
--- a/jjb/pipeline/voltha/voltha-2.10/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.10/bbsim-tests.groovy
@@ -40,13 +40,6 @@
'bbsim-tests.groovy'
].join('/')
println("** ${iam}: ENTER")
-
- String cmd = "which pkill"
- def stream = sh(
- returnStatus:false,
- returnStdout: true,
- script: cmd)
- println(" ** ${cmd}:\n${stream}")
println("** ${iam}: LEAVE")
}
}
diff --git a/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
index 3433a04..b35a8b1 100755
--- a/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
@@ -25,17 +25,26 @@
def clusterName = "kind-ci"
def execute_test(testTarget, workflow, testLogging, teardown, testSpecificHelmFlags = "") {
- def infraNamespace = "default"
- def volthaNamespace = "voltha"
- def logsDir = "$WORKSPACE/${testTarget}"
+ def infraNamespace = "default"
+ def volthaNamespace = "voltha"
+ def logsDir = "$WORKSPACE/${testTarget}"
- stage('IAM')
+ stage('IAM')
{
- print('''
-jjb/pipeline/voltha/voltha-2.11
------------------------------------------------------------------------
-''')
- }
+ script
+ {
+ String iam = [
+ 'ci-management',
+ 'jjb',
+ 'pipeline',
+ 'voltha',
+ 'voltha-11',
+ 'bbsim-tests.groovy'
+ ].join('/')
+ println("** ${iam}: ENTER")
+ println("** ${iam}: LEAVE")
+ }
+ }
stage('Cleanup') {
if (teardown) {
diff --git a/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy
index 85683db..fadd09b 100755
--- a/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/bbsim-tests.groovy
@@ -24,10 +24,28 @@
def clusterName = "kind-ci"
def execute_test(testTarget, workflow, testLogging, teardown, testSpecificHelmFlags = "") {
- def infraNamespace = "default"
- def volthaNamespace = "voltha"
- def logsDir = "$WORKSPACE/${testTarget}"
- stage('Cleanup') {
+ def infraNamespace = "default"
+ def volthaNamespace = "voltha"
+ def logsDir = "$WORKSPACE/${testTarget}"
+
+ stage('IAM')
+ {
+ script
+ {
+ String iam = [
+ 'ci-management',
+ 'jjb',
+ 'pipeline',
+ 'voltha',
+ 'voltha-2.8',
+ 'bbsim-tests.groovy'
+ ].join('/')
+ println("** ${iam}: ENTER")
+ println("** ${iam}: LEAVE")
+ }
+ }
+
+ stage('Cleanup') {
if (teardown) {
timeout(15) {
script {
diff --git a/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy
index 2fdfc38..4e1895f 100755
--- a/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.9/bbsim-tests.groovy
@@ -24,10 +24,28 @@
def clusterName = "kind-ci"
def execute_test(testTarget, workflow, testLogging, teardown, testSpecificHelmFlags = "") {
- def infraNamespace = "default"
- def volthaNamespace = "voltha"
- def logsDir = "$WORKSPACE/${testTarget}"
- stage('Cleanup') {
+ def infraNamespace = "default"
+ def volthaNamespace = "voltha"
+ def logsDir = "$WORKSPACE/${testTarget}"
+
+ stage('IAM')
+ {
+ script
+ {
+ String iam = [
+ 'ci-management',
+ 'jjb',
+ 'pipeline',
+ 'voltha',
+ 'voltha-2.9',
+ 'bbsim-tests.groovy'
+ ].join('/')
+ println("** ${iam}: ENTER")
+ println("** ${iam}: LEAVE")
+ }
+ }
+
+ stage('Cleanup') {
if (teardown) {
timeout(15) {
script {