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

Remove the ubuntu_auto -ci-pr_any- fake jobs #1065

Merged
merged 1 commit into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
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
23 changes: 0 additions & 23 deletions jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -421,29 +421,6 @@ gz_software.each { gz_sw ->
} // end of with
} // end of abi_distro

// 1.2.1 Main PR jobs (-ci-pr_any-) (pulling check every 5 minutes)
// --------------------------------------------------------------
software_name = gz_sw // Necessary substitution. gz_sw won't overwrite

if (gz_sw == 'sim')
software_name = "gazebo"

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}"
GenericAnyJobGitHub.create(gz_ci_any_job,
"gazebosim/${gz_checkout_dir}",
[],
true)
gz_ci_any_job.with
{
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
if (gz_sw != 'sim')
ci_pr_any_list[software_name] << gz_ci_job_name

all_supported_distros.each { distro ->
all_branches("${gz_sw}").each { branch ->
// 1. Standard CI
Expand Down
18 changes: 1 addition & 17 deletions jenkins-scripts/dsl/sdformat.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ def supported_arches = Globals.get_supported_arches()
def experimental_arches = Globals.get_experimental_arches()

String ci_distro_str = ci_distro[0]
String ci_build_any_job_name_linux = "sdformat-ci-pr_any-ubuntu_auto-amd64"

// Need to be used in ci_pr
String abi_job_name = ''
Expand Down Expand Up @@ -59,20 +58,6 @@ abi_distro.each { distro ->
} // end of arch
} // end of distro

// MAIN CI job
// CI JOBS @ SCM/5 min
ci_distro.each { distro ->
supported_arches.each { arch ->
// --------------------------------------------------------------
// 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)
GenericAnyJobGitHub.create(sdformat_ci_any_job, sdf_repo)
} // end of arch
} // end of distro

void generate_asan_ci_job(sdformat_ci_job, version, distro, arch)
{
generate_ci_job(sdformat_ci_job, version, distro, arch,
Expand Down Expand Up @@ -258,5 +243,4 @@ all_versions.each { version ->
// Create the manual all-platforms jobs
def sdformat_ci_main = pipelineJob("sdformat-ci-manual_any")
OSRFCIWorkFlowMultiAnyGitHub.create(sdformat_ci_main,
[ci_build_any_job_name_linux,
ci_build_any_job_name_win7])
[ci_build_any_job_name_win7])