Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not generate ignition_sim-* jobs #845

Merged
merged 3 commits into from
Nov 3, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ void generate_asan_ci_job(gz_ci_job, gz_sw, branch, distro, arch)
{
generate_ci_job(gz_ci_job, gz_sw, branch, distro, arch,
'-DGZ_SANITIZER=Address',
Globals.MAKETEST_SKIP_GZ,
Globals.MAKETEST_SKIP_GZ,
'export ASAN_OPTIONS=check_initialization_order=true')
}

Expand Down Expand Up @@ -727,6 +727,9 @@ gz_software.each { gz_sw ->
// 1. any
gz_software.each { gz_sw ->

if (gz_sw == 'sim')
return

if (is_a_colcon_package(gz_sw)) {
// colcon uses long paths and windows has a hard limit of 260 chars. Keep
// names minimal
Expand All @@ -738,12 +741,10 @@ gz_software.each { gz_sw ->
}

supported_branches = []
gz_software_name = gz_sw // Necessary substitution. gz_sw won't overwrite

// ign-gazebo only support Windows from ign-gazebo5
if (gz_sw == 'gazebo') {
supported_branches = [ 'ign-gazebo6', 'gz-sim7', 'main' ]
gz_software_name = "sim"
}

// ign-launch only support Windows from ign-launch5
Expand All @@ -762,7 +763,7 @@ gz_software.each { gz_sw ->
if (gz_sw == 'gui' ||
gz_sw == 'rendering' ||
gz_sw == 'sensors' ||
gz_software_name == 'sim')
gz_sw == 'gazebo')
label('win_rendering')


Expand Down Expand Up @@ -821,14 +822,16 @@ gz_software.each { gz_sw ->
if (gz_sw == 'gui' ||
gz_sw == 'rendering' ||
gz_sw == 'sensors' ||
gz_software_name == 'sim')
gz_sw == 'gazebo')
label('win_rendering')
}
}
}

// Main CI workflow
gz_software.each { gz_sw ->
if (gz_sw == 'sim')
return
def String ci_main_name = "ignition_${gz_sw}-ci-manual_any"
def gz_ci_main = pipelineJob(ci_main_name)
OSRFCIWorkFlowMultiAnyGitHub.create(gz_ci_main, ci_pr_any_list[gz_sw])
Expand Down