Skip to content

Commit

Permalink
No need to wait pods up in during setting up test
Browse files Browse the repository at this point in the history
There's a step wait all pods in running status when checking netmaster
ready, function called `waitUntilAllPodsReady`
  • Loading branch information
Wei Tie committed Jan 11, 2018
1 parent 92cd7d5 commit 4f714e3
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions test/systemtests/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1248,10 +1248,6 @@ func (s *systemtestSuite) SetUpSuiteVagrant(c *C) {
contivNodes = 4 // 3 contiv nodes + 1 k8master
c.Assert(s.vagrant.Setup(false, []string{"CONTIV_L3=1 VAGRANT_CWD=" + topDir + "/src/github.com/contiv/netplugin/vagrant/k8s/"}, contivNodes), IsNil)

// Sleep to give enough time for the netplugin pods to come up
logrus.Infof("Sleeping for 1 minute for pods to come up")
time.Sleep(time.Minute)

case swarmScheduler:
c.Assert(s.vagrant.Setup(false, append([]string{"CONTIV_NODES=3 CONTIV_L3=1"}, s.basicInfo.SwarmEnv), contivNodes+contivL3Nodes), IsNil)
default:
Expand All @@ -1275,10 +1271,6 @@ func (s *systemtestSuite) SetUpSuiteVagrant(c *C) {

c.Assert(s.vagrant.Setup(false, []string{"VAGRANT_CWD=" + topDir + "/src/github.com/contiv/netplugin/vagrant/k8s/"}, contivNodes), IsNil)

// Sleep to give enough time for the netplugin pods to come up
logrus.Infof("Sleeping for 1 minute for pods to come up")
time.Sleep(time.Minute)

case swarmScheduler:
c.Assert(s.vagrant.Setup(false, append([]string{}, s.basicInfo.SwarmEnv), contivNodes), IsNil)
default:
Expand Down

0 comments on commit 4f714e3

Please sign in to comment.