Merge lp://qastaging/~doanac/ubuntu-test-cases/cdimage-removal into lp://qastaging/ubuntu-test-cases
Proposed by
Andy Doan
Status: | Merged |
---|---|
Merge reported by: | Andy Doan |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~doanac/ubuntu-test-cases/cdimage-removal |
Merge into: | lp://qastaging/ubuntu-test-cases |
Diff against target: |
4492 lines (+3595/-0) (has conflicts) 168 files modified
jenkins/setup_jenkins.py (+212/-0) jenkins/templates/touch-address-book-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-autopilot-base.xml.jinja2 (+23/-0) jenkins/templates/touch-base.xml.jinja2 (+98/-0) jenkins/templates/touch-calendar-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-camera-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-default.xml.jinja2 (+6/-0) jenkins/templates/touch-dialer-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-eventstat.xml.jinja2 (+21/-0) jenkins/templates/touch-friends-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-gallery-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-install-and-boot.xml.jinja2 (+28/-0) jenkins/templates/touch-master.xml.jinja2 (+54/-0) jenkins/templates/touch-mediaplayer-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-memevent.xml.jinja2 (+9/-0) jenkins/templates/touch-messaging-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-music-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-notes-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-sdk.xml.jinja2 (+7/-0) jenkins/templates/touch-security.xml.jinja2 (+7/-0) jenkins/templates/touch-setup.xml.jinja2 (+6/-0) jenkins/templates/touch-share-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-smem.xml.jinja2 (+20/-0) jenkins/templates/touch-ubuntu-calculator-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-ubuntu-clock-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-ubuntu-clock-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-ubuntu-docviewer-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-ubuntu-filemanager-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-ubuntu-rssreader-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-ubuntu-terminal-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-ubuntu-weather-app-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-unity8-autopilot.xml.jinja2 (+6/-0) jenkins/templates/touch-upgrade.xml.jinja2 (+28/-0) jenkins/templates/touch-webbrowser-app-autopilot.xml.jinja2 (+6/-0) scripts/get-adb-id (+33/-0) scripts/jenkins.sh (+179/-0) scripts/provision.sh (+92/-0) scripts/run-touch-upgrade.sh (+46/-0) scripts/run-touch-utah-runlist.sh (+65/-0) tests/address-book-app-autopilot/master.run (+15/-0) tests/address-book-app-autopilot/ts_control (+1/-0) tests/address-book-app-autopilot/tslist.auto (+4/-0) tests/calendar-app-autopilot/master.run (+15/-0) tests/calendar-app-autopilot/ts_control (+1/-0) tests/calendar-app-autopilot/tslist.auto (+4/-0) tests/camera-app-autopilot/master.run (+15/-0) tests/camera-app-autopilot/ts_control (+1/-0) tests/camera-app-autopilot/tslist.auto (+4/-0) tests/default/ifconfig/tc_control (+13/-0) tests/default/install/tc_control (+12/-0) tests/default/master.run (+5/-0) tests/default/netstat/tc_control (+12/-0) tests/default/ping/pingtest.sh (+12/-0) tests/default/ping/tc_control (+12/-0) tests/default/pwd/tc_control (+9/-0) tests/default/pwd/test.sh (+18/-0) tests/default/route/tc_control (+12/-0) tests/default/systemsettle/systemsettle.sh (+120/-0) tests/default/systemsettle/tc_control (+9/-0) tests/default/ts_control (+3/-0) tests/default/tslist.run (+10/-0) tests/default/uname/tc_control (+12/-0) tests/default/unity8/tc_control (+9/-0) tests/default/vmstat/tc_control (+12/-0) tests/dialer-app-autopilot/master.run (+15/-0) tests/dialer-app-autopilot/ts_control (+1/-0) tests/dialer-app-autopilot/tslist.auto (+4/-0) tests/friends-app-autopilot/master.run (+15/-0) tests/friends-app-autopilot/ts_control (+1/-0) tests/friends-app-autopilot/tslist.auto (+4/-0) tests/gallery-app-autopilot/master.run (+15/-0) tests/gallery-app-autopilot/ts_control (+1/-0) tests/gallery-app-autopilot/tslist.auto (+4/-0) tests/install-and-boot/boot/tc_control (+9/-0) tests/install-and-boot/master.run (+5/-0) tests/install-and-boot/tslist.run (+1/-0) tests/mediaplayer-app-autopilot/master.run (+15/-0) tests/mediaplayer-app-autopilot/ts_control (+1/-0) tests/mediaplayer-app-autopilot/tslist.auto (+4/-0) tests/memevent/master.run (+5/-0) tests/memevent/setup.sh (+8/-0) tests/memevent/ts_control (+1/-0) tests/memevent/tslist.auto (+7/-0) tests/memevent/ubuntu_test_cases/__init__.py (+6/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/__init__.py (+1/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/__init__.py (+21/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/browser.py (+103/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/camera.py (+58/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/gallery.py (+41/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/apps/media_player.py (+53/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/matchers.py (+37/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/probes.py (+170/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/smem-tabs (+687/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/__init__.py (+1/-0) tests/memevent/ubuntu_test_cases/memory_usage_measurement/tests/test_memory_usage.py (+81/-0) tests/messaging-app-autopilot/master.run (+15/-0) tests/messaging-app-autopilot/ts_control (+1/-0) tests/messaging-app-autopilot/tslist.auto (+4/-0) tests/music-app-autopilot/master.run (+15/-0) tests/music-app-autopilot/ts_control (+1/-0) tests/music-app-autopilot/tslist.auto (+4/-0) tests/notes-app-autopilot/master.run (+15/-0) tests/notes-app-autopilot/ts_control (+1/-0) tests/notes-app-autopilot/tslist.auto (+4/-0) tests/sdk/check-packages/check-packages.sh (+14/-0) tests/sdk/check-packages/tc_control (+9/-0) tests/sdk/master.run (+5/-0) tests/sdk/tslist.run (+1/-0) tests/security/check-apparmor/check-apparmor.sh (+12/-0) tests/security/check-apparmor/tc_control (+9/-0) tests/security/check-packages/check-packages.sh (+12/-0) tests/security/check-packages/tc_control (+9/-0) tests/security/check-ufw/check-ufw.sh (+12/-0) tests/security/check-ufw/tc_control (+9/-0) tests/security/master.run (+5/-0) tests/security/ts_control (+1/-0) tests/security/tslist.run (+3/-0) tests/share-app-autopilot/master.run (+15/-0) tests/share-app-autopilot/ts_control (+1/-0) tests/share-app-autopilot/tslist.auto (+4/-0) tests/systemsettle/systemsettle-after/tc_control (+9/-0) tests/systemsettle/systemsettle-before/tc_control (+9/-0) tests/systemsettle/systemsettle.sh (+119/-0) tests/systemsettle/tslist.run (+2/-0) tests/ubuntu-calculator-app-autopilot/master.run (+15/-0) tests/ubuntu-calculator-app-autopilot/ts_control (+1/-0) tests/ubuntu-calculator-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-clock-app-autopilot/master.run (+15/-0) tests/ubuntu-clock-app-autopilot/ts_control (+1/-0) tests/ubuntu-clock-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-docviewer-app-autopilot/master.run (+15/-0) tests/ubuntu-docviewer-app-autopilot/ts_control (+1/-0) tests/ubuntu-docviewer-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-filemanager-app-autopilot/master.run (+15/-0) tests/ubuntu-filemanager-app-autopilot/ts_control (+1/-0) tests/ubuntu-filemanager-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-rssreader-app-autopilot/master.run (+15/-0) tests/ubuntu-rssreader-app-autopilot/ts_control (+1/-0) tests/ubuntu-rssreader-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-terminal-app-autopilot/master.run (+15/-0) tests/ubuntu-terminal-app-autopilot/ts_control (+1/-0) tests/ubuntu-terminal-app-autopilot/tslist.auto (+4/-0) tests/ubuntu-weather-app-autopilot/master.run (+15/-0) tests/ubuntu-weather-app-autopilot/ts_control (+1/-0) tests/ubuntu-weather-app-autopilot/tslist.auto (+4/-0) tests/unity8-autopilot/master.run (+15/-0) tests/unity8-autopilot/setup.sh (+6/-0) tests/unity8-autopilot/ts_control (+2/-0) tests/unity8-autopilot/tslist.auto (+4/-0) tests/upgrade/README (+3/-0) tests/upgrade/install_old/run.sh (+27/-0) tests/upgrade/install_old/tc_control (+9/-0) tests/upgrade/master.run (+5/-0) tests/upgrade/tslist.run (+2/-0) tests/upgrade/upgrade/tc_control (+9/-0) tests/upgrade/upgrade/upgrade.sh (+79/-0) tests/webbrowser-app-autopilot/master.run (+15/-0) tests/webbrowser-app-autopilot/ts_control (+1/-0) tests/webbrowser-app-autopilot/tslist.auto (+4/-0) utils/host/adb-shell (+20/-0) utils/host/autopilot-list (+18/-0) utils/host/autopilot-run (+6/-0) utils/host/prepare-autopilot-test.sh (+5/-0) utils/target/autopilot-list (+13/-0) utils/target/autopilot-run (+6/-0) utils/target/prepare-autopilot-test.sh (+17/-0) utils/target/unlock_screen.py (+87/-0) utils/target/unlock_screen.sh (+7/-0) Conflict adding file scripts. Moved existing file to scripts.moved. |
To merge this branch: | bzr merge lp://qastaging/~doanac/ubuntu-test-cases/cdimage-removal |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Larson | Approve | ||
Review via email:
|
Description of the change
remove support for cdimage builds in setup_jenkins.py
To post a comment you must log in.
This seems reasonable. We can always get it back if we really really need to. I *do* hope that we can eventually just drop the wait thing entirely.