← Back to branch summary

~shawn111/ols-jenkaas/pmr-one-shot

« back to all changes in this revision

Viewing changes to containers/ols-vms.conf

  • Committer: Vincent Ladeuil
  • Date: 2016-10-10 14:14:45 UTC
  • mfrom: (223.1.12 u1-trusty)
  • Revision ID: vila+ols@canonical.com-20161010141445-44xiqtz4puptbrep
Merge the trusty remaining jobs with a default configuration based on their puppet definition and using the u1-trusty container

Show diffs side-by-side

added added

removed removed

Lines of Context:
containers/ols-vms.conf
9
9
# cloned later.
10
10
vm.poweroff = True
11
11
 
12
 
# FIXME: Work around ols-vms not expanding ~ or a better way to handle
13
 
# jenkaas.root -- vila 2016-10-05
14
 
jenkaas.root = /home/ubuntu/work
 
12
jenkaas.root = ~/jenkaas
15
13
 
16
14
# Relative paths refers to file in the project root dir as this file is
17
15
# installed there for projects that don't define their own ols-vms.conf.
60
58
vm.backing = sso
61
59
 
62
60
[u1]
63
 
# /!\ 'u1_hackers.ppa.user_pass = <USER>:<PASSWORD>' should be defined in
64
 
# ~/.config/ols-vms/ols-vms.conf, see
65
 
# https://launchpad.net/~/+archivesubscriptions to find your password
66
 
u1.private_ppa = deb https://{u1_hackers.ppa.user_pass}@private-ppa.launchpad.net/ubuntuone/hackers/ubuntu {vm.release} main|4BD0ECAE
 
61
# /!\ 'ubuntuone.ppas.hackers.user_pass = <USER>:<PASSWORD>' should be
 
62
# defined in ~/.config/ols-vms/ols-vms.conf, see
 
63
# https://launchpad.net/~/+archivesubscriptions to find your
 
64
# password. 'canonical_isd_hackers.ppas.ppa.user_pass' too.
 
65
ubuntuone.ppas.hackers.repo_url = deb https://{ubuntuone.ppas.hackers.user_pass}@private-ppa.launchpad.net/ubuntuone/hackers/ubuntu {vm.release} main|4BD0ECAE
67
66
# Same as above for isd_hackers.ppa.user_pass
68
 
isd.private_ppa = deb https://{isd_hackers.ppa.user_pass}@private-ppa.launchpad.net/canonical-isd-hackers/ppa/ubuntu {vm.release} main|F5410BE0
69
 
# FIXME: Disabling the private PPAs to test the theory that nobody need them
70
 
# anymore or find the users when they fail to install the packages...
71
 
# -- vila 2016-10-05
72
 
u1.ppas = # {u1.private_ppa}, {isd.private_ppa}
 
67
canonical_isd_hackers.ppas.ppa.repo_url = deb https://{canonical_isd_hackers.ppas.ppa.user_pass}@private-ppa.launchpad.net/canonical-isd-hackers/ppa/ubuntu {vm.release} main|F5410BE0
 
68
u1.ppas = {ubuntuone.ppas.hackers.repo_url}, {canonical_isd_hackers.ppas.ppa.repo_url}
73
69
 
74
70
[u1-trusty] # The old u1-server-tarmac-trusty-N.vpn.ubuntone.info
75
71
sca.ppas = ppa:mojo-maintainers/ppa, ppa:facundo/salty