Merge lp://qastaging/~pgraner/ubuntu-server-iso-testing/arm-changes into lp://qastaging/ubuntu-server-iso-testing
Proposed by
Pete Graner
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~pgraner/ubuntu-server-iso-testing/arm-changes |
| Merge into: | lp://qastaging/ubuntu-server-iso-testing |
| Diff against target: |
7873 lines (+624/-6484) (has conflicts) 107 files modified
LICENSE.txt (+0/-674) boottests.py (+49/-0) configuration/couchdb-iso-testing.ini (+0/-23) configuration/iso-testing-network.xml (+0/-13) debian/compat (+0/-1) debian/control (+0/-33) debian/rules (+0/-6) debian/source/format (+0/-1) debian/ubuntu-iso-testing.dirs (+0/-5) debian/ubuntu-iso-testing.docs (+0/-1) debian/ubuntu-iso-testing.install (+0/-11) debian/ubuntu-iso-testing.links (+0/-2) debian/ubuntu-iso-testing.postinst (+0/-98) debian/ubuntu-iso-testing.postrm (+0/-62) docs/NEWS (+0/-98) docs/README (+0/-168) docs/README.dev (+0/-240) docs/TODO (+0/-25) post_reboot_test_cases/check-running-services/test (+43/-0) preseeds-common/base (+4/-2) run_test (+43/-12) templates.alternate/libvirt.xml (+0/-65) templates.alternate/pxelinuxcfg.install (+0/-28) templates.alternate/run_test (+0/-170) templates.alternate/test_cases/default/preseed (+0/-21) templates.alternate/test_cases/default/test (+0/-37) templates.alternate/test_cases/lvm/preseed (+0/-38) templates.alternate/test_cases/lvm/test (+0/-105) templates.alternate/test_cases/netboot_ubuntudesktop/preseed (+0/-33) templates.alternate/test_cases/netboot_ubuntudesktop/test (+0/-37) templates.alternate/test_cases/netboot_ubuntuserver/preseed (+0/-37) templates.alternate/test_cases/netboot_ubuntuserver/test (+0/-37) templates.alternate/test_cases/oem/config (+0/-23) templates.alternate/test_cases/oem/preseed (+0/-36) templates.alternate/test_cases/oem/test (+0/-77) templates.desktop/custom-installation/hooks/casper-bottom.sh (+0/-72) templates.desktop/custom-installation/hooks/casper-premount.sh (+0/-3) templates.desktop/custom-installation/hooks/early-command.sh (+0/-2) templates.desktop/custom-installation/hooks/failure-command.sh (+0/-4) templates.desktop/custom-installation/hooks/success-command.sh (+0/-23) templates.desktop/custom-installation/target-override/etc/rsyslog.d/50-default.conf (+0/-69) templates.desktop/libvirt.xml (+0/-66) templates.desktop/pxelinuxcfg.install (+0/-28) templates.desktop/run_test (+0/-170) templates.desktop/run_test.wrapper (+0/-70) templates.desktop/test_cases/default/config (+0/-23) templates.desktop/test_cases/default/preseed (+0/-21) templates.desktop/test_cases/default/test (+0/-50) templates.desktop/test_cases/default/test_apps (+0/-94) templates.desktop/test_cases/encryptedhome/config (+0/-23) templates.desktop/test_cases/encryptedhome/preseed (+0/-35) templates.desktop/test_cases/encryptedhome/test (+0/-77) templates.desktop/test_cases/livesession/custom-installation/hooks/casper-bottom.sh (+0/-73) templates.desktop/test_cases/livesession/custom-installation/hooks/casper-premount.sh (+0/-3) templates.desktop/test_cases/livesession/custom-installation/target-override/etc/rc.local (+0/-20) templates.desktop/test_cases/livesession/preseed (+0/-21) templates.desktop/test_cases/livesession/test (+0/-55) templates.desktop/test_cases/oem/config (+0/-23) templates.desktop/test_cases/oem/preseed (+0/-36) templates.desktop/test_cases/oem/test (+0/-77) templates.desktop/test_cases/ubiquity/preseed (+0/-21) templates.desktop/test_cases/ubiquity/test (+0/-150) templates.kernel/libvirt.xml (+0/-60) templates.kernel/ltp2junitxml.py (+0/-68) templates.kernel/preseeds-common/base (+0/-315) templates.kernel/pxelinuxcfg.install (+0/-29) templates.kernel/run_test (+0/-170) templates.kernel/test_cases/akt-dbench/preseed (+0/-287) templates.kernel/test_cases/akt-dbench/test (+0/-65) templates.kernel/test_cases/akt-tbench/preseed (+0/-287) templates.kernel/test_cases/akt-tbench/test (+0/-67) templates.kernel/test_cases/generic-proposed/preseed (+0/-56) templates.kernel/test_cases/generic-proposed/test (+0/-37) templates.kernel/test_cases/generic/preseed (+0/-54) templates.kernel/test_cases/server-proposed/preseed (+0/-56) templates.kernel/test_cases/server-proposed/test (+0/-37) templates.kernel/test_cases/server/preseed (+0/-52) templates.kernel/test_cases/server/test (+0/-35) templates.kernel/test_cases/virtual-proposed/preseed (+0/-62) templates.kernel/test_cases/virtual-proposed/test (+0/-37) templates.kernel/test_cases/virtual/preseed (+0/-58) templates.kernel/test_cases/virtual/test (+0/-35) test_cases/dns-server/test (+22/-32) test_cases/lamp-reboot/preseed (+24/-0) test_cases/lamp-reboot/test (+82/-0) test_cases/lamp/test (+3/-3) test_cases/minimal-virtual/test (+6/-1) test_cases/multi-lvm/config (+2/-0) test_cases/multi-lvm/preseed (+31/-0) test_cases/multi-lvm/test (+127/-0) test_cases/openssh-server/test (+9/-10) test_cases/raid1/config (+3/-0) test_cases/raid1/preseed (+72/-0) test_cases/raid1/test (+98/-0) test_cases/samba-server/test (+6/-0) unbsdtar-safelink (+0/-89) wubi/README (+0/-118) wubi/bin/Wubi Test.bat (+0/-6) wubi/bin/config (+0/-8) wubi/bin/functions (+0/-39) wubi/bin/poll-wubi-results.sh (+0/-47) wubi/bin/run-test.sh (+0/-188) wubi/bin/wubi-diskimage.sh (+0/-109) wubi/bin/wubi-test.sh (+0/-249) wubi/data/custom-installation/target-override/etc/rc.local (+0/-25) wubi/data/custom-installation/target-override/usr/local/bin/run_test (+0/-57) wubi/data/custom-installation/target-override/usr/local/tests/test_default.py (+0/-108) Conflict: can't delete debian because it is not empty. Not deleting. Conflict because debian is not versioned, but has versioned children. Versioned directory. Contents conflict in debian/changelog Contents conflict in debian/copyright Contents conflict in download-latest-test-iso.py Contents conflict in run-test.py Conflict: can't delete templates.alternate because it is not empty. Not deleting. Conflict because templates.alternate is not versioned, but has versioned children. Versioned directory. Conflict: can't delete templates.alternate/preseeds-common because it is not empty. Not deleting. Conflict because templates.alternate/preseeds-common is not versioned, but has versioned children. Versioned directory. Contents conflict in templates.alternate/preseeds-common/base Conflict: can't delete templates.desktop because it is not empty. Not deleting. Conflict because templates.desktop is not versioned, but has versioned children. Versioned directory. Conflict: can't delete templates.desktop/preseeds-common because it is not empty. Not deleting. Conflict because templates.desktop/preseeds-common is not versioned, but has versioned children. Versioned directory. Contents conflict in templates.desktop/preseeds-common/base Conflict: can't delete templates.kernel because it is not empty. Not deleting. Conflict because templates.kernel is not versioned, but has versioned children. Versioned directory. Conflict: can't delete templates.kernel/test_cases because it is not empty. Not deleting. Conflict because templates.kernel/test_cases is not versioned, but has versioned children. Versioned directory. Conflict: can't delete templates.kernel/test_cases/generic because it is not empty. Not deleting. Conflict because templates.kernel/test_cases/generic is not versioned, but has versioned children. Versioned directory. Contents conflict in templates.kernel/test_cases/generic/test |
| To merge this branch: | bzr merge lp://qastaging/~pgraner/ubuntu-server-iso-testing/arm-changes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jean-Baptiste Lallement | Pending | ||
|
Review via email:
|
|||
Commit message
Changes to support ARM auotmated testing.
Description of the change
Changes to support ARM auotmated testing.
To post a comment you must log in.
Unmerged revisions
- 273. By Pete Graner
-
Changed regex to match both ipv4 & ipv6 ports from netstat. Thanks jibel!
- 272. By Pete Graner
-
Reworked so test will run on both ARM and x86.
- 271. By Pete Graner
-
Reworked to use generic shell execution and exit code reporting. The original was not working on ARM. Now works on all arches.
- 270. By James Page
-
Tidy up run_test and make reboot testing work
- 269. By James Page
-
Removed unsafe option from disk
- 268. By James Page
-
Added lamp-reboot test with associated modifications
- 267. By Patrick Wright
-
increased disk size for multi-lvm tests
- 266. By James Page
-
Really added raid1
- 265. By James Page
-
Enabled debug for test execution
- 264. By James Page
-
Test refactoring
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
