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

Create ign-ionic collection view and set up nightlies #1034

Merged
merged 1 commit into from
Oct 12, 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
77 changes: 77 additions & 0 deletions jenkins-scripts/dsl/gz-collections.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,83 @@ collections:
nightly:
distros:
- jammy
- name: 'ionic'
libs:
- name: gz-cmake
major_version: 4
repo:
current_branch: main
- name: gz-tools
major_version: 2
azeey marked this conversation as resolved.
Show resolved Hide resolved
repo:
current_branch: gz-tools2
- name: gz-utils
major_version: 3
repo:
current_branch: main
- name: gz-math
major_version: 8
repo:
current_branch: main
- name: gz-plugin
major_version: 3
repo:
current_branch: main
- name: gz-common
major_version: 6
repo:
current_branch: main
- name: gz-msgs
major_version: 11
repo:
current_branch: main
- name: gz-rendering
major_version: 9
repo:
current_branch: main
- name: sdformat
major_version: 15
repo:
current_branch: main
- name: gz-fuel-tools
major_version: 10
repo:
current_branch: main
- name: gz-transport
major_version: 14
repo:
current_branch: main
- name: gz-gui
major_version: 9
repo:
current_branch: main
- name: gz-sensors
major_version: 9
repo:
current_branch: main
- name: gz-physics
major_version: 8
repo:
current_branch: main
- name: gz-sim
major_version: 9
repo:
current_branch: main
- name: gz-launch
major_version: 8
repo:
current_branch: main
ci:
configs:
- jammy
packaging:
linux:
package_name:
ignore_major_version:
- gz-ionic
nightly:
distros:
- jammy
- name: '__upcoming__'
libs:
- name: gz-cmake
Expand Down
17 changes: 16 additions & 1 deletion jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,22 @@ gz_prerelease_branches = []
// DESC: versioned names to generate debbuild jobs for special cases that
// don't appear in gz_branches (like nightly builders or 0-debbuild
// jobs for the special cases of foo0 packages)
gz_extra_debbuild = [ 'utils1' // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918
gz_extra_debbuild = [ 'cmake4',
'common6',
'fuel-tools10',
'gui9',
'launch8',
'math8',
'msgs11',
'physics8',
'plugin3',
'rendering9',
'sensors9',
'sim9',
'transport14',
'utils3',

'utils1' // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918
]
// DESC: exclude ignition from generate any install testing job
gz_no_pkg_yet = [ ]
Expand Down
53 changes: 52 additions & 1 deletion jenkins-scripts/dsl/ignition_collection.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ arch = 'amd64'
file = readFileFromWorkspace("scripts/jenkins-scripts/dsl/gz-collections.yaml")
gz_collections_yaml = new Yaml().load(file)

gz_nightly = 'harmonic'
gz_nightly = 'ionic'

String get_debbuilder_name(parsed_yaml_lib, parsed_yaml_packaging)
{
Expand Down Expand Up @@ -325,6 +325,57 @@ gz_collection_jobs =
'sdformat-ci-sdformat14-homebrew-amd64',
'sdformat-sdf-14-win'
],
'ionic' : [
'ign_cmake-gz-4-win',
'ign_common-gz-6-win',
'ign_fuel-tools-gz-10-win',
'ign_gazebo-gz-9-win',
'ign_gui-gz-9-win',
'ign_launch-gz-8-win',
'ign_math-gz-8-win',
'ign_msgs-gz-11-win',
'ign_physics-gz-8-win',
'ign_plugin-gz-3-win',
'ign_rendering-gz-9-win',
'ign_sensors-gz-9-win',
'ign_tools-gz-2-win',
'ign_transport-gz-14-win',
'ign_utils-gz-3-win',
'gz_cmake-ci-gz-cmake4-jammy-amd64',
'gz_common-ci-gz-common6-jammy-amd64',
'gz_fuel_tools-ci-gz-fuel-tools10-jammy-amd64',
'gz_gui-ci-gz-gui9-jammy-amd64',
'gz_launch-ci-gz-launch8-jammy-amd64',
'gz_math-ci-gz-math8-jammy-amd64',
'gz_msgs-ci-gz-msgs11-jammy-amd64',
'gz_physics-ci-gz-physics8-jammy-amd64',
'gz_plugin-ci-gz-plugin3-jammy-amd64',
'gz_rendering-ci-gz-rendering9-jammy-amd64',
'gz_sensors-ci-gz-sensors9-jammy-amd64',
'gz_sim-ci-gz-sim9-jammy-amd64',
'gz_tools-ci-gz-tools2-jammy-amd64',
'gz_transport-ci-gz-transport14-jammy-amd64',
'gz_utils-ci-gz-utils3-jammy-amd64',
'ignition_cmake-ci-gz-cmake4-homebrew-amd64',
'ignition_common-ci-gz-common6-homebrew-amd64',
'ignition_fuel-tools-ci-gz-fuel-tools10-homebrew-amd64',
'ignition_ionic-ci-main-homebrew-amd64',
'ignition_gazebo-ci-gz-sim9-homebrew-amd64',
'ignition_gui-ci-gz-gui9-homebrew-amd64',
'ignition_launch-gz-launch8-homebrew-amd64',
'ignition_math-ci-gz-math8-homebrew-amd64',
'ignition_msgs-ci-gz-msgs11-homebrew-amd64',
'ignition_physics-ci-gz-physics8-homebrew-amd64',
'ignition_plugin-ci-gz-plugin3-homebrew-amd64',
'ignition_rendering-ci-gz-rendering9-homebrew-amd64',
'ignition_sensors-ci-gz-sensors9-homebrew-amd64',
'ignition_tools-ci-gz-tools2-homebrew-amd64',
'ignition_transport-ci-gz-transport14-homebrew-amd64',
'ignition_utils-ci-gz-utils3-homebrew-amd64',
'sdformat-ci-sdformat15-jammy-amd64',
'sdformat-ci-sdformat15-homebrew-amd64',
'sdformat-sdf-15-win'
],
]

def DISABLE_TESTS = false
Expand Down
4 changes: 2 additions & 2 deletions jenkins-scripts/dsl/sdformat.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import _configs_.*
import javaposse.jobdsl.dsl.Job

def sdformat_supported_versions = [ 'sdformat6' , 'sdformat9', 'sdformat12', 'sdformat13', 'sdformat14' ]
def sdformat_gz11_versions = [ 'sdformat9', 'sdformat12', 'sdformat13', 'main' ]
def sdformat_gz11_versions = [ 'sdformat9', 'sdformat12', 'sdformat13', 'sdformat14', 'main' ]
// nightly and prereleases
def extra_sdformat_debbuilder = []
def extra_sdformat_debbuilder = ['sdformat15']

// Main platform using for quick CI
def ci_distro = Globals.get_ci_distro()
Expand Down