Revert "temporary switch to hardware slaves"
This reverts commit aa7b43a301db1a255c84ae9224cb4ae0ba315ca1.
Change-Id: Icce80cc3d2a797f2c27566311c43501715b2fcc4
diff --git a/docker-mirror-images.groovy b/docker-mirror-images.groovy
index 51a621e..e308281 100644
--- a/docker-mirror-images.groovy
+++ b/docker-mirror-images.groovy
@@ -24,8 +24,7 @@
external = false
externalMarker = '/mirantis/external/'
-// slaveNode = env.SLAVE_NODE ?: 'docker'
-slaveNode = env.SLAVE_NODE ?: 'hardware'
+slaveNode = env.SLAVE_NODE ?: 'virtual'
setDefaultArtifactoryProperties = env.SET_DEFAULT_ARTIFACTORY_PROPERTIES ?: true
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 1b37339..67c0431 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -15,8 +15,7 @@
python = new com.mirantis.mk.Python()
saltModelTesting = new com.mirantis.mk.SaltModelTesting()
-// slaveNode = env.getProperty('SLAVE_NODE') ?: 'python&&docker'
-slaveNode = env.getProperty('SLAVE_NODE') ?: 'hardware'
+slaveNode = env.getProperty('SLAVE_NODE') ?: 'virtual'
gerritCredentials = env.getProperty('CREDENTIALS_ID') ?: 'gerrit'
runTestModel = (env.getProperty('TEST_MODEL') ?: true).toBoolean()
distribRevision = 'proposed'
diff --git a/test-cookiecutter-reclass-chunk.groovy b/test-cookiecutter-reclass-chunk.groovy
index 8510846..8caca44 100644
--- a/test-cookiecutter-reclass-chunk.groovy
+++ b/test-cookiecutter-reclass-chunk.groovy
@@ -9,8 +9,7 @@
* SLAVE_NODE:
*/
-// slaveNode = env.SLAVE_NODE ?: 'python&&docker'
-slaveNode = env.SLAVE_NODE ?: 'hardware'
+slaveNode = env.SLAVE_NODE ?: 'virtual'
timeout(time: 1, unit: 'HOURS') {
node(slaveNode) {
diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index f6f950a..8076041 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -27,8 +27,7 @@
extraVars = [:]
}
-// slaveNode = env.SLAVE_NODE ?: 'virtual'
-slaveNode = env.SLAVE_NODE ?: 'hardware'
+slaveNode = env.SLAVE_NODE ?: 'virtual'
checkIncludeOrder = env.CHECK_INCLUDE_ORDER ?: false
// Global var's
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index b4c3451..088a744 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -13,8 +13,7 @@
def gerritRef = env.GERRIT_REFSPEC ?: null
def defaultGitRef = env.DEFAULT_GIT_REF ?: null
def defaultGitUrl = env.DEFAULT_GIT_URL ?: null
-// def slaveNode = env.SLAVE_NODE ?: 'python&&docker'
-def slaveNode = env.SLAVE_NODE ?: 'hardware'
+def slaveNode = env.SLAVE_NODE ?: 'virtual'
def saltVersion = env.SALT_VERSION ?: ""
def dockerLib = new com.mirantis.mk.Docker()
diff --git a/test-system-reclass-pipeline.groovy b/test-system-reclass-pipeline.groovy
index f49b801..72b618b 100644
--- a/test-system-reclass-pipeline.groovy
+++ b/test-system-reclass-pipeline.groovy
@@ -12,8 +12,7 @@
extraVarsYaml = JsonOutput.toJson(env.getEnvironment().findAll{ it.key.startsWith('GERRIT_') })
}
-//def slaveNode = env.SLAVE_NODE ?: 'python&&docker'
-def slaveNode = env.SLAVE_NODE ?: 'hardware'
+def slaveNode = env.SLAVE_NODE ?: 'virtual'
def gerritCredentials = env.CREDENTIALS_ID ?: 'gerrit'
def gerritRef = env.GERRIT_REFSPEC ?: null