commit 53f212c7d32b32d066982b4539974f1dafc4debb
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Dec 13 13:51:07 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Dec 13 13:51:07 2018 +0000
tree ba17b2290d15d59b43b1b1568683ece25d4e21ca
parent 6c6b08eb87cc24a776df0b9d6a765fe5c38d120d
parent d9d682ee9272055f81864c8dfe939df9d4658c16

Merge "Add containerd support for Calico upgrade"

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 79a1632..27313c7 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -27,7 +27,7 @@
     extraVars = [:]
 }
 
-slaveNode = env.SLAVE_NODE ?: 'docker'
+slaveNode = env.SLAVE_NODE ?: 'virtual'
 checkIncludeOrder = env.CHECK_INCLUDE_ORDER ?: false
 
 // Global var's

test-salt-model-wrapper.groovy

diff --git a/test-salt-model-wrapper.groovy b/test-salt-model-wrapper.groovy
index 9f61db8..f49b7fc 100644
--- a/test-salt-model-wrapper.groovy
+++ b/test-salt-model-wrapper.groovy
@@ -12,7 +12,7 @@
 
 cookiecutterTemplatesRepo='mk/cookiecutter-templates'
 reclassSystemRepo='salt-models/reclass-system'
-slaveNode = env.getProperty('SLAVE_NODE') ?: 'python&&docker'
+slaveNode = env.getProperty('SLAVE_NODE') ?: 'virtual'
 
 voteMatrix = [
   'test-mk-cookiecutter-templates': true,