Merge lp:~canonical-platform-qa/qa-jenkins-jobs/add-ust-grafana into lp:qa-jenkins-jobs

[Richard Huddie]

Use ubuntu-system-tests-config project to create the config file and use Practitest filters to get the list of tests to run.

Now that we can access private config project from jenkins, remove the previous config file from script and replace with bzr.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:212
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/94/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/273
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/273/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/271
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/271/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1597/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/94/rebuild

review: Approve (continuous-integration)

=== modified file 'jobs/ubuntu-system-tests/ubuntu-system-tests-config-builder.sh'
--- jobs/ubuntu-system-tests/ubuntu-system-tests-config-builder.sh	2017-02-02 11:21:22 +0000
+++ jobs/ubuntu-system-tests/ubuntu-system-tests-config-builder.sh	2017-02-13 09:09:09 +0000
@@ -7,70 +7,13 @@
 export CACHE_PATH=${WORKSPACE}/.ust-cache
 export OUTPUTDIR=$WORKSPACE/results
 
-# TODO: Use this once we can access the config project
-#rm -rf qa-jenkins-jobs
-#bzr branch $QA_JENKINS_JOBS_BRANCH qa-jenkins-jobs
-#./qa-jenkins-jobs/scripts/ubuntu-system-tests/write-ust-config.sh
-# TODO: Remove this once we can access the config project
-rm $CONFIG_PATH
+rm -rf qa-jenkins-jobs
+bzr branch $QA_JENKINS_JOBS_BRANCH qa-jenkins-jobs
+./qa-jenkins-jobs/scripts/ubuntu-system-tests/write-ust-config.sh
+
 cat >> $CONFIG_PATH <<EOF
-[default]
-tests_to_run = FIXME
-ssh_ip = FIXME
-ssh_user = FIXME
-bluetooth_device_name = FIXME
-device_username = ubuntu
-device_password = ubuntu
-device_ip = localhost
-device_phone_number = FIXME
-device_security = Passcode
-max_unity8_retry_delay = 30000
-sim_0_pin = FIXME
-sim_1_pin = FIXME
-telephony_service_number1 = FIXME
-telephony_service_number2 = FIXME
-ssh_passphrase = FIXME
-ssh_private_key = FIXME
-device_phone_number2 = FIXME
-touch_visualization = false
-_twilio_account_sid = FIXME
-_twilio_auth_token = FIXME
-_practitest_project_id = FIXME
-_practitest_api_token = FIXME
-wifi_password = FIXME
-wifi_ssid = FIXME
-app_startup_cold_runs = 0
-app_startup_hot_runs = 0
-pictures_scalability_runs = 0
-videos_scalability_runs = 0
-music_scalability_runs = 0
-password_outlook = FIXME
-password_yahoo = FIXME
-password_imap = FIXME
-encryption_imap = FIXME
-hostname_imap = FIXME
-port_number_imap = FIXME
-username_imap = FIXME
-email_outlook = FIXME
-email_yahoo = FIXME
-email_smtp = FIXME
-encryption_smtp = FIXME
-hostname_smtp = FIXME
-name_smtp = FIXME
-password_smtp = FIXME
-port_number_smtp = FIXME
-username_smtp = FIXME
-country_sim = FIXME
-qemu_auto_iso_download = false
-qemu_iso_arch = amd64
-qemu_iso_url = http://cdimage.ubuntu.com/daily-live/current
+device_serial = 1234567890
 cache_data_path = $CACHE_PATH
-qemu_cpu_count = 2
-qemu_ram_alloc = 2G
-qemu_disk_size = 15G
-qemu_headless = true
-qemu_max_cache_file_count = 0
-device_serial = 1234567890
 output_dir = $OUTPUTDIR
 target_type = $TARGET
 package_type = $PACKAGE

=== modified file 'jobs/ubuntu-system-tests/ubuntu-system-tests-run-tests-builder.sh'
--- jobs/ubuntu-system-tests/ubuntu-system-tests-run-tests-builder.sh	2017-02-03 14:44:52 +0000
+++ jobs/ubuntu-system-tests/ubuntu-system-tests-run-tests-builder.sh	2017-02-13 09:09:09 +0000
@@ -5,6 +5,8 @@
 export SHARED_IMG_PATH=/var/cache/ust/img/$RELEASE-unity8-$PACKAGE.img
 export OUTPUTDIR=$WORKSPACE/results
 export CONFIG_PATH=$WORKSPACE/ubuntu-system-tests.conf
+export FILTER_TEST_LAUNCH_APPS_ONCE=filter:169737
+export FILTER_TEST_LAUNCH_APPS_TWICE=filter:169738
 export https_proxy=https://squid.internal:3128/
 
 rm -rf $OUTPUTDIR
@@ -23,9 +25,9 @@
 # Run tests on the image.
 # For qemu this will use a temporary overlay image by default,
 # so we can use the shared image directly as base.
-python3 -m ubuntu_system_tests.run run --headless --silent --config $CONFIG_PATH --img $SHARED_IMG_PATH ubuntu_system_tests.tests.test_launch_apps.LaunchAppOnceTestCase
+python3 -m ubuntu_system_tests.run run --headless --silent --config $CONFIG_PATH --img $SHARED_IMG_PATH --filters $FILTER_TEST_LAUNCH_APPS_ONCE
 
 # Run next set of tests, appending results to previous results
-python3 -m ubuntu_system_tests.run run --headless --silent --config $CONFIG_PATH --img $SHARED_IMG_PATH --append-results ubuntu_system_tests.tests.test_launch_apps.LaunchAppTwiceTestCase
+python3 -m ubuntu_system_tests.run run --headless --silent --config $CONFIG_PATH --img $SHARED_IMG_PATH --append-results --filters $FILTER_TEST_LAUNCH_APPS_TWICE
 
 deactivate # our virtualenv