Add missing line continuation characters
Add the line continuation characters missing from the recent ingress
lines which resulted in this error:
+ --set etcd.ingress.enableVirtualHosts=true
/w/workspace/periodic-software-upgrade-test-bbsim@tmp/durable-9565aa33/script.sh: line 3: --set: command not found
Also include an extra change in jjb to trigger jenkins job in vars/.
Fixes: 7b065235 ("deploy: set helm flags to deploy etcd and voltha ingress")
Signed-off-by: Roger Luethi <roger@opennetworking.org>
Change-Id: I9efd323b8771b22a267f4e0037dad90a30c1bbfd
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}
""")