[VOL-5180] - installVolthaStack: enhance polling loop
vars/volthaStackDeploy.groovy
-----------------------------
o Fixed typo in s/scriptx/script/, (grumble) gaming keyboard can be a
bit too responsive at times.
o Misc npm-groovy-lint inspired cleanups.
Change-Id: I6cd369d2d97a0dcc1eced983b015c21c14c32d4a
diff --git a/vars/volthaStackDeploy.groovy b/vars/volthaStackDeploy.groovy
index 9b198e5..a0c3a89 100644
--- a/vars/volthaStackDeploy.groovy
+++ b/vars/volthaStackDeploy.groovy
@@ -71,10 +71,11 @@
if (cfg.workflow == 'att' || cfg.workflow == 'tt') {
int startingStag = 900
- def serviceConfigFile = cfg.workflow
+ def serviceConfigFile = cfg.workflow // type(?) String
if (cfg.withMacLearning && cfg.workflow == 'tt') {
serviceConfigFile = 'tt-maclearner'
}
+ // bbsimCfg: type(?) Map
def bbsimCfg = readYaml file: "$WORKSPACE/voltha-helm-charts/examples/${serviceConfigFile}-values.yaml"
// NOTE we assume that the only service that needs a different s_tag is the first one in the list
bbsimCfg['servicesConfig']['services'][0]['s_tag'] = startingStag + i
@@ -160,7 +161,7 @@
fi
## -----------------------
- ## Probe for cluster state
+ ## Probe for cluster state
## -----------------------
if grep -q -e 'ContainerCreating' \$vsd_log; then
echo -e '\nvolthaStackDeploy.groovy: ContainerCrating active'
@@ -188,7 +189,7 @@
# An extra conditon needed here but shell coding is tricky:
# "svc x/y Running 0 6s
# Verify (x == y) && (x > 0)
- # Wait until job failure/we have an actual need for it.
+ # Wait until job failure/we have an actual need for it.
# -----------------------------------------------------------------------
else
echo -e '\nvolthaStackDeploy.groovy: Voltha stack has launched'
@@ -215,7 +216,7 @@
enter('waitForOnosDeploy')
sh(label : 'Wait for ONOS full deployment',
- Scriptx : """
+ script : """
cat <<EOM
@@ -314,7 +315,7 @@
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
-def call(Map config=[:]) {
+def call(Map config=[:]) { // Function return type(?)
try {
enter('main')
process(config)