From 90ab1770de7cc97868200579cc04b5f7a5cf7d90 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 1 Jul 2021 08:44:15 +0100 Subject: [PATCH] CI: jenkins labels are less time consuming now (#26613) (cherry picked from commit 2822e042685ccd0bebda39b2209bfe7da3fab657) --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f3f04d56a1d..861e7b527cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -282,7 +282,7 @@ def generateStages(Map args = [:]) { } def cloud(Map args = [:]) { - withNode(labels: args.label, sleepMin: 30, sleepMax: 200, forceWorkspace: true){ + withNode(labels: args.label, forceWorkspace: true){ startCloudTestEnv(name: args.directory, dirs: args.dirs) } withCloudTestEnv() { @@ -297,7 +297,7 @@ def cloud(Map args = [:]) { def k8sTest(Map args = [:]) { def versions = args.versions versions.each{ v -> - withNode(labels: args.label, sleepMin: 30, sleepMax: 200, forceWorkspace: true){ + withNode(labels: args.label, forceWorkspace: true){ stage("${args.context} ${v}"){ withEnv(["K8S_VERSION=${v}", "KIND_VERSION=v0.7.0", "KUBECONFIG=${env.WORKSPACE}/kubecfg"]){ withGithubNotify(context: "${args.context} ${v}") { @@ -549,7 +549,7 @@ def target(Map args = [:]) { def isE2E = args.e2e?.get('enabled', false) def isPackaging = args.get('package', false) def dockerArch = args.get('dockerArch', 'amd64') - withNode(labels: args.label, sleepMin: 30, sleepMax: 200, forceWorkspace: true){ + withNode(labels: args.label, forceWorkspace: true){ withGithubNotify(context: "${context}") { withBeatsEnv(archive: true, withModule: withModule, directory: directory, id: args.id) { dumpVariables()