Skip to content

Commit

Permalink
CI: jenkins labels are less time consuming now (#26613) (#26636)
Browse files Browse the repository at this point in the history
(cherry picked from commit 2822e04)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
  • Loading branch information
mergify[bot] and v1v authored Jul 1, 2021
1 parent fb55165 commit f367f0b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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, forceWorkspace: true){
startCloudTestEnv(name: args.directory, dirs: args.dirs)
}
withCloudTestEnv() {
Expand All @@ -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, forceWorkspace: true){
stage("${args.context} ${v}"){
withEnv(["K8S_VERSION=${v}", "KIND_VERSION=v0.7.0", "KUBECONFIG=${env.WORKSPACE}/kubecfg"]){
withGithubNotify(context: "${args.context} ${v}") {
Expand Down Expand Up @@ -550,7 +550,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()
Expand Down

0 comments on commit f367f0b

Please sign in to comment.