Rearrange the git configuration slightly:

[invirt/packages/xvm-prodconfig.git] / master.yaml

diff --git a/master.yaml b/master.yaml
index cc03b96..165b28a 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,5 +1,5 @@
 contact: &contact xvm@mit.edu
 contact: &contact xvm@mit.edu

-adminacl: system:xvm-root
+adminacl: &adminacl system:xvm-root

 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:

@@ -46,13 +46,17 @@ dns:
   - /etc/invirt/zone
 
 git:
   - /etc/invirt/zone
 
 git:

- branches:
+ pockets:

   prod:
    acl: *adminacl
   prod:
    acl: *adminacl

-   component: stable
+   apt: stable

   dev:
    acl: system:xvm-dev
   dev:
    acl: system:xvm-dev

-   component: unstable
+   apt: unstable
+   allow_backtracking: yes
+ tagger:
+  name: Invirt Build Server
+  email: invirt@mit.edu

 
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu
 
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu