Update label for salt-formula tests
Jenkins nodes labeled "old16.04" were deleted
Change-Id: If57a195688f1abeb65858cb5527bc57fbde18f40
diff --git a/test-salt-formulas-env.groovy b/test-salt-formulas-env.groovy
index 5c3b894..e2b164c 100644
--- a/test-salt-formulas-env.groovy
+++ b/test-salt-formulas-env.groovy
@@ -27,7 +27,7 @@
env.GERRIT_BRANCH = GERRIT_PARENT_BRANCH
}
-def nodeLabel = 'old16.04'
+def nodeLabel = 'docker'
def checkouted = false
def openstackTest = false
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index 6cb3b30..958cd1e 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -14,7 +14,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 ?: 'old16.04'
+def slaveNode = env.SLAVE_NODE ?: 'docker'
def saltVersion = env.SALT_VERSION ?: ""
gerritBranch = 'master'
diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index 9fded2e..a0d62b3 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -28,7 +28,7 @@
def distribRevision = env.DISTRIB_REVISION ?: 'nightly'
def checkouted = false
-def nodeLabel = 'old16.04'
+def nodeLabel = 'docker'
throttle(['test-model']) {
timeout(time: 1, unit: 'HOURS') {
diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index 0b4a4d6..ef26ea5 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -86,7 +86,7 @@
return true;
}
-def nodeLabel = 'old16.04'
+def nodeLabel = 'docker'
timeout(time: 12, unit: 'HOURS') {
node(nodeLabel) {