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

Default to Focal for CI #565

Merged
merged 15 commits into from
Jan 5, 2022
Merged

Default to Focal for CI #565

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0db015d
Default to Focal for CI
chapulina Nov 19, 2021
63a5436
Remove Globals.get_gz11_ubuntu_distro
scpeters Nov 21, 2021
929dd18
Update jenkins-scripts/dsl/_configs_/Globals.groovy
chapulina Dec 10, 2021
26b6e6c
Add testing jobs for Focal and Jammy Ubuntu packages
j-rivero Dec 15, 2021
d40d863
Remove nightly support
j-rivero Dec 15, 2021
9457549
Remove ci_distro_default hack
j-rivero Dec 15, 2021
579eeb4
Move master jobs to gazebo11
j-rivero Dec 15, 2021
8bc6176
Use libdart Ubuntu's packages on Focal and newer
j-rivero Dec 16, 2021
386d653
Use right fuel-tools-dev file
j-rivero Dec 16, 2021
550b047
Support dart packages in Gazebo11
j-rivero Dec 16, 2021
012caef
Missing dart packages
j-rivero Dec 16, 2021
e204964
Fix package name
j-rivero Dec 16, 2021
e33f8c1
Add ikfast to dart
j-rivero Dec 17, 2021
2bec89a
Fix syntax
j-rivero Dec 17, 2021
f30b94d
Back to use bionic for Gazebo
j-rivero Dec 20, 2021
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
16 changes: 3 additions & 13 deletions jenkins-scripts/dsl/_configs_/Globals.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ class Globals
// Main CI platform
static ArrayList get_ci_distro()
{
return [ 'bionic' ]
return [ 'focal' ]
}

static ArrayList get_abi_distro()
{
return [ 'bionic' ]
return [ 'focal' ]
}

static ArrayList get_ci_gpu()
Expand All @@ -72,7 +72,7 @@ class Globals

static ArrayList get_other_supported_distros()
{
return [ 'bionic' ]
return [ 'focal' ]
chapulina marked this conversation as resolved.
Show resolved Hide resolved
}

static ArrayList get_supported_arches()
Expand Down Expand Up @@ -108,14 +108,4 @@ class Globals
static String get_ros2_development_distro() {
return 'rolling'
}

static String get_gz11_ubuntu_distro()
{
return 'bionic'
}

static String get_gz11_mac_distro()
{
return 'mojave'
}
}
16 changes: 3 additions & 13 deletions jenkins-scripts/dsl/sdformat.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ abi_distro.each { distro ->

// MAIN CI job
// CI JOBS @ SCM/5 min
[ Globals.get_gz11_ubuntu_distro() ].each { distro ->
ci_distro.each { distro ->
supported_arches.each { arch ->
// --------------------------------------------------------------
// 1. Create the main ci jobs
Expand Down Expand Up @@ -139,10 +139,6 @@ other_supported_distros.each { distro ->
// BRANCHES CI JOB @ SCM/DAILY
sdformat_supported_branches.each { branch ->
ci_distro.each { distro ->
// special check to modify ci_distro if the branch is part of gz11
if (branch in sdformat_gz11_branches)
distro = Globals.get_gz11_ubuntu_distro()

supported_arches.each { arch ->
// ci_main job for the rest of arches / scm@daily
def sdformat_ci_job = job("sdformat-ci-${branch}-${distro}-${arch}")
Expand Down Expand Up @@ -171,7 +167,7 @@ sdformat_supported_branches.each { branch ->
//

// EXPERIMENTAL ARCHES @ SCM/WEEKLY
[ Globals.get_gz11_ubuntu_distro() ].each { distro ->
ci_distro.each { distro ->
experimental_arches.each { arch ->
def sdformat_ci_job = job("sdformat-ci-main-${distro}-${arch}")
OSRFLinuxCompilation.create(sdformat_ci_job)
Expand All @@ -198,13 +194,7 @@ sdformat_supported_branches.each { branch ->

// INSTALL LINUX -DEV PACKAGES ALL PLATFORMS @ CRON/DAILY
sdformat_supported_branches.each { branch ->
// special check to modify ci_distro if the branch is part of gz11
if (branch in sdformat_gz11_branches)
ref_distro = [ Globals.get_gz11_ubuntu_distro() ]
else
ref_distro = ci_distro

ref_distro.each { distro ->
ci_distro.each { distro ->
supported_arches.each { arch ->
// --------------------------------------------------------------
def install_default_job = job("sdformat-install-${branch}_pkg-${distro}-${arch}")
Expand Down