Fixed static IP deploy to roboRIO. #184
Conversation
| @@ -217,7 +217,8 @@ public void downloadAndStart(Artifact result) throws IOException { | |||
| private static final String DEFAULT_PASSWORD = ""; | |||
| private static final String DEFAULT_ADMIN_USERNAME = "admin"; | |||
| private static final String DEFAULT_ADMIN_PASSWORD = ""; | |||
|
|
|||
| private static final int FALLBACK_HOST = 2; | |||
| } | ||
| if (rio == null) { | ||
| rio = byNameOrIP("10." + (team_number / 100) + "." + (team_number % 100) + ".2"); |
There was a problem hiding this comment.
The IP string is used multiple times; use a separate variable.
| DepRoboRIO rio = byNameOrIP("roboRIO-" + team_number + "-FRC.local"); | ||
| if (rio == null) { | ||
| rio = byNameOrIP("172.22.11.2"); | ||
| rio = byNameOrIP("172.22.11." + FALLBACK_HOST); |
There was a problem hiding this comment.
I don't think this is correct, unless something's changed. This is a static address specified separately from the ethernet configuration that we do manually.
There was a problem hiding this comment.
Robot code was failing to deploy entirely for Amber since she didn't have support for the mDNS address, and this was the exact change we needed to fix it.
There was a problem hiding this comment.
This line about changing the 172.22.11.*? okay.
|
The setup for travis-ci was slightly broken. I think it's fixed now - you'll need to push a new commit. |
|
Should I push an empty commit, or is it possible to directly restart the tests? |
|
It would have been possible if it had made it to travis first, but since it hasn't, you'll need to push a new commit. You can either modify the last one, add a stub commit, or squash the three commits together. |
No description provided.