Revision 23103544

b/qa/qa-sample.yaml
72 72
# Other settings
73 73
options:
74 74
  burnin-instances: 2
75
  burnin-disk-template: remote_raid1
75 76

  
76 77
  # Directory containing QA hooks
77 78
  #hooks-dir: hooks/
b/qa/qa_cluster.py
117 117
  """Burnin"""
118 118
  master = qa_config.GetMasterNode()
119 119

  
120
  disk_template = (qa_config.get('options', {}).
121
                   get('burnin-disk-template', 'remote_raid1'))
122

  
120 123
  # Get as many instances as we need
121 124
  instances = []
122 125
  try:
123
    num = qa_config.get('options', {}).get('burnin-instances', 1)
124
    for _ in xrange(0, num):
125
      instances.append(qa_config.AcquireInstance())
126
  except qa_error.OutOfInstancesError:
127
    print "Not enough instances, continuing anyway."
126
    try:
127
      num = qa_config.get('options', {}).get('burnin-instances', 1)
128
      for _ in xrange(0, num):
129
        instances.append(qa_config.AcquireInstance())
130
    except qa_error.OutOfInstancesError:
131
      print "Not enough instances, continuing anyway."
128 132

  
129
  if len(instances) < 1:
130
    raise qa_error.Error("Burnin needs at least one instance")
133
    if len(instances) < 1:
134
      raise qa_error.Error("Burnin needs at least one instance")
131 135

  
132
  # Run burnin
133
  try:
134 136
    script = qa_utils.UploadFile(master['primary'], '../tools/burnin')
135 137
    try:
138
      # Run burnin
136 139
      cmd = [script,
137 140
             '--os=%s' % qa_config.get('os'),
138 141
             '--os-size=%s' % qa_config.get('os-size'),
139
             '--swap-size=%s' % qa_config.get('swap-size')]
142
             '--swap-size=%s' % qa_config.get('swap-size'),
143
             '--disk-template=%s' % disk_template]
140 144
      cmd += [inst['name'] for inst in instances]
141 145
      AssertEqual(StartSSH(master['primary'],
142 146
                           utils.ShellQuoteArgs(cmd)).wait(), 0)

Also available in: Unified diff