- Timestamp:
- Dec 14, 2009, 8:59:28 PM (15 years ago)
- Location:
- trunk/packages
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/invirt-dev/invirt-build-conf
r2584 r2593 38 38 build_handler = '/usr/sbin/invirt-submit-build' 39 39 40 for pocket in config. git.pockets:41 acl = authz.expandAdmin(getattr(config. git.pockets, pocket).acl, None)40 for pocket in config.build.pockets: 41 acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl, None) 42 42 43 43 acl_fd, acl_name = tempfile.mkstemp() -
trunk/packages/invirt-dev/invirtibuilder
r2577 r2593 21 21 22 22 where pocket is one of the pockets globally configured in 23 git.pockets. For instance, the pockets in XVM are "prod" and "dev".23 build.pockets. For instance, the pockets in XVM are "prod" and "dev". 24 24 25 25 principal is the Kerberos principal that requested the build. … … 138 138 legitimacy of my reasoning. 139 139 """ 140 if config. git.pockets[pocket].get('allow_backtracking', False):140 if config.build.pockets[pocket].get('allow_backtracking', False): 141 141 env = dict(os.environ) 142 142 branch = b.pocketToGit(pocket) 143 143 version = b.getVersion(package, ref) 144 144 145 env['GIT_COMMITTER_NAME'] = config. git.tagger.name146 env['GIT_COMMITTER_EMAIL'] = config. git.tagger.email145 env['GIT_COMMITTER_NAME'] = config.build.tagger.name 146 env['GIT_COMMITTER_EMAIL'] = config.build.tagger.email 147 147 tag_msg = ('Tag %s of %s\n\n' 148 148 'Requested by %s' % (version.full_version, -
trunk/packages/invirt-dev/python/invirt/builder.py
r2587 r2593 32 32 def pocketToGit(pocket): 33 33 """Map a pocket in the configuration to a git branch.""" 34 return getattr(getattr(config. git.pockets, pocket), 'git', pocket)34 return getattr(getattr(config.build.pockets, pocket), 'git', pocket) 35 35 36 36 37 37 def pocketToApt(pocket): 38 38 """Map a pocket in the configuration to an apt repo pocket.""" 39 return getattr(getattr(config. git.pockets, pocket), 'apt', pocket)39 return getattr(getattr(config.build.pockets, pocket), 'apt', pocket) 40 40 41 41 … … 89 89 new_version = getVersion(package, commit) 90 90 91 for p in config. git.pockets:91 for p in config.build.pockets: 92 92 if p == pocket: 93 93 continue … … 106 106 (new_version, package, p, current_commit)) 107 107 108 if config. git.pockets[pocket].get('allow_backtracking', False):108 if config.build.pockets[pocket].get('allow_backtracking', False): 109 109 branch = pocketToGit(pocket) 110 110 current_version = getVersion(package, branch) -
trunk/packages/invirt-dev/repository-config/distributions.mako
r2552 r2593 3 3 from invirt import builder as b 4 4 %>\ 5 % for pocket in cfg. git.pockets:5 % for pocket in cfg.build.pockets: 6 6 CodeName: ${b.pocketToApt(pocket)} 7 7 Components: main invirt-system -
trunk/packages/xvm-prodconfig/master.yaml
r2590 r2593 22 22 - cell: dev.mit.edu 23 23 auth: no 24 25 build: 26 pockets: 27 prod: 28 acl: *adminacl 29 apt: stable 30 dev: 31 acl: system:xvm-dev 32 apt: unstable 33 allow_backtracking: yes 34 tagger: 35 name: Invirt Build Server 36 email: invirt@mit.edu 24 37 25 38 console: … … 54 67 zone_files: 55 68 - /etc/invirt/zone 56 57 git:58 pockets:59 prod:60 acl: *adminacl61 apt: stable62 dev:63 acl: system:xvm-dev64 apt: unstable65 allow_backtracking: yes66 tagger:67 name: Invirt Build Server68 email: invirt@mit.edu69 69 70 70 hosts: # hosts on which VMs run
Note: See TracChangeset
for help on using the changeset viewer.