Changeset 2593

Timestamp:

Dec 14, 2009, 8:59:28 PM (14 years ago)

Author:

broder

Message:

Rename the "git" tree in the configuration to "build" to be more accurate.

Location:

trunk/packages

Files:

• invirt-dev/invirt-build-conf (modified) (1 diff)
• invirt-dev/invirtibuilder (modified) (2 diffs)
• invirt-dev/python/invirt/builder.py (modified) (3 diffs)
• invirt-dev/repository-config/distributions.mako (modified) (1 diff)
• xvm-prodconfig/master.yaml (modified) (2 diffs)

trunk/packages/invirt-dev/invirt-build-conf

@@ -38 +38 @@
     build_handler = '/usr/sbin/invirt-submit-build'
 
-    for pocket in config.git.pockets:
-        acl = authz.expandAdmin(getattr(config.git.pockets, pocket).acl, None)
+    for pocket in config.build.pockets:
+        acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl, None)
 
         acl_fd, acl_name = tempfile.mkstemp()

trunk/packages/invirt-dev/invirtibuilder

@@ -21 +21 @@
 
 where pocket is one of the pockets globally configured in
-git.pockets. For instance, the pockets in XVM are "prod" and "dev".
+build.pockets. For instance, the pockets in XVM are "prod" and "dev".
 
 principal is the Kerberos principal that requested the build.
@@ -138 +138 @@
     legitimacy of my reasoning.
     """
-    if config.git.pockets[pocket].get('allow_backtracking', False):
+    if config.build.pockets[pocket].get('allow_backtracking', False):
         env = dict(os.environ)
         branch = b.pocketToGit(pocket)
         version = b.getVersion(package, ref)
 
-        env['GIT_COMMITTER_NAME'] = config.git.tagger.name
-        env['GIT_COMMITTER_EMAIL'] = config.git.tagger.email
+        env['GIT_COMMITTER_NAME'] = config.build.tagger.name
+        env['GIT_COMMITTER_EMAIL'] = config.build.tagger.email
         tag_msg = ('Tag %s of %s\n\n'
                    'Requested by %s' % (version.full_version,

trunk/packages/invirt-dev/python/invirt/builder.py

@@ -32 +32 @@
 def pocketToGit(pocket):
     """Map a pocket in the configuration to a git branch."""
-    return getattr(getattr(config.git.pockets, pocket), 'git', pocket)
+    return getattr(getattr(config.build.pockets, pocket), 'git', pocket)
 
 
 def pocketToApt(pocket):
     """Map a pocket in the configuration to an apt repo pocket."""
-    return getattr(getattr(config.git.pockets, pocket), 'apt', pocket)
+    return getattr(getattr(config.build.pockets, pocket), 'apt', pocket)
 
 
@@ -89 +89 @@
     new_version = getVersion(package, commit)
 
-    for p in config.git.pockets:
+    for p in config.build.pockets:
         if p == pocket:
             continue
@@ -106 +106 @@
                                    (new_version, package, p, current_commit))
 
-    if config.git.pockets[pocket].get('allow_backtracking', False):
+    if config.build.pockets[pocket].get('allow_backtracking', False):
         branch = pocketToGit(pocket)
         current_version = getVersion(package, branch)

trunk/packages/invirt-dev/repository-config/distributions.mako

@@ -3 +3 @@
 from invirt import builder as b
 %>\
-% for pocket in cfg.git.pockets:
+% for pocket in cfg.build.pockets:
 CodeName: ${b.pocketToApt(pocket)}
 Components: main invirt-system

trunk/packages/xvm-prodconfig/master.yaml

@@ -22 +22 @@
   - cell: dev.mit.edu
     auth: no
+
+build:
+ pockets:
+  prod:
+   acl: *adminacl
+   apt: stable
+  dev:
+   acl: system:xvm-dev
+   apt: unstable
+   allow_backtracking: yes
+ tagger:
+  name: Invirt Build Server
+  email: invirt@mit.edu
 
 console:
@@ -54 +67 @@
  zone_files:
   - /etc/invirt/zone
-
-git:
- pockets:
-  prod:
-   acl: *adminacl
-   apt: stable
-  dev:
-   acl: system:xvm-dev
-   apt: unstable
-   allow_backtracking: yes
- tagger:
-  name: Invirt Build Server
-  email: invirt@mit.edu
 
 hosts: # hosts on which VMs run