[VOL-4622] Fixed voltha-components software-upgrade pipeline to use correct versions
Change-Id: Ibfaea5716f636bd704a8116b9212dc71212904f2
diff --git a/jjb/pipeline/voltha/master/software-upgrades.groovy b/jjb/pipeline/voltha/master/software-upgrades.groovy
index e9ca104..0c259b9 100755
--- a/jjb/pipeline/voltha/master/software-upgrades.groovy
+++ b/jjb/pipeline/voltha/master/software-upgrades.groovy
@@ -20,14 +20,6 @@
$class: 'GitSCMSource',
remote: 'https://gerrit.opencord.org/ci-management.git'
])
-def openolt_adapter_deploy_tag = ""
-def openolt_adapter_test_tag = ""
-def openonu_adapter_deploy_tag = ""
-def openonu_adapter_test_tag = ""
-def rw_core_deploy_tag = ""
-def rw_core_test_tag = ""
-def ofagent_deploy_tag = ""
-def ofagent_test_tag = ""
// fetches the versions/tags of the voltha component
// returns the deployment version which is one less than the latest available tag of the repo, first voltha stack gets deployed using this;
@@ -54,6 +46,14 @@
def test_software_upgrade(name) {
def infraNamespace = "infra"
def volthaNamespace = "voltha"
+ def openolt_adapter_deploy_tag = ""
+ def openolt_adapter_test_tag = ""
+ def openonu_adapter_deploy_tag = ""
+ def openonu_adapter_test_tag = ""
+ def rw_core_deploy_tag = ""
+ def rw_core_test_tag = ""
+ def ofagent_deploy_tag = ""
+ def ofagent_test_tag = ""
def logsDir = "$WORKSPACE/${name}"
stage('Deploy Voltha - '+ name) {
timeout(10) {