Merge "set pipeline-branch and pipeline-script for all job definitions"
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index 185ad84..1a7953c 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -269,7 +269,12 @@
leave('volthaDeploy')
} // script
- script { pgrep_port_forward() }
+ // Display spawned procs
+ script {
+ enter('bbsim-tests::pgrep_port_forward::0')
+ pgrep_port_forward('port-forw')
+ leave('bbsim-tests::pgrep_port_forward::0')
+ }
sh(label : 'Terminate kail-startup',
script : """
@@ -323,8 +328,11 @@
// ---------------------------------
// Sanity check port-forward spawned
// ---------------------------------
- // [TODO] - Wait until forwarding successful else fatal
- script { pgrep_port_forward() }
+ script {
+ enter('bbsim-tests::pgrep_port_forward::1')
+ pgrep_port_forward('port-forw')
+ leave('bbsim-tests::pgrep_port_forward::1')
+ }
// setting ONOS log level
script {
diff --git a/jjb/pipeline/voltha/physical-build.groovy b/jjb/pipeline/voltha/physical-build.groovy
index 17d48b3..9dfb588 100755
--- a/jjb/pipeline/voltha/physical-build.groovy
+++ b/jjb/pipeline/voltha/physical-build.groovy
@@ -16,6 +16,7 @@
// NOTE we are importing the library even if it's global so that it's
// easier to change the keywords during a replay
+
library identifier: 'cord-jenkins-libraries@master',
retriever: modernSCM([
$class: 'GitSCMSource',
diff --git a/vars/volthaInfraDeploy.groovy b/vars/volthaInfraDeploy.groovy
index 8397bf2..0a979e5 100644
--- a/vars/volthaInfraDeploy.groovy
+++ b/vars/volthaInfraDeploy.groovy
@@ -147,8 +147,8 @@
--set kafka.replicaCount=${cfg.kafkaReplica},kafka.zookeeper.replicaCount=${cfg.kafkaReplica} \
--set etcd.statefulset.replicaCount=${cfg.etcdReplica} \
--set etcd.replicaCount=${cfg.etcdReplica} \
- --set etcd.ingress.enabled=true
- --set etcd.ingress.enableVirtualHosts=true
+ --set etcd.ingress.enabled=true \
+ --set etcd.ingress.enableVirtualHosts=true \
-f $WORKSPACE/voltha-helm-charts/examples/${serviceConfigFile}-values.yaml ${cfg.extraHelmFlags}
""")
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 1705ce0..35a375c 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -58,8 +58,8 @@
--set global.stack_name=${cfg.stackName} \
--set global.voltha_infra_name=voltha-infra \
--set voltha.onos_classic.replicas=${cfg.onosReplica} \
- --set voltha.ingress.enabled=true
- --set voltha.ingress.enableVirtualHosts=true
+ --set voltha.ingress.enabled=true \
+ --set voltha.ingress.enableVirtualHosts=true \
--set global.voltha_infra_namespace=${cfg.infraNamespace} \
${cfg.extraHelmFlags}
""")