Add Windows nightly builder

Also add a single environment to use for uploading nightlies,
thus restricting the environment variables passed to the upload script
and making it easier to add other uploading environments.

Also fix the make_step functions to actually use the configured
environment instead of just using self.environment.

buildbot/master/files/config/environments.py

@@ -1,4 +1,5 @@
 from passwords import GITHUB_DOC_TOKEN
+from passwords import S3_UPLOAD_ACCESS_KEY_ID, S3_UPLOAD_SECRET_ACCESS_KEY
 
 
 class Environment(dict):
@@ -115,3 +116,8 @@ def __add__(self, other):
     'PKG_CONFIG_PATH': '/usr/lib/aarch64-linux-gnu/pkgconfig',
     'SERVO_RUSTC_WITH_GOLD': 'False',
 })
+
+upload_nightly = Environment({
+    'AWS_ACCESS_KEY_ID': S3_UPLOAD_ACCESS_KEY_ID,
+    'AWS_SECRET_ACCESS_KEY': S3_UPLOAD_SECRET_ACCESS_KEY,
+})

buildbot/master/files/config/factories.py

@@ -9,7 +9,6 @@
 import yaml
 
 import environments as envs
-from passwords import S3_UPLOAD_ACCESS_KEY_ID, S3_UPLOAD_SECRET_ACCESS_KEY
 
 
 SERVO_REPO = "https://github.com/servo/servo"
@@ -107,10 +106,9 @@ def make_step(self, command):
             # Provide environment variables for s3cmd
             elif arg == './etc/ci/upload_nightly.sh':
                 step_kwargs['logEnviron'] = False
-                step_env['AWS_ACCESS_KEY_ID'] = S3_UPLOAD_ACCESS_KEY_ID
-                step_env['AWS_SECRET_ACCESS_KEY'] = S3_UPLOAD_SECRET_ACCESS_KEY
+                step_env = copy.deepcopy(envs.upload_nightly)
 
-        step_kwargs['env'] = self.environment
+        step_kwargs['env'] = step_env
         return step_class(**step_kwargs)
 
 
@@ -194,10 +192,9 @@ def make_step(self, command):
             # Provide environment variables for s3cmd
             elif arg == './etc/ci/upload_nightly.sh':
                 step_kwargs['logEnviron'] = False
-                step_env['AWS_ACCESS_KEY_ID'] = S3_UPLOAD_ACCESS_KEY_ID
-                step_env['AWS_SECRET_ACCESS_KEY'] = S3_UPLOAD_SECRET_ACCESS_KEY
+                step_env = copy.deepcopy(envs.upload_nightly)
 
-        step_kwargs['env'] = self.environment
+        step_kwargs['env'] = step_env
         return step_class(**step_kwargs)
 
 
@@ -246,3 +243,16 @@ def make_win_command(command):
                env=envs.build_windows),
     # TODO: run lockfile_changed.sh and manifest_changed.sh scripts
 ])
+
+windows_nightly = ServoFactory([
+    # TODO same comments as windows builder
+    steps.Compile(command=make_win_command("./mach build --release"),
+                  env=envs.build_windows),
+    steps.Test(command=make_win_command("./mach package --release"),
+               env=envs.build_windows),
+    steps.Compile(command=make_win_command(
+                      "./etc/ci/upload_nightly.sh windows"
+                  ),
+                  env=envs.upload_nightly,
+                  logEnviron=False),
+])

buildbot/master/files/config/master.cfg

@@ -98,6 +98,7 @@ c['schedulers'].append(schedulers.ForceScheduler(
         "mac-rel-css",
         "mac-rel-wpt",
         "windows",
+        "windows-nightly",
     ],
 ))
 c['schedulers'].append(schedulers.Nightly(
@@ -107,6 +108,7 @@ c['schedulers'].append(schedulers.Nightly(
         "android-nightly",
         "linux-nightly",
         "mac-nightly",
+        "windows-nightly",
     ],
     hour=1,
     minute=0,
@@ -179,6 +181,13 @@ c['builders'] = [
         nextBuild=branch_priority,
         category="auto",
     ),
+    util.BuilderConfig(
+        name="windows-nightly",
+        slavenames=WINDOWS_SLAVES,
+        factory=factories.windows_nightly,
+        nextBuild=branch_priority,
+        category="auto",
+    ),
     util.BuilderConfig(
         name="doc",
         slavenames=LINUX_SLAVES,