Windows changes to make the HOME env var work#442
Conversation
|
I mentioned this in #316 (comment) but unswallowing the exception here won't help. The exception Buildbot encounters is actually internal and occurs after our dynamic step is finished, when Buildbot tries to load the next step. We aren't respecting some of Buildbot 8's internal invariants, causing the exception. You can find out more about this by looking at the log files/digging into the source code of buildbot and the buildbot-travis project I linked. |
| step_env += envs.Environment({ | ||
| # Set home directory, to avoid adding `cd` command every time | ||
| 'HOME': r'C:\buildbot\slave\{}\build'.format( | ||
| self.builder_name), |
There was a problem hiding this comment.
Add 4 spaces of indentation.
There was a problem hiding this comment.
Also, the ), can then go on the next line for balance.
|
Latest commit fixes servo/servo#12231 |
| # s3cmd on Windows only works within msys | ||
| step_env += envs.Environment({ | ||
| 'MSYSTEM': 'MSYS', | ||
| }) |
There was a problem hiding this comment.
-4 spaces indentation please
There was a problem hiding this comment.
Also please add this to the other make_step function.
larsbergstrom
force-pushed
the
more_windows
branch
from
2295426 to
239bcf8
Compare
|
OK, I think this addresses all of the formatting requests. Note that I left the removal of the |
|
Please keep the print and try block intact. The log you need to look at is +1 for integrating with buildbot's logging infrastructure in the future though. |
|
BTW, I started looking into that exception if you want to chat on IRC about it. |
| step_env += envs.upload_nightly | ||
| if self.is_windows: | ||
| # s3cmd on Windows only works within msys | ||
| step_env['MSYSTEM'] = 'MSYS' |
There was a problem hiding this comment.
Use another envs.Environment here.
There was a problem hiding this comment.
hrm, when I was using envs.Environment, the debugging seemed to indicate that it wasn't overwriting it - we were still getting the old value in testing. I can give it another try, though, and see what happens.
There was a problem hiding this comment.
This is a stylistic change we can always make later, so I'm OK with this as-is if we need the PR for windows nightlies now.
There was a problem hiding this comment.
Yeah, it's already in deployment as-formatted, so I'm kinda tempted to get this landed (since I already feel bad about having an ad-hoc branch in production).
|
After some IRC chat it turns out I was looking at the wrong thing for the exception handling and removing the try is the best thing to do here; this is r=me with or without using an |
|
@bors-servo r=aneeshusa |
|
📌 Commit 239bcf8 has been approved by |
Windows changes to make the HOME env var work There are two big changes here: 1) Make setting the `HOME` env var work properly, filling in the builder name 2) Just allow exceptions to fail to load buildbot and log normally. Right now, the `print` is being eaten by something, so it's super hard to debug failures with dynamic steps. r? @edunham <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/442) <!-- Reviewable:end -->
|
☀️ Test successful - travis |
3 participants
There are two big changes here:
HOMEenv var work properly, filling in the builder nameprintis being eaten by something, so it's super hard to debug failures with dynamic steps.r? @edunham
This change is