~vila/ubuntu-ci-services-itself/integration

« back to all changes in this revision

Viewing changes to test_runner/tstrun/testbed.py

Committer: Vincent Ladeuil
Date: 2014-02-18 23:46:57 UTC
mfrom: (217.2.24 ubuntu-ci-services-itself)
Revision ID: vila+ci@canonical.com-20140218234657-3u806qd4cmbx86vr

Merge trunk resolving conflicts

files added:
branch-source-builder/bsbuilder/tests/test_style.py

branch-source-builder/cupstream2distro

branch-source-builder/cupstream2distro/__init__.py

branch-source-builder/cupstream2distro/branchhandling.py

branch-source-builder/cupstream2distro/launchpadmanager.py

branch-source-builder/cupstream2distro/packageinppa.py

branch-source-builder/cupstream2distro/packageinppamanager.py

branch-source-builder/cupstream2distro/packagemanager.py

branch-source-builder/cupstream2distro/settings.py

branch-source-builder/cupstream2distro/silomanager.py

branch-source-builder/cupstream2distro/stack.py

branch-source-builder/cupstream2distro/stacks.py

branch-source-builder/cupstream2distro/tools.py

branch-source-builder/cupstream2distro/utils.py

branch-source-builder/upload_package.py

branch-source-builder/watch_ppa.py

ci-utils/ci_utils/tests/test_data_store.py

ci-utils/ci_utils/tests/test_style.py

cli/tests/test_style.py

image-builder/imagebuilder/tests/test_style.py

lander/lander/tests/test_style.py

test_runner/tstrun/tests/test_style.py

ticket_system/ticket/tests/test_style.py

files renamed:
juju-deployer/branch-source-builder.yaml => juju-deployer/branch-source-builder.yaml.tmpl

juju-deployer/image-builder.yaml => juju-deployer/image-builder.yaml.tmpl

juju-deployer/test-runner.yaml => juju-deployer/test-runner.yaml.tmpl

files modified:
branch-source-builder/run_worker

charms/precise/lander-jenkins/templates/jobs/lander_master.xml

charms/precise/rabbitmq-worker/config.yaml

charms/precise/rabbitmq-worker/hooks/hooks.py

charms/precise/webui/hooks/hooks.py

ci-utils/ci_utils/data_store/__init__.py

ci-utils/ci_utils/nova_client/__init__.py

ci-utils/ci_utils/tests/test_jenkins.py

ci-utils/ci_utils/tests/test_tmpdir.py

ci-utils/setup.py

cli/ci_libs/utils.py

cli/tests/__init__.py

cli/tests/test_utils.py

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/deploy.py

juju-deployer/juju-gui.yaml

juju-deployer/lander.yaml

juju-deployer/ppa-assigner.yaml

juju-deployer/test_deploy.py

juju-deployer/test_update.py

juju-deployer/ticket-system.yaml

juju-deployer/update.py

lander/bin/lander_archiver.py

ppa-assigner/ppa_assigner/management/commands/integration_test.py

ppa-assigner/ppa_assigner/tests.py

tarmac.sh

test_runner/tstrun/testbed.py

test_runner/tstrun/tests/test_data_store.py

tests/run.py

tests/test_data_store.py

ticket_system/project/migrations/0001_initial.py

ticket_system/project/tests.py

ticket_system/ticket/migrations/0001_initial.py

ticket_system/ticket/tests/__init__.py

Show diffs side-by-side

added added

removed removed

test_runner/tstrun/testbed.py

294

# 'auth_testbed_sshkey' can be defined there if you don't use ~/.ssh/id_rsa.

295

296

def test_print_ip():

297

precise_image = ('ubuntu-released/ubuntu-precise-12.04'

298

'-amd64-server-20131205-disk1.img')

297

# The following image can be used if needed for precise testing

298

# precise_image = ('ubuntu-released/ubuntu-precise-12.04'

299

# '-amd64-server-20131205-disk1.img')

299

300

saucy_image = ('ubuntu-released/ubuntu-saucy-13.10'

300

301

'-amd64-server-20140129-disk1.img')

301

302

test_bed = TestBed('vila1', 'm1.small', saucy_image,

Older »