Merge "OpenOnuAdapter: Backport SW-Upgrade tests"
diff --git a/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
index 21331f8..56ddf59 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-multi-stack.groovy
@@ -148,6 +148,7 @@
}
stage('Deploy Voltha') {
steps {
+ installVoltctl("${release}")
deploy_voltha_stacks(params.volthaStacks)
}
}
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index bdee200..d5aed18 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -52,6 +52,7 @@
EXTRA_HELM_FLAGS=" "
LOG_FOLDER="$WORKSPACE/logs"
GERRIT_PROJECT="${GERRIT_PROJECT}"
+ PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
}
stages {
@@ -148,6 +149,7 @@
stage('Deploy Voltha') {
steps {
timeout(time: 10, unit: 'MINUTES') {
+ installVoltctl("${release}")
script {
startComponentsLogs([
appsToLog: [
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-multi-stack.groovy
index 8161b70..db82cea 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-multi-stack.groovy
@@ -148,6 +148,7 @@
}
stage('Deploy Voltha') {
steps {
+ installVoltctl("${release}")
deploy_voltha_stacks(params.volthaStacks)
}
}
diff --git a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
index 391c07a..e3ac7bb 100644
--- a/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/voltha-2.8/voltha-scale-test.groovy
@@ -55,6 +55,7 @@
LOG_FOLDER="$WORKSPACE/logs"
GERRIT_PROJECT="${GERRIT_PROJECT}"
+ PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
}
stages {
@@ -151,6 +152,7 @@
stage('Deploy Voltha') {
steps {
timeout(time: 10, unit: 'MINUTES') {
+ installVoltctl("${release}")
script {
sh returnStdout: false, script: '''
# start logging with kail