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

Merge ign-rendering2 to ign-rendering3 #130

Merged
merged 20 commits into from
Sep 14, 2020
Merged

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Aug 20, 2020

Merging forward 2 to 3 so we can run ogre2 tests with the latest depth camera noise changes on jenkins

iche033 and others added 7 commits August 5, 2020 22:58
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Add support for Gaussian noise render pass in Ogre2DepthCamera
Signed-off-by: Nate Koenig <[email protected]>
@iche033 iche033 requested a review from chapulina August 20, 2020 20:01
@github-actions github-actions bot added the 🏰 citadel Ignition Citadel label Aug 20, 2020
@codecov
Copy link

codecov bot commented Aug 20, 2020

Codecov Report

Merging #130 into ign-rendering3 will increase coverage by 0.59%.
The diff coverage is 93.50%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           ign-rendering3     #130      +/-   ##
==================================================
+ Coverage           49.82%   50.41%   +0.59%     
==================================================
  Files                 129      129              
  Lines               11526    11682     +156     
==================================================
+ Hits                 5743     5890     +147     
- Misses               5783     5792       +9     
Impacted Files Coverage Δ
ogre2/src/Ogre2RenderTarget.cc 73.67% <91.66%> (+0.49%) ⬆️
ogre2/src/Ogre2DepthCamera.cc 93.63% <93.42%> (-0.61%) ⬇️
ogre2/src/Ogre2GaussianNoisePass.cc 90.00% <95.83%> (+6.66%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 640d623...963e583. Read the comment docs.

@iche033
Copy link
Contributor Author

iche033 commented Aug 20, 2020

depth and render pass test also failed here. Marking this PR as draft for debugging

@iche033 iche033 marked this pull request as draft August 20, 2020 23:02
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@iche033
Copy link
Contributor Author

iche033 commented Aug 28, 2020

@osrf-jenkins run tests please

1 similar comment
@iche033
Copy link
Contributor Author

iche033 commented Aug 29, 2020

@osrf-jenkins run tests please

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
This reverts commit 968d9f8.

Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 marked this pull request as ready for review September 4, 2020 00:50
@iche033
Copy link
Contributor Author

iche033 commented Sep 4, 2020

Ready for review. Ubuntu tests are passing now and I disabled the render_pass integration test in homebrew like we did for the depth camera integration test.

Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM. I'm just concerned about the Windows build. " Build finished. No test results found. " usually means the compilation failed, but at the moment build.osrf isn't reachable.

@iche033
Copy link
Contributor Author

iche033 commented Sep 4, 2020

the windows machine could be in a bad state. I had to go in from time to time and remove the build directory for the next build to pass. I'll give that a try

@iche033
Copy link
Contributor Author

iche033 commented Sep 8, 2020

@osrf-jenkins run tests please

@chapulina
Copy link
Contributor

The Windows build is indeed broken and I'm not sure exactly why. I triggered a Windows build of ign-rendering3 just to have a baseline:

Build Status

@iche033
Copy link
Contributor Author

iche033 commented Sep 9, 2020

@osrf-jenkins run tests please

@iche033
Copy link
Contributor Author

iche033 commented Sep 9, 2020

The Windows build is indeed broken and I'm not sure exactly why

I logged into the machine and found that one of the installed ign-common header files is corrupt and had weird characters in it. I deleted the install dir and started another round of builds

@iche033
Copy link
Contributor Author

iche033 commented Sep 10, 2020

ok deleting the cached files on the windows CI machine worked. Latest ign-rendering build finished with 2 unrelated test failures

@chapulina
Copy link
Contributor

I squashed all the commits that were made on top of the merge, ending at 963e583. For some reason git didn't keep the original author, sorry @iche033 😕 I'm still figuring out the best way of handling this. And also it looks like I caused some regression on the CI tests, so ultimate #fail 😢

@chapulina
Copy link
Contributor

Reverted the PR back to its original state. I think we can merge it like this unless someone is inclined to try squashing all those commits again.

@iche033
Copy link
Contributor Author

iche033 commented Sep 11, 2020

I'm good as is. Let's merge it!

@chapulina
Copy link
Contributor

humm so, now the Ubuntu CI has 14 test failures again. I thought I had introduced those with my git gymnastics. Are they expected?

@iche033
Copy link
Contributor Author

iche033 commented Sep 12, 2020

No the test failures are not expected. Not sure what happened as the ubuntu builds have been green when I was fixing the window builds. I'll need to take a closer look.

@iche033
Copy link
Contributor Author

iche033 commented Sep 12, 2020

@osrf-jenkins run tests please

@iche033
Copy link
Contributor Author

iche033 commented Sep 12, 2020

the latest ubuntu build passed. I think tests started failing on r2d2.nv.xenial recently. I see that the rendering tests are also failing in ign-gazebo with the same unsupported framebuffer format ogre error when run on r2d2, e.g. this one. I've seen those errors before and usually it's an issue with the graphics driver. I logged onto r2d2 and but couldn't tell if there were any changes in configuration recently. We can try updating the nvidia driver on r2d2 and see if it helps

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants