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

Fortress stable #531

Merged
merged 3 commits into from
Oct 8, 2021
Merged

Fortress stable #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b21013
Fortress stable
chapulina Oct 7, 2021
cfe6a35
Remove forstress cache invalidation
j-rivero Oct 8, 2021
cf8eeaa
Merge branch 'master' into chapulina/fortress_stable
j-rivero Oct 8, 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
26 changes: 9 additions & 17 deletions jenkins-scripts/dsl/ignition.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ ignition_prerelease_branches = []
// jobs for the special cases of foo0 packages)
ignition_extra_debbuild = [ 'cmake3',
'common5',
'fuel-tools7',
'gazebo6',
'gui6',
'launch5',
'fuel-tools8',
'gazebo7',
'gui7',
'launch6',
'math7',
'msgs8',
'physics5',
'msgs9',
'physics6',
'plugin2',
'rendering6',
'sensors6',
'rendering7',
'sensors7',
'tools2',
'transport11',
'transport12',
'utils1', // see comment https://github.com/ignition-tooling/release-tools/pull/431#issuecomment-815099918
'utils2']
// DESC: exclude ignition from generate any install testing job
Expand Down Expand Up @@ -119,17 +119,9 @@ Globals.extra_emails = "caguero@osrfoundation.org"

// shell command to inject in all bash steps
GLOBAL_SHELL_CMD=''

GITHUB_SUPPORT_ALL_BRANCHES = []
ENABLE_GITHUB_PR_INTEGRATION = true

// Fortress release needed to invalidate cache to solve problem with bug in
// gzdev docker installation. Will be disable automatically in 1st May 2021
today = new Date().format( 'yyyyMMdd' )
if (today.compareTo('20210501')) {
GLOBAL_SHELL_CMD='export INVALIDATE_DOCKER_CACHE=true'
}

String ci_distro_str = ci_distro[0]

// Map of lists to use in CIWorkflow
Expand Down
78 changes: 39 additions & 39 deletions jenkins-scripts/dsl/ignition_collection.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ ignition_collections = [
'plugin' : [ debbuild: 'ign-plugin1' , branch: 'ign-plugin1' ],
'utils' : [ debbuild: 'ign-utils1' , branch: 'ign-utils1' ],
'common' : [ debbuild: 'ign-common4' , branch: 'ign-common4' ],
'msgs' : [ debbuild: 'ign-msgs8' , branch: 'main' ],
'rendering' : [ debbuild: 'ign-rendering6' , branch: 'main' ],
'sdformat' : [ debbuild: 'sdformat12' , branch: 'main' ],
'fuel-tools': [ debbuild: 'ign-fuel-tools7' , branch: 'main' ],
'transport' : [ debbuild: 'ign-transport11' , branch: 'main' ],
'gui' : [ debbuild: 'ign-gui6' , branch: 'main' ],
'sensors' : [ debbuild: 'ign-sensors6' , branch: 'main' ],
'physics' : [ debbuild: 'ign-physics5' , branch: 'main' ],
'gazebo' : [ debbuild: 'ign-gazebo6' , branch: 'main' ],
'launch' : [ debbuild: 'ign-launch5' , branch: 'main' ],
'msgs' : [ debbuild: 'ign-msgs8' , branch: 'ign-msgs8' ],
'rendering' : [ debbuild: 'ign-rendering6' , branch: 'ign-rendering6' ],
'sdformat' : [ debbuild: 'sdformat12' , branch: 'sdf12' ],
'fuel-tools': [ debbuild: 'ign-fuel-tools7' , branch: 'ign-fuel-tools7' ],
'transport' : [ debbuild: 'ign-transport11' , branch: 'ign-transport11' ],
'gui' : [ debbuild: 'ign-gui6' , branch: 'ign-gui6' ],
'sensors' : [ debbuild: 'ign-sensors6' , branch: 'ign-sensors6' ],
'physics' : [ debbuild: 'ign-physics5' , branch: 'ign-physics5' ],
'gazebo' : [ debbuild: 'ign-gazebo6' , branch: 'ign-gazebo6' ],
'launch' : [ debbuild: 'ign-launch5' , branch: 'ign-launch5' ],
'fortress' : [ debbuild: 'ign-fortress' , branch: 'main' ],
],
],
Expand Down Expand Up @@ -285,14 +285,14 @@ ignition_collection_jobs =
],
'fortress' : [
'ign_common-ign-4-win',
'ign_fuel-tools-ci-win',
'ign_gazebo-ci-win',
'ign_gui-ci-win',
'ign_physics-ci-win',
'ign_fuel-tools-ign-7-win',
'ign_gazebo-ign-6-win',
'ign_gui-ign-6-win',
'ign_physics-ign-5-win',
'ign_plugin-ign-1-win',
'ign_rendering-ci-win',
'ign_sensors-ci-win',
'ign_transport-ci-win',
'ign_rendering-ign-6-win',
'ign_sensors-ign-6-win',
'ign_transport-ign-11-win',
'ign_utils-ign-1-win',
'ignition_cmake-ci-ign-cmake2-bionic-amd64',
'ignition_cmake-ci-ign-cmake2-homebrew-amd64',
Expand All @@ -306,64 +306,64 @@ ignition_collection_jobs =
'ignition_fortress-ci-main-homebrew-amd64',
'ignition_fortress-install-pkg-bionic-amd64',
'ignition_fortress-install_bottle-homebrew-amd64',
'ignition_fuel-tools-ci-main-bionic-amd64',
'ignition_fuel-tools-ci-main-homebrew-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools7-bionic-amd64',
'ignition_fuel-tools-ci-ign-fuel-tools7-homebrew-amd64',
'ignition_fuel-tools7-install-pkg-bionic-amd64',
'ignition_fuel-tools7-install_bottle-homebrew-amd64',
'ignition_gazebo-ci-main-bionic-amd64',
'ignition_gazebo-ci-main-homebrew-amd64',
'ignition_gazebo-ci-ign-gazebo6-bionic-amd64',
'ignition_gazebo-ci-ign-gazebo6-homebrew-amd64',
'ignition_gazebo6-install-pkg-bionic-amd64',
'ignition_gazebo6-install_bottle-homebrew-amd64',
'ignition_gui-ci-main-bionic-amd64',
'ignition_gui-ci-main-homebrew-amd64',
'ignition_gui-ci-ign-gui6-bionic-amd64',
'ignition_gui-ci-ign-gui6-homebrew-amd64',
'ignition_gui6-install-pkg-bionic-amd64',
'ignition_gui6-install_bottle-homebrew-amd64',
'ignition_launch-ci-main-bionic-amd64',
'ignition_launch-ci-main-homebrew-amd64',
'ignition_launch-ci-ign-launch5-bionic-amd64',
'ignition_launch-ci-ign-launch5-homebrew-amd64',
'ignition_launch5-install-pkg-bionic-amd64',
'ignition_launch5-install_bottle-homebrew-amd64',
'ignition_math-ci-ign-math6-bionic-amd64',
'ignition_math-ci-ign-math6-homebrew-amd64',
'ignition_math-ci-ign-math6-windows7-amd64',
'ignition_math6-install-pkg-bionic-amd64',
'ignition_math6-install_bottle-homebrew-amd64',
'ignition_msgs-ci-main-bionic-amd64',
'ignition_msgs-ci-main-homebrew-amd64',
'ignition_msgs-ci-main-windows7-amd64',
'ignition_msgs-ci-ign-msgs8-bionic-amd64',
'ignition_msgs-ci-ign-msgs8-homebrew-amd64',
'ignition_msgs-ci-ign-msgs8-windows7-amd64',
'ignition_msgs8-install-pkg-bionic-amd64',
'ignition_msgs8-install_bottle-homebrew-amd64',
'ignition_physics-ci-main-bionic-amd64',
'ignition_physics-ci-main-homebrew-amd64',
'ignition_physics-ci-ign-physics5-bionic-amd64',
'ignition_physics-ci-ign-physics5-homebrew-amd64',
'ignition_physics5-install-pkg-bionic-amd64',
'ignition_physics5-install_bottle-homebrew-amd64',
'ignition_plugin-ci-ign-plugin1-bionic-amd64',
'ignition_plugin-ci-ign-plugin1-homebrew-amd64',
'ignition_plugin-install-pkg-bionic-amd64',
'ignition_plugin1-install_bottle-homebrew-amd64',
'ignition_rendering-ci-main-bionic-amd64',
'ignition_rendering-ci-main-homebrew-amd64',
'ignition_rendering-ci-ign-rendering6-bionic-amd64',
'ignition_rendering-ci-ign-rendering6-homebrew-amd64',
'ignition_rendering6-install-pkg-bionic-amd64',
'ignition_rendering6-install_bottle-homebrew-amd64',
'ignition_sensors-ci-main-bionic-amd64',
'ignition_sensors-ci-main-homebrew-amd64',
'ignition_sensors-ci-ign-sensors6-bionic-amd64',
'ignition_sensors-ci-ign-sensors6-homebrew-amd64',
'ignition_sensors6-install-pkg-bionic-amd64',
'ignition_sensors6-install_bottle-homebrew-amd64',
'ignition_tools-ci-ign-tools1-bionic-amd64',
'ignition_tools-ci-ign-tools1-homebrew-amd64',
'ignition_tools-ci-ign-tools1-windows7-amd64',
'ignition_tools-install-pkg-bionic-amd64',
'ignition_tools1-install_bottle-homebrew-amd64',
'ignition_transport-ci-main-bionic-amd64',
'ignition_transport-ci-main-homebrew-amd64',
'ignition_transport-ci-ign-transport11-bionic-amd64',
'ignition_transport-ci-ign-transport11-homebrew-amd64',
'ignition_transport11-install-pkg-bionic-amd64',
'ignition_transport11-install_bottle-homebrew-amd64',
'ignition_utils-ci-ign-utils1-bionic-amd64',
'ignition_utils-ci-ign-utils1-homebrew-amd64',
'ignition_utils-install-pkg-bionic-amd64',
'ignition_utils1-install_bottle-homebrew-amd64',
'sdformat-ci-main-bionic-amd64',
'sdformat-ci-main-homebrew-amd64',
'sdformat-ci-main-windows7-amd64',
'sdformat-ci-sdformat12-bionic-amd64',
'sdformat-ci-sdformat12-homebrew-amd64',
'sdformat-ci-sdformat12-windows7-amd64',
'sdformat-install-sdformat12_pkg-bionic-amd64'
],
]
Expand Down