From 6e3651b0eb988e250eb32cf88656b2eb245c09bf Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Wed, 16 Oct 2024 21:30:50 -0700 Subject: [PATCH] fix --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 963a8f134783d7..4a1772628a60b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -91,7 +91,7 @@ def deviceStage(String stageName, String deviceType, List extra_env, def steps) device(device_ip, "git checkout", extra + "\n" + readFile("selfdrive/test/setup_device_ci.sh")) } steps.each { item -> - if (branch != "master" && item.size() == 3 && !hasPathChanged(item[2])) { + if (branch != "master" && branch != "jenkins_test_runner" && item.size() == 3 && !hasPathChanged(item[2])) { println "Skipping ${item[0]}: no changes in ${item[2]}." return; } else { @@ -164,13 +164,13 @@ node { 'testing-closet*', 'hotfix-*'] def excludeRegex = excludeBranches.join('|').replaceAll('\\*', '.*') - if (env.BRANCH_NAME != 'master' && env.BRANCH_NAME != '__jenkins_stress') { + if (env.BRANCH_NAME != 'master' && env.BRANCH_NAME != 'jenkins_test_runner') { properties([ disableConcurrentBuilds(abortPrevious: true) ]) } - if (env.BRANCH_NAME == 'jenkins_stress_NOT_NOW') { + if (env.BRANCH_NAME == 'jenkins_test_master') { sh '''#!/bin/bash # get crumb for CSRF COOKIE_JAR=/tmp/cookies