From 8a70845181009ef0b617705d46b8f45538eebc02 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 30 Jun 2021 14:22:20 +0100 Subject: [PATCH 1/3] CI: jenkins labels are less time consuming now --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e4dc51d510e..0fda55cc25dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -283,7 +283,7 @@ def generateStages(Map args = [:]) { } def cloud(Map args = [:]) { - withNode(labels: args.label, sleepMin: 30, sleepMax: 200, forceWorkspace: true){ + withNode(labels: args.label, sleepMin: 0, sleepMax: 0, forceWorkspace: true){ startCloudTestEnv(name: args.directory, dirs: args.dirs) } withCloudTestEnv() { @@ -298,7 +298,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, sleepMin: 0, sleepMax: 0, forceWorkspace: true){ stage("${args.context} ${v}"){ withEnv(["K8S_VERSION=${v}", "KIND_VERSION=v0.7.0", "KUBECONFIG=${env.WORKSPACE}/kubecfg"]){ withGithubNotify(context: "${args.context} ${v}") { @@ -551,7 +551,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, sleepMin: 0, sleepMax: 0, forceWorkspace: true){ withGithubNotify(context: "${context}") { withBeatsEnv(archive: true, withModule: withModule, directory: directory, id: args.id) { dumpVariables() From 7a30a3e884a7bbbf5501b9e29dbdb20dfc1f0d70 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 30 Jun 2021 14:44:20 +0100 Subject: [PATCH 2/3] Apply suggestions from code review --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0fda55cc25dc..2ea9a8344172 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -283,7 +283,7 @@ def generateStages(Map args = [:]) { } def cloud(Map args = [:]) { - withNode(labels: args.label, sleepMin: 0, sleepMax: 0, forceWorkspace: true){ + withNode(labels: args.label, sleepMin: 0, sleepMax: 1, forceWorkspace: true){ startCloudTestEnv(name: args.directory, dirs: args.dirs) } withCloudTestEnv() { @@ -298,7 +298,7 @@ def cloud(Map args = [:]) { def k8sTest(Map args = [:]) { def versions = args.versions versions.each{ v -> - withNode(labels: args.label, sleepMin: 0, sleepMax: 0, forceWorkspace: true){ + withNode(labels: args.label, sleepMin: 0, sleepMax: 1, forceWorkspace: true){ stage("${args.context} ${v}"){ withEnv(["K8S_VERSION=${v}", "KIND_VERSION=v0.7.0", "KUBECONFIG=${env.WORKSPACE}/kubecfg"]){ withGithubNotify(context: "${args.context} ${v}") { @@ -551,7 +551,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: 0, sleepMax: 0, forceWorkspace: true){ + withNode(labels: args.label, sleepMin: 0, sleepMax: 1, forceWorkspace: true){ withGithubNotify(context: "${context}") { withBeatsEnv(archive: true, withModule: withModule, directory: directory, id: args.id) { dumpVariables() From 9bdef7c0892a7a770887c81dc179c00b3ebf9c64 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 30 Jun 2021 17:01:48 +0100 Subject: [PATCH 3/3] Apply suggestions from code review --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2ea9a8344172..05a1da64b5e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -283,7 +283,7 @@ def generateStages(Map args = [:]) { } def cloud(Map args = [:]) { - withNode(labels: args.label, sleepMin: 0, sleepMax: 1, forceWorkspace: true){ + withNode(labels: args.label, forceWorkspace: true){ startCloudTestEnv(name: args.directory, dirs: args.dirs) } withCloudTestEnv() { @@ -298,7 +298,7 @@ def cloud(Map args = [:]) { def k8sTest(Map args = [:]) { def versions = args.versions versions.each{ v -> - withNode(labels: args.label, sleepMin: 0, sleepMax: 1, 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}") { @@ -551,7 +551,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: 0, sleepMax: 1, forceWorkspace: true){ + withNode(labels: args.label, forceWorkspace: true){ withGithubNotify(context: "${context}") { withBeatsEnv(archive: true, withModule: withModule, directory: directory, id: args.id) { dumpVariables()