← Back to branch summary

~sylvain-pineau/checkbox/fix-1473939

« back to all changes in this revision

Viewing changes to providers/plainbox-provider-checkbox/bin/virtualization

  • Committer: Sylvain Pineau
  • Author(s): Jeff Lane
  • Date: 2016-04-22 20:32:04 UTC
  • mfrom: (4321.1.1 virtualization-test-s390)
  • Revision ID: sylvain_pineau-20160422203204-02xpobio4g4oso67
"automatic merge of lp:~bladernr/checkbox/virtualization-test-s390/ by tarmac [r=roadmr][bug=][author=bladernr]"

Show diffs side-by-side

added added

removed removed

Lines of Context:
providers/plainbox-provider-checkbox/bin/virtualization
115
115
            '-cpu', 'POWER8',
116
116
        ],
117
117
    },
 
118
    's390x': {
 
119
        'cloudimg_type': CLOUD_IMAGE_TYPE_DISK,
 
120
        'cloudimg_arch': 's390x',
 
121
        'qemu_bin': 'qemu-system-s390x',
 
122
        'qemu_disk_type': QEMU_DISK_TYPE_VIRTIO,
 
123
        'qemu_extra_args': [
 
124
            '-enable-kvm',
 
125
            '-machine', 's390-ccw-virtio-2.5',
 
126
        ],
 
127
    },
118
128
}
119
129
 
120
130