commit bc0ba5bd2b98dc3ee7c7e0bac28f68923dc06b12
author Scott Baker <scottb@opennetworking.org> Thu Jun 04 18:18:17 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu Jun 04 18:18:17 2020 +0000
tree 4049330e253b60525202770f20a810d849449196
parent c3dea5338d96c6f35a7bcc17250144729b203f2b
parent fcae3839faadd1d4347f83727f4bcf04a4308ed8

Merge "VOL-3165 Cleanup voltctl pod at end of test"

jjb/pipeline/voltha-go-tests.groovy

diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index df0c476..e843fa8 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -158,6 +158,7 @@
          ## shut down voltha but leave kind-voltha cluster
          cd $HOME/kind-voltha/
          DEPLOY_K8S=n WAIT_ON_DOWN=y ./voltha down
+         kubectl delete deployment voltctl || true
          '''
          step([$class: 'RobotPublisher',
             disableArchiveOutput: false,

jjb/pipeline/voltha-nightly-tests-bbsim.groovy

diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index 51044d8..f01a024 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -199,6 +199,7 @@
          ## shut down voltha but leave kind-voltha cluster
          cd $HOME/kind-voltha/
          DEPLOY_K8S=n WAIT_ON_DOWN=y ./voltha down
+         kubectl delete deployment voltctl || true
          '''
          step([$class: 'RobotPublisher',
             disableArchiveOutput: false,