Merge ign-gazebo6 ➡️ main (part 2) #1631

chapulina · 2022-08-05T02:39:21Z

➡️ Forward port

Port ign-gazebo6 ➡️ main

Branch comparison: main...ign-gazebo6

Builds on top of Merge ign-gazebo6 ➡️ main (part 1) #1630

@mjcarroll , I could use some help getting the changes from #1352 to play nicely with the reset stuff - #1390 is a nice reference.

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

Signed-off-by: Louise Poubel <[email protected]>

Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Michael Carroll <[email protected]> Co-authored-by: Alejandro Hernández Cordero <[email protected]> Co-authored-by: Ian Chen <[email protected]>

Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Carlos Agüero <[email protected]> Co-authored-by: Ian Chen <[email protected]>

Signed-off-by: Ian Chen <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>

Signed-off-by: Jorge Perez <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>

Signed-off-by: Nate Koenig <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Louise Poubel <[email protected]>

Signed-off-by: Louise Poubel <[email protected]>

Signed-off-by: Onur Berk Tore <[email protected]>

Signed-off-by: ahcorde <[email protected]>

Signed-off-by: Silvio <[email protected]>

Signed-off-by: Louise Poubel <[email protected]>

codecov · 2022-08-05T20:46:05Z

Codecov Report

Merging #1631 (f8deb17) into main (a3cbd8c) will decrease coverage by 0.15%.
The diff coverage is 99.21%.

❗ Current head f8deb17 differs from pull request most recent head ee48126. Consider uploading reports for the commit ee48126 to get more accurate results

@@            Coverage Diff             @@
##             main    #1631      +/-   ##
==========================================
- Coverage   63.62%   63.47%   -0.16%     
==========================================
  Files         330      331       +1     
  Lines       25787    26123     +336     
==========================================
+ Hits        16408    16581     +173     
- Misses       9379     9542     +163

Impacted Files	Coverage Δ
include/gz/sim/EventManager.hh	`79.16% <ø> (ø)`
include/gz/sim/Util.hh	`100.00% <ø> (ø)`
include/gz/sim/components/Serialization.hh	`95.55% <ø> (ø)`
include/gz/sim/components/Factory.hh	`97.53% <80.00%> (-1.18%)`	⬇️
include/gz/sim/EntityComponentManager.hh	`100.00% <100.00%> (ø)`
include/gz/sim/Link.hh	`100.00% <100.00%> (ø)`
include/gz/sim/Model.hh	`100.00% <100.00%> (ø)`
include/gz/sim/SdfEntityCreator.hh	`100.00% <100.00%> (ø)`
include/gz/sim/Server.hh	`100.00% <100.00%> (ø)`
include/gz/sim/ServerConfig.hh	`100.00% <100.00%> (ø)`
... and 133 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Louise Poubel <[email protected]>

chapulina · 2022-08-08T23:59:41Z

CI result analysis:

Actions Focal: one failed INTEGRATION_odometry_publisher and the other INTEGRATION_scene_broadcaster_system - they're flakes
Actions Jammy: one failed INTEGRATION_odometry_publisher and the other INTEGRATION_scene_broadcaster_system - coincidentally the same flakes as in Focal
Windows: No failures, just pre-existing warnings (109 is less than the 157 currently on main)
Homebrew:
- UNIT_SimulationRunner_TEST is a know failure
- plugin_custom_sensor_system - new failure caused by ⬆️ Bump main to 8.0.0~pre1 gz-sensors#254 and being fixed in Update gz-sensors branch in example #1634

mjcarroll · 2022-08-09T00:17:03Z

I have on my list for this week:

INTEGRATION_scene_broadcaster_system - I have most of a fix for this, just working out a last timing kink on all platforms.
Windows: No failures, just pre-existing warnings - I have spun up a brand new Windows install to work through windows test failures and warnings throughout the stack.

mjcarroll · 2022-08-09T00:20:42Z

I have tested the reset examples locally and this looks like a clean merge, functionality is intact. I don't see any weird interactions here.

chapulina · 2022-08-09T15:09:06Z

I have tested the reset examples locally and this looks like a clean merge, functionality is intact. I don't see any weird interactions here.

Thanks, @mjcarroll . I'll consider this an approval and merge this PR, we're way past feature freeze and need to branch off gz-sim7 asap.

jennuine

I found some ign console loggers that should be updated. Should I open a separate PR for these?

jennuine · 2022-08-09T15:08:06Z

src/SystemLoader.cc

+{
+  if (_plugin.Filename() == "" || _plugin.Name() == "")
+  {
+    ignerr << "Failed to instantiate system plugin: empty argument "


Suggested change

ignerr << "Failed to instantiate system plugin: empty argument "

gzerr << "Failed to instantiate system plugin: empty argument "

jennuine · 2022-08-09T15:08:20Z

src/SystemManager.cc

+  std::string entitySystemService{"entity/system/add"};
+  this->node->Advertise(entitySystemService,
+      &SystemManager::EntitySystemAddService, this);
+  ignmsg << "Serving entity system service on ["


Suggested change

ignmsg << "Serving entity system service on ["

gzmsg << "Serving entity system service on ["

jennuine · 2022-08-09T15:08:41Z

src/SystemManager.cc

+
+    if (req.plugins().empty())
+    {
+      ignwarn << "Unable to add plugins to Entity: '" << entity


Suggested change

ignwarn << "Unable to add plugins to Entity: '" << entity

gzwarn << "Unable to add plugins to Entity: '" << entity

jennuine · 2022-08-09T15:13:36Z

src/Util.cc

@@ -427,15 +427,15 @@ void addResourcePaths(const std::vector<std::string> &_paths)
  char *ignPathCStr = std::getenv(systemPaths->FilePathEnv().c_str());
  if (ignPathCStr && *ignPathCStr != '\0')
  {
-    ignPaths = common::Split(ignPathCStr, ':');
+    ignPaths = common::Split(ignPathCStr, common::SystemPaths::Delimiter());


Does ign need to be replaced with gz here? If not, we should update the above comment to say Ignition file paths... with a Deprecated note

jennuine · 2022-08-09T15:14:11Z

src/rendering/SceneManager.cc

+        animMesh = meshManager->Load(animFilename);
+        if (animMesh->MeshSkeleton()->AnimationCount() > 1)
+        {
+          ignwarn << "File [" << animFilename


Suggested change

ignwarn << "File [" << animFilename

gzwarn << "File [" << animFilename

jennuine · 2022-08-09T15:14:20Z

src/rendering/SceneManager.cc

+      auto firstAnim = animMesh->MeshSkeleton()->Animation(0);
+      if (nullptr == firstAnim)
+      {
+        ignerr << "Failed to get animations from [" << animFilename


Suggested change

ignerr << "Failed to get animations from [" << animFilename

gzerr << "Failed to get animations from [" << animFilename

jennuine · 2022-08-09T15:14:38Z

src/rendering/SceneManager.cc

+        // add a copy constructor to animation classes in ign-common.
+        // The proper fix is probably to update ign-rendering to allow it to


Suggested change

// add a copy constructor to animation classes in ign-common.

// The proper fix is probably to update ign-rendering to allow it to

// add a copy constructor to animation classes in gz-common.

// The proper fix is probably to update gz-rendering to allow it to

chapulina · 2022-08-10T02:21:54Z

I found some ign console loggers that should be updated. Should I open a separate PR for these?

Thanks, @jennuine ! Those are taken care of in #1633

chapulina and others added 12 commits June 22, 2022 19:29

Merge ign-gazebo3 ➡️ ign-gazebo6 (#1547)

e0388cf

Signed-off-by: Louise Poubel <[email protected]>

Added particle emitters to scene broadcaster (#1516)

4f8c91b

Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Carlos Agüero <[email protected]> Co-authored-by: Ian Chen <[email protected]>

New service for adding systems to an entity (#1524)

255e1e0

Signed-off-by: Ian Chen <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>

Fix various Protobuf Windows warnings on ign-gazebo6 (#1299)

6739800

Signed-off-by: Jorge Perez <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>

Expose the ability to stop a server (#1551)

5fc968d

Signed-off-by: Nate Koenig <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Louise Poubel <[email protected]>

🎈 6.10.0 (#1552)

1f6c126

Signed-off-by: Louise Poubel <[email protected]>

Utilizes function to sequence trajectories (#1565)

e826c71

Signed-off-by: Onur Berk Tore <[email protected]>

Refactor: Utilizes function to load animations (#1568)

d6e69d0

Signed-off-by: Onur Berk Tore <[email protected]>

Use pytest to generate junit xml files for python tests (#1562)

199237d

Signed-off-by: ahcorde <[email protected]>

Fix UNIT_Server_TEST on Windows (#1577)

f39bc25

Signed-off-by: Silvio <[email protected]>

6 ➡️ 7 (main) - part 2

f8733fa

Signed-off-by: Louise Poubel <[email protected]>

chapulina requested review from iche033 and azeey as code owners August 5, 2022 02:39

github-actions bot added the 🌱 garden Ignition Garden label Aug 5, 2022

chapulina changed the base branch from main to chapulina/6_to_7_pt1 August 5, 2022 02:40

chapulina requested a review from mjcarroll August 5, 2022 02:41

chapulina changed the title ~~Merge ign-gazebo6 ➡️ main~~ Merge ign-gazebo6 ➡️ main (part 2) Aug 5, 2022

Base automatically changed from chapulina/6_to_7_pt1 to main August 5, 2022 16:15

chapulina added a commit that referenced this pull request Aug 5, 2022

Deprecations in favor of sdf::Plugin (#1631)

ba879d3

Signed-off-by: Louise Poubel <[email protected]>

chapulina added a commit that referenced this pull request Aug 5, 2022

Deprecations in favor of sdf::Plugin (#1631)

d5c08b2

Signed-off-by: Louise Poubel <[email protected]>

chapulina force-pushed the chapulina/6_to_7_pt2 branch from ba879d3 to d5c08b2 Compare August 5, 2022 17:03

chapulina mentioned this pull request Aug 5, 2022

Release Garden gazebo-tooling/release-tools#578

Open

chapulina added a commit that referenced this pull request Aug 5, 2022

Deprecations, ign -> gz (#1631)

ed5cd0b

Signed-off-by: Louise Poubel <[email protected]>

chapulina force-pushed the chapulina/6_to_7_pt2 branch from d5c08b2 to ed5cd0b Compare August 5, 2022 18:57

chapulina added a commit that referenced this pull request Aug 5, 2022

Deprecations, ign -> gz (#1631)

5e0847d

Signed-off-by: Louise Poubel <[email protected]>

chapulina force-pushed the chapulina/6_to_7_pt2 branch from ed5cd0b to 5e0847d Compare August 5, 2022 19:01

chapulina added a commit that referenced this pull request Aug 6, 2022

Deprecations, ign -> gz (#1631)

f8deb17

Signed-off-by: Louise Poubel <[email protected]>

chapulina force-pushed the chapulina/6_to_7_pt2 branch from 5e0847d to f8deb17 Compare August 6, 2022 01:57

chapulina added a commit that referenced this pull request Aug 8, 2022

Deprecations, ign -> gz (#1631)

ede7141

Signed-off-by: Louise Poubel <[email protected]>

chapulina force-pushed the chapulina/6_to_7_pt2 branch from f8deb17 to ede7141 Compare August 8, 2022 16:20

Deprecations, ign -> gz (#1631)

ee48126

Signed-off-by: Louise Poubel <[email protected]>

chapulina force-pushed the chapulina/6_to_7_pt2 branch from ede7141 to ee48126 Compare August 8, 2022 19:30

chapulina mentioned this pull request Aug 8, 2022

Merge ign-gazebo6 ➡️ main (part 3/3) #1633

Merged

chapulina merged commit 3f57c77 into main Aug 9, 2022

chapulina deleted the chapulina/6_to_7_pt2 branch August 9, 2022 15:09

jennuine reviewed Aug 9, 2022

View reviewed changes

j-rivero mentioned this pull request Sep 16, 2022

Rename python library as gz.sim7 #1716

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge ign-gazebo6 ➡️ main (part 2) #1631

Merge ign-gazebo6 ➡️ main (part 2) #1631

chapulina commented Aug 5, 2022 •

edited

Loading

codecov bot commented Aug 5, 2022 •

edited

Loading

chapulina commented Aug 8, 2022

mjcarroll commented Aug 9, 2022

mjcarroll commented Aug 9, 2022

chapulina commented Aug 9, 2022

jennuine left a comment

jennuine Aug 9, 2022

jennuine Aug 9, 2022

jennuine Aug 9, 2022

jennuine Aug 9, 2022

jennuine Aug 9, 2022

jennuine Aug 9, 2022

jennuine Aug 9, 2022

chapulina commented Aug 10, 2022

	ignerr << "Failed to instantiate system plugin: empty argument "
	gzerr << "Failed to instantiate system plugin: empty argument "

	ignmsg << "Serving entity system service on ["
	gzmsg << "Serving entity system service on ["

	ignwarn << "Unable to add plugins to Entity: '" << entity
	gzwarn << "Unable to add plugins to Entity: '" << entity

	ignwarn << "File [" << animFilename
	gzwarn << "File [" << animFilename

	ignerr << "Failed to get animations from [" << animFilename
	gzerr << "Failed to get animations from [" << animFilename

		// add a copy constructor to animation classes in ign-common.
		// The proper fix is probably to update ign-rendering to allow it to

Merge ign-gazebo6 ➡️ main (part 2) #1631

Merge ign-gazebo6 ➡️ main (part 2) #1631

Conversation

chapulina commented Aug 5, 2022 • edited Loading

➡️ Forward port

codecov bot commented Aug 5, 2022 • edited Loading

Codecov Report

chapulina commented Aug 8, 2022

mjcarroll commented Aug 9, 2022

mjcarroll commented Aug 9, 2022

chapulina commented Aug 9, 2022

jennuine left a comment

Choose a reason for hiding this comment

jennuine Aug 9, 2022

Choose a reason for hiding this comment

jennuine Aug 9, 2022

Choose a reason for hiding this comment

jennuine Aug 9, 2022

Choose a reason for hiding this comment

jennuine Aug 9, 2022

Choose a reason for hiding this comment

jennuine Aug 9, 2022

Choose a reason for hiding this comment

jennuine Aug 9, 2022

Choose a reason for hiding this comment

jennuine Aug 9, 2022

Choose a reason for hiding this comment

chapulina commented Aug 10, 2022

chapulina commented Aug 5, 2022 •

edited

Loading

codecov bot commented Aug 5, 2022 •

edited

Loading