Move salt formulas test to xenial jenkins node
Currently some tests are not build-able on jenkins bionic nodes
Related-bug: PROD-36062
Change-Id: I99990428ae976f2e8ee9d9d091c1a5fb7f0796c4
diff --git a/test-salt-formulas-env.groovy b/test-salt-formulas-env.groovy
index 43d318c..c526a51 100644
--- a/test-salt-formulas-env.groovy
+++ b/test-salt-formulas-env.groovy
@@ -27,6 +27,8 @@
env.GERRIT_BRANCH = GERRIT_PARENT_BRANCH
}
+def nodeLabel = 'old16.04'
+
def checkouted = false
def openstackTest = false
def travisLess = false /** TODO: Remove once formulas are witched to new config */
@@ -37,7 +39,7 @@
throttle(['test-formula']) {
timeout(time: 1, unit: 'HOURS') {
- node("python&&docker") {
+ node(nodeLabel) {
try {
stage("checkout") {
if (defaultGitRef && defaultGitUrl) {
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index 2876af1..6b86dad 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 ?: 'virtual'
+def slaveNode = env.SLAVE_NODE ?: 'old16.04'
def saltVersion = env.SALT_VERSION ?: ""
gerritBranch = 'master'
diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index 154df3d..9fded2e 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -28,9 +28,11 @@
def distribRevision = env.DISTRIB_REVISION ?: 'nightly'
def checkouted = false
+def nodeLabel = 'old16.04'
+
throttle(['test-model']) {
timeout(time: 1, unit: 'HOURS') {
- node("python&&docker") {
+ node(nodeLabel) {
try{
stage("checkout") {
if(defaultGitRef != "" && defaultGitUrl != "") {
diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index 3b88aee..0b4a4d6 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -86,8 +86,10 @@
return true;
}
+def nodeLabel = 'old16.04'
+
timeout(time: 12, unit: 'HOURS') {
- node("python") {
+ node(nodeLabel) {
try{
stage("checkout") {
if (gerritRef) {