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.

Sign up for GitHub

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

Change all PR ci jobs (-ci-pr_any-) to use the yaml configuration #1022

Merged
merged 7 commits into from
Oct 6, 2023
Merged

Change all PR ci jobs (-ci-pr_any-) to use the yaml configuration #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b097771
Enable push checks
j-rivero Sep 28, 2023
7473a18
Just report tru on linux pr_any
j-rivero Sep 28, 2023
fbe24f3
Geneate -ci-pr_any- for all jobs using yaml
j-rivero Sep 28, 2023
96730d4
Limit to Harmonic the -ci- branches testing
j-rivero Sep 28, 2023
ecefecd
Revert "Enable push checks"
j-rivero Oct 2, 2023
9f8633a
Generate the fake sdformat job for ubuntu-auto from sdformat.dsl
j-rivero Oct 2, 2023
88034f6
Merge branch 'master' into jrivero/ci-pr_any-new
j-rivero Oct 6, 2023
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
8 changes: 4 additions & 4 deletions jenkins-scripts/dsl/gazebo_libs.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ boolean is_testing_enabled(lib_name, ci_config)
void generate_ciconfigs_by_lib(config, configs_per_lib_index)
{
config.collections.each { collection ->
// TODO(jrivero): limit to harmonic for testing proposes
if (collection.name != 'harmonic')
return

collection.libs.each { lib ->
def libName = lib.name
def branch = lib.repo.current_branch
Expand Down Expand Up @@ -181,6 +177,10 @@ configs_per_lib_index.each { lib_name, lib_configs ->

// CI branch jobs (-ci-$branch-) (pulling check every 5 minutes)
branches_with_collections.each { branch_and_collection ->
// TODO: remove after testing
if (branch_and_collection.collection != 'harmonic')
return

branch_name = branch_and_collection.branch
def gz_ci_job = job("${gz_job_name_prefix}-ci-${branch_name}-${distro}-${arch}")
generate_ci_job(gz_ci_job, lib_name, branch_name, ci_config)
Expand Down
28 changes: 5 additions & 23 deletions jenkins-scripts/dsl/ignition.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,31 +443,13 @@ gz_software.each { gz_sw ->
def gz_ci_job_name = "ignition_${software_name}-ci-pr_any-ubuntu_auto-${arch}"
def gz_ci_any_job = job(gz_ci_job_name)
def gz_checkout_dir = "ign-${software_name}"
OSRFLinuxCompilationAnyGitHub.create(gz_ci_any_job,
"gazebosim/${gz_checkout_dir}",
enable_testing(software_name))
include_gpu_label_if_needed(gz_ci_any_job, software_name)
GenericAnyJobGitHub.create(gz_ci_any_job,
"gazebosim/${gz_checkout_dir}",
[],
true)
gz_ci_any_job.with
{
if (gz_sw == 'physics') {
label Globals.nontest_label("large-memory")
extra_str += '\nexport MAKE_JOBS=1'
}

steps
{
shell("""\
#!/bin/bash -xe

export DISTRO=${ci_distro_str}

${GLOBAL_SHELL_CMD}

export ARCH=${arch}

/bin/bash -xe ./scripts/jenkins-scripts/docker/gz_${gz_sw.replaceAll('-','_')}-compilation.bash
""".stripIndent())
} // end of steps
description 'Automatic generated job by DSL jenkins. Stub job for migration, not doing any check'
} // end of ci_any_job

// add ci-pr_any to the list for CIWorkflow
Expand Down
20 changes: 4 additions & 16 deletions jenkins-scripts/dsl/sdformat.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,24 +87,12 @@ ci_distro.each { distro ->
}

// --------------------------------------------------------------
// 2. Create the any job
// 2. Create a fake any job for migrating
// TODO: remove the job once the migration in https://github.com/gazebo-tooling/release-tools/issues/1010
// is done.
String sdf_repo = "gazebosim/sdformat"
def sdformat_ci_any_job = job(ci_build_any_job_name_linux)
OSRFLinuxCompilationAnyGitHub.create(sdformat_ci_any_job, sdf_repo)
sdformat_ci_any_job.with
{
steps
{
shell("""\
#!/bin/bash -xe

export DISTRO=${ci_distro_str}

export ARCH=${arch}
/bin/bash -xe ./scripts/jenkins-scripts/docker/sdformat-compilation.bash
""".stripIndent())
}
}
GenericAnyJobGitHub.create(sdformat_ci_any_job, sdf_repo)
} // end of arch
} // end of distro

Expand Down