From 095495d838ca52c512389d68bd8cb4095c6292c0 Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@gmail.com>
Date: Sun, 21 Oct 2018 14:27:49 -0500
Subject: [PATCH] Switch pipeline to use new vm lib and few fixes

Change-Id: Idbe14bac754fb13f9a9de5e36a5a6b542e665750
---
 tools/gate/Jenkinsfile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/gate/Jenkinsfile b/tools/gate/Jenkinsfile
index 70f27ca42..1cc5955b0 100644
--- a/tools/gate/Jenkinsfile
+++ b/tools/gate/Jenkinsfile
@@ -335,12 +335,17 @@ def sanity_tests = {
 
 //// main flow
 
-vm2() {
-    // wait and make sure genesis is up, and remove docker
-    // this ensures no containers are running after reboot
+vm(timeout: 360) {
+    // wait and make sure genesis is up
     ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')
+
+
+    // disable docker/kubelet services
+    // this is done to be able to properly cleanup genesis after reboot
     ssh.cmd (GENESIS_CREDS, GENESIS_IP,
-             'sudo apt-get remove docker-engine -y')
+             'sudo systemctl disable kubelet')
+    ssh.cmd (GENESIS_CREDS, GENESIS_IP,
+             'sudo systemctl disable docker')
 
     sh 'sudo apt-get update'
     sh 'sudo apt-get install docker.io -y'