V2

master/master.cfg

@@ -1296,9 +1296,19 @@ def finish_dist(f, local_dist_dir, dist_subdirs, s3_addy, remote_dist_dir, compo
     # Build the channel manifest
     manifest_name = "channel-" + component + "-" + channel
     manifest_cmd = "ls " + final_dist_dir + " > " + manifest_name + " && mv " + manifest_name + " " + final_dist_dir + "/"
-    f.addStep(MasterShellCommand(name="manifesting",
+    f.addStep(MasterShellCommand(name="building v1 manifest",
                                  command=["sh", "-c", WithProperties(manifest_cmd)]))
 
+    # Build V2 manifest. This relies on having `pip install -e git+https://github.com/edunham/v2_rust_metadata@84f718c693db78880438d43303cc9dafbcbad235#egg=rust_v2_metadata-master`
+    # in the local virtualenv. 
+    v2_name = "channel-" + component + "-" + channel + ".toml"
+    v2_cmd = "v2 -l " + final_dist_dir 
+    v2_cmd += " -m " + component + " -n " + channel + " -r " + remote_dist_dir
+    v2_cmd += " -s " + s3_addy + " > " + v2_name                    
+    v2_cmd += " && mv " + v2_name + " " + final_dist_dir + "/"  
+    f.addStep(MasterShellCommand(name="building v2 manifest",
+                                 command=["sh", "-c", WithProperties(v2_cmd)]))
+
     # Generate signatures
     sign_cmd = "for i in " + final_dist_dir + "/* ; do gpg --no-tty --yes --passphrase-fd 0 -a --detach-sign $i < ../rust-bot-sign-passphrase; done"
     f.addStep(MasterShellCommand(name="signing",

requirements.txt

@@ -0,0 +1,3 @@
+buildbot == 0.8.12
+-e git+https://github.com/edunham/v2_rust_metadata@master#egg=rust_v2_metadata-master
+