[VOL-2785] Fix release job to pull ofagent py version 2.2.4
Change-Id: If89e0d38e2e5351e25ba02fe230eafb5f7256f9f
diff --git a/Jenkinsfile-voltha-bal31-build b/Jenkinsfile-voltha-bal31-build
index 40a7d4e..c91d7a1 100644
--- a/Jenkinsfile-voltha-bal31-build
+++ b/Jenkinsfile-voltha-bal31-build
@@ -24,12 +24,7 @@
sh returnStdout: true, script: "git clone -b master ${cordRepoUrl}/helm-repo-tools"
sh returnStdout: true, script: "git clone -b master ${cordRepoUrl}/${configBaseDir}"
sh returnStdout: true, script: "git clone -b master ${cordRepoUrl}/voltha-system-tests"
- if ( params.released ) {
- sh returnStdout: true, script: "git clone https://github.com/ciena/kind-voltha.git -b v2.2"
- }
- else {
- sh returnStdout: true, script: "git clone https://github.com/ciena/kind-voltha.git"
- }
+ sh returnStdout: true, script: "git clone https://github.com/ciena/kind-voltha.git"
if ( params.workFlow == "DT" ) {
deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
}
@@ -82,20 +77,9 @@
export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
cd kind-voltha/
if ( ${released} ); then
- export EXTRA_HELM_FLAGS="--set defaults.image_tag=null,images.onos.tag=4.0.0,images.onos.repository=voltha/voltha-onos"
- git clone -b '2.3.0rc1' --single-branch --depth 1 https://gerrit.opencord.org/voltha-helm-charts.git
- cd voltha-helm-charts
- helm dep update voltha-adapter-openolt
- helm dep update voltha-adapter-openonu
- helm dep update voltha-adapter-simulated
- helm dep update voltha
- export VOLTHA_ADAPTER_OPEN_OLT_CHART=voltha-helm-charts/voltha-adapter-openolt
- export VOLTHA_ADAPTER_OPEN_ONU_CHART=voltha-helm-charts/voltha-adapter-openonu
- export VOLTHA_ADAPTER_SIM_CHART=voltha-helm-charts/voltha-adapter-simulated
- export VOLTHA_CHART=voltha-helm-charts/voltha
+ export EXTRA_HELM_FLAGS="--set defaults.image_tag=null,images.onos.tag=4.0.0,images.onos.repository=voltha/voltha-onos,use_ofagent_go=false,images.ofagent.repository=voltha/voltha-ofagent,images.ofagent.tag=2.2.4"
cd $WORKSPACE/kind-voltha
- source releases/voltha-2.2
- cd $WORKSPACE/kind-voltha
+ source releases/voltha-2.3.0-rc1
elif ( ${ofagentGo} ); then
export EXTRA_HELM_FLAGS='-f $WORKSPACE/${configBaseDir}/${configKubernetesDir}/voltha/${configFileName}-ofagent-go.yml'
else