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

CI: unhide .ci directory #10361

Closed
wants to merge 1 commit into from
Closed

CI: unhide .ci directory #10361

wants to merge 1 commit into from

Conversation

bkueng
Copy link
Member

@bkueng bkueng commented Aug 29, 2018

Makes it easier to understand the CI structure and find things.

@bkueng bkueng requested a review from dagar August 29, 2018 09:28
@dagar
Copy link
Member

dagar commented Aug 29, 2018

Slight complication because the additional pipelines have to be told where to find the Jenkinsfile.
http://ci.px4.io:8080/job/PX4_misc/job/Firmware-SITL_tests/

@lamping7
Copy link
Member

lamping7 commented Aug 29, 2018

I think if you want it unhidden, the natural place for it is in https://github.com/PX4/Firmware/tree/master/integrationtests You can add a "jenkins" dir here, but I don't think it needs to be in the root.

@bkueng
Copy link
Member Author

bkueng commented Aug 30, 2018

I'm ok with moving it to integrationtests. @dagar ?

@dagar
Copy link
Member

dagar commented Aug 31, 2018

In .ci there are separate pipelines for compiling all firmware, SITL tests, ad hardware testing.

The integrationtests folder contains scripts and missions only used by SITL tests.

makes it easier to understand the CI structure and find things.
@bkueng bkueng force-pushed the unhide_ci_directory branch from a696876 to 5046135 Compare August 31, 2018 07:25
@bkueng
Copy link
Member Author

bkueng commented Aug 31, 2018

Can you do the required additional changes then?

@TSC21
Copy link
Member

TSC21 commented Nov 25, 2018

@bkueng @dagar have we agreed on the correct place to put the CI related files?

@stale
Copy link

stale bot commented Feb 23, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale
Copy link

stale bot commented Jul 10, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@dagar
Copy link
Member

dagar commented Jul 10, 2019

Do you still want some version of this?

@stale stale bot removed the Admin: Wont fix label Jul 10, 2019
@lamping7
Copy link
Member

If there is interest I can move it where I suggested and do the necessary changes on the Jenkins side as it all needs to happen at once. If Beat still wants it and no one objects, I'll make the switch.

@dagar
Copy link
Member

dagar commented Jul 11, 2019

If there is interest I can move it where I suggested and do the necessary changes on the Jenkins side as it all needs to happen at once. If Beat still wants it and no one objects, I'll make the switch.

If we're going to move anything I'd like to get rid of the top level integrationtests and test_data (maybe move to within test). I'm also not sure where the compile, compile mac, and hardware pipelines fit.

@lamping7
Copy link
Member

lamping7 commented Jul 11, 2019

If we're getting into all this... We should remove dronekit and utils (no longer maintained). The .test files could get put in a rostest dir inside test. The mavros folder could go in test. The jenkinsfiles could go in a jenkins folder inside test. Delete integrationtests. I don't know what test_data is used for off the top of my head.

@lamping7
Copy link
Member

I can show a tree of this in a bit.

@lamping7
Copy link
Member

@dagar what is this used for -- https://github.com/PX4/Firmware/blob/master/integrationtests/python_src/px4_it/util/manual_input.py

The rest of the script in utils look to be untouched for years.

@lamping7
Copy link
Member

Just an idea --

Screenshot from 2019-07-10 21-15-57

@dagar
Copy link
Member

dagar commented Jul 11, 2019

Looks good to me! I would delete anything that isn't currently being used.
Are there any rostest conventions for test location we should care about?
I believe there's also some weirdness with the test_data directory handling that's crept into a few places. I think ideally it would be an optional part of ROMFS and otherwise not given special handling, but I don't know the full history.

@lamping7
Copy link
Member

I'll look into dependencies and submit a PR

@bkueng
Copy link
Member Author

bkueng commented Jul 11, 2019

Do you still want some version of this?

Yes please

I think ideally it would be an optional part of ROMFS and otherwise not given special handling, but I don't know the full history.

Right, that is currently not solved nicely: https://github.com/PX4/Firmware/blob/master/Tools/sitl_run.sh#L100

@lamping7
Copy link
Member

lamping7 commented Jul 12, 2019

test_data is here:

  • .vscode/settings.json:21: "${workspaceFolder}/test_data"
  • .vscode/launch.json:14: "${workspaceFolder}/test_data"
  • .vscode/launch.json:60: "${workspaceFolder}/test_data"
  • .vscode/launch.json:109: "${workspaceFolder}/test_data"
  • Tools/sitl_run.sh:101: sitl_command=""$sitl_bin" $no_pxh "$src_path"/ROMFS/px4fmu_test -s "${src_path}"/posix-configs/SITL/init/test/${model} -t "$src_path"/test_data"
  • Tools/sitl_run.sh:103: sitl_command=""$sitl_bin" $no_pxh "$src_path"/ROMFS/px4fmu_common -s etc/init.d-posix/rcS -t "$src_path"/test_data"
  • platforms/posix/src/main.cpp:243: const std::string required_test_data_path = "./test_data";

https://github.com/PX4/Firmware/blob/master/integrationtests/python_src/px4_it/util/manual_input.py does not seem to be used within

The ROS parts are pretty easy to fix.

@stale
Copy link

stale bot commented Oct 10, 2019

This issue has been automatically marked as stale because it has not had recent activity. Thank you for your contributions.

@stale
Copy link

stale bot commented Jan 8, 2020

This issue has been automatically marked as stale because it has not had recent activity. Thank you for your contributions.

@stale stale bot added the stale label Jan 8, 2020
@bkueng bkueng removed the stale label Jan 8, 2020
@LorenzMeier LorenzMeier deleted the unhide_ci_directory branch January 21, 2020 22:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants