From d62916c9b5f1e84668607fc2325ceee0178575df Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 20 Dec 2021 21:04:26 -0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8F=81=20Dome=20EOL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- jenkins-scripts/dsl/ignition.dsl | 18 ++--- jenkins-scripts/dsl/ignition_collection.dsl | 81 --------------------- jenkins-scripts/dsl/sdformat.dsl | 2 +- jenkins-scripts/tools/buildcop_stats.bash | 2 +- 4 files changed, 11 insertions(+), 92 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index ddc45bf25..1e94d7dfd 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -45,18 +45,18 @@ ignition_no_test = [ ] // main, ABI check, install pkg) ignition_branches = [ 'cmake' : [ '2' ], 'common' : [ '1', '3', '4' ], - 'fuel-tools' : [ '1', '4', '5', '6', '7' ], - 'gazebo' : [ '3', '4', '5', '6' ], - 'gui' : [ '0', '3', '4', '5', '6' ], - 'launch' : [ '2', '3', '4', '5' ], + 'fuel-tools' : [ '1', '4', '6', '7' ], + 'gazebo' : [ '3', '5', '6' ], + 'gui' : [ '0', '3', '5', '6' ], + 'launch' : [ '2', '4', '5' ], 'math' : [ '4', '6' ], - 'msgs' : [ '1', '5', '6', '7', '8' ], - 'physics' : [ '2', '3', '4', '5' ], + 'msgs' : [ '1', '5', '7', '8' ], + 'physics' : [ '2', '4', '5' ], 'plugin' : [ '1' ], - 'rendering' : [ '3', '4', '5', '6' ], - 'sensors' : [ '3', '4', '5', '6' ], + 'rendering' : [ '3', '5', '6' ], + 'sensors' : [ '3', '5', '6' ], 'tools' : [ '1' ], - 'transport' : [ '4', '8', '9', '10', '11' ], + 'transport' : [ '4', '8', '10', '11' ], 'utils' : [ '1' ]] // DESC: prerelease branches are managed as any other supported branches for // special cases different to major branches: get compilation CI on the branch diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index 4d135d51c..01dd837d4 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -10,9 +10,6 @@ ignition_collections = [ [ name : 'citadel', distros : [ 'bionic' ], ], - [ name : 'dome', - distros : [ 'focal' ], - ], [ name : 'edifice', distros : [ 'focal' ], ], @@ -125,84 +122,6 @@ ignition_collection_jobs = 'sdformat-ci-sdformat9-windows7-amd64', 'sdformat-install-sdformat9_pkg-bionic-amd64' ], - 'dome' : [ - 'ign_common-ign-3-win', - 'ign_fuel-tools-ign-5-win', - 'ign_gazebo-ign-4-win', - 'ign_gui-ign-4-win', - 'ign_msgs-ign-6-win', - 'ign_physics-ign-3-win', - 'ign_plugin-ign-1-win', - 'ign_rendering-ign-4-win', - 'ign_sensors-ign-4-win', - 'ign_tools-ign-1-win', - 'ign_transport-ign-9-win', - 'ignition_cmake-ci-ign-cmake2-bionic-amd64', - 'ignition_cmake-ci-ign-cmake2-homebrew-amd64', - 'ignition_cmake-ci-ign-cmake2-windows7-amd64', - 'ignition_cmake2-install-pkg-bionic-amd64', - 'ignition_cmake2-install_bottle-homebrew-amd64', - 'ignition_common-ci-ign-common3-bionic-amd64', - 'ignition_common-ci-ign-common3-homebrew-amd64', - 'ignition_common3-install-pkg-bionic-amd64', - 'ignition_common3-install_bottle-homebrew-amd64', - 'ignition_dome-ci-main-homebrew-amd64', - 'ignition_dome-install-pkg-bionic-amd64', - 'ignition_dome-install_bottle-homebrew-amd64', - 'ignition_fuel-tools-ci-ign-fuel-tools5-bionic-amd64', - 'ignition_fuel-tools-ci-ign-fuel-tools5-homebrew-amd64', - 'ignition_fuel-tools5-install-pkg-bionic-amd64', - 'ignition_fuel-tools5-install_bottle-homebrew-amd64', - 'ignition_gazebo-ci-ign-gazebo4-bionic-amd64', - 'ignition_gazebo-ci-ign-gazebo4-homebrew-amd64', - 'ignition_gazebo4-install-pkg-bionic-amd64', - 'ignition_gazebo4-install_bottle-homebrew-amd64', - 'ignition_gui-ci-ign-gui4-bionic-amd64', - 'ignition_gui-ci-ign-gui4-homebrew-amd64', - 'ignition_gui4-install-pkg-bionic-amd64', - 'ignition_gui4-install_bottle-homebrew-amd64', - 'ignition_launch-ci-ign-launch3-bionic-amd64', - 'ignition_launch-ci-ign-launch3-homebrew-amd64', - 'ignition_launch3-install-pkg-bionic-amd64', - 'ignition_launch3-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-ign-msgs6-bionic-amd64', - 'ignition_msgs-ci-ign-msgs6-homebrew-amd64', - 'ignition_msgs6-install-pkg-bionic-amd64', - 'ignition_msgs6-install_bottle-homebrew-amd64', - 'ignition_physics-ci-ign-physics3-bionic-amd64', - 'ignition_physics-ci-ign-physics3-homebrew-amd64', - 'ignition_physics3-install-pkg-bionic-amd64', - 'ignition_physics3-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-ign-rendering4-bionic-amd64', - 'ignition_rendering-ci-ign-rendering4-homebrew-amd64', - 'ignition_rendering4-install-pkg-bionic-amd64', - 'ignition_rendering4-install_bottle-homebrew-amd64', - 'ignition_sensors-ci-ign-sensors4-bionic-amd64', - 'ignition_sensors-ci-ign-sensors4-homebrew-amd64', - 'ignition_sensors4-install-pkg-bionic-amd64', - 'ignition_sensors4-install_bottle-homebrew-amd64', - 'ignition_tools-ci-ign-tools1-bionic-amd64', - 'ignition_tools-ci-ign-tools1-homebrew-amd64', - 'ignition_tools-install-pkg-bionic-amd64', - 'ignition_tools1-install_bottle-homebrew-amd64', - 'ignition_transport-ci-ign-transport9-bionic-amd64', - 'ignition_transport-ci-ign-transport9-homebrew-amd64', - 'ignition_transport9-install-pkg-bionic-amd64', - 'ignition_transport9-install_bottle-homebrew-amd64', - 'sdformat-ci-sdformat10-bionic-amd64', - 'sdformat-ci-sdformat10-homebrew-amd64', - 'sdformat-ci-sdformat10-windows7-amd64', - 'sdformat-install-sdformat10_pkg-bionic-amd64' - ], 'edifice' : [ 'ign_common-ign-4-win', 'ign_fuel-tools-ign-6-win', diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl index 3da399eea..a1439261b 100644 --- a/jenkins-scripts/dsl/sdformat.dsl +++ b/jenkins-scripts/dsl/sdformat.dsl @@ -1,7 +1,7 @@ import _configs_.* import javaposse.jobdsl.dsl.Job -def sdformat_supported_branches = [ 'sdformat6' , 'sdformat9', 'sdformat10', 'sdformat11', 'sdformat12' ] +def sdformat_supported_branches = [ 'sdformat6' , 'sdformat9', 'sdformat11', 'sdformat12' ] def sdformat_gz11_branches = [ 'sdformat9', 'sdformat10', 'sdformat11', 'sdformat12', 'main' ] // nightly and prereleases def extra_sdformat_debbuilder = [ ] diff --git a/jenkins-scripts/tools/buildcop_stats.bash b/jenkins-scripts/tools/buildcop_stats.bash index 5c7d75926..c2c03bbcc 100755 --- a/jenkins-scripts/tools/buildcop_stats.bash +++ b/jenkins-scripts/tools/buildcop_stats.bash @@ -1,6 +1,6 @@ #!/bin/bash -views='ign-citadel ign-dome' +views='ign-citadel ign-edifice ign-fortress ign-garden' echo "# Build Cop Report $(date +%Y-%m-%d)" echo "## Aggregate Results as of $(date '+%Y-%m-%d %H:%M:%S')" From e6013fc4dec69ecec9d1ea407dacc60d7a675445 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 21 Dec 2021 13:23:05 +0100 Subject: [PATCH 2/2] Remove dome in dashboard --- terminal-dashboard/_dashboard_lib.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/terminal-dashboard/_dashboard_lib.sh b/terminal-dashboard/_dashboard_lib.sh index 373d80f2e..1e0bb5536 100644 --- a/terminal-dashboard/_dashboard_lib.sh +++ b/terminal-dashboard/_dashboard_lib.sh @@ -24,24 +24,6 @@ get_libraries_by_collection() ignition-gazebo3 ignition-launch2 ignition-citadel" - elif [ "$COLLECTION" = "dome" ]; then - LIBS=" - ignition-cmake2 - ignition-math6 - ignition-tools - ignition-common3 - ignition-msgs6 - ignition-transport9 - ignition-fuel-tools5 - ignition-plugin - ignition-rendering4 - sdformat10 - ignition-physics3 - ignition-sensors4 - ignition-gui4 - ignition-gazebo4 - ignition-launch3 - ignition-dome" elif [ "$COLLECTION" = "edifice" ]; then LIBS=" ignition-cmake2