providers:checkbox: sed -e 's/CHECKBOX_DATA/PLAINBOX_SESSION_SHARE/g' -i *.txt.in

The CHECKBOX_DATA environment variable is the old spelling of PLAINBOX_SESSION_SHARE. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com> 

13 files changed, 115 insertions, 115 deletions

diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index da7830f..5ed60e1 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -16,7 +16,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that internal speakers work correctly
@@ -36,7 +36,7 @@ requires:
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
 command:
- audio_settings store --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+ audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 HDMI audio interface verification
@@ -55,7 +55,7 @@ requires:
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
 command:
- audio_settings store --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+ audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --verbose --device=hdmi --volume=50; gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 DisplayPort audio interface verification
@@ -74,7 +74,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that headphones connector works correctly
@@ -93,7 +93,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that recording sound using the onboard microphone works correctly
@@ -113,7 +113,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that recording sound using an external microphone works correctly
@@ -132,7 +132,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=usb --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=usb --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that a USB audio device works correctly
@@ -162,7 +162,7 @@ _description:
 plugin: shell
 id: audio/alsa_info_collect
 estimated_duration: 2.0
-command: alsa_info --no-dialog --no-upload --output ${CHECKBOX_DATA}/alsa_info.log
+command: alsa_info --no-dialog --no-upload --output ${PLAINBOX_SESSION_SHARE}/alsa_info.log
 _description:
 Collect audio-related system information. This data can be used to
 simulate this computer's audio subsystem and perform more detailed tests
@@ -172,7 +172,7 @@ plugin: attachment
 id: audio/alsa_info_attachment
 depends: audio/alsa_info_collect
 estimated_duration: 1.0
-command: [ -e ${CHECKBOX_DATA}/alsa_info.log ] && cat ${CHECKBOX_DATA}/alsa_info.log
+command: [ -e ${PLAINBOX_SESSION_SHARE}/alsa_info.log ] && cat ${PLAINBOX_SESSION_SHARE}/alsa_info.log
 _description:
 Attaches the audio hardware data collection log to the results.
 
@@ -225,7 +225,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 Check that external line in connection works correctly
@@ -286,7 +286,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 Check that balance control works correctly on internal speakers
@@ -307,7 +307,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 10 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 Check that balance control works correctly on external headphone
@@ -338,7 +338,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
 package.name == 'pulseaudio-utils'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that internal speakers work correctly after suspending 30 times.
@@ -391,4 +391,4 @@ requires:
 package.name == 'alsa-base'
 _description: Record mixer settings after suspending 30 times.
 command:
- audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend_30_cycles; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend_30_cycles
+ audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_after_suspend_30_cycles; diff $PLAINBOX_SESSION_SHARE/audio_settings_before_suspend $PLAINBOX_SESSION_SHARE/audio_settings_after_suspend_30_cycles
diff --git a/jobs/bluetooth.txt.in b/jobs/bluetooth.txt.in
index 1aec4f3..9099e4d 100644
--- a/jobs/bluetooth.txt.in
+++ b/jobs/bluetooth.txt.in
@@ -14,7 +14,7 @@ command:
 rfkill unblock bluetooth
 sleep 3
 fi
- output=$(hcitool dev | tail -n+2 | awk '{print $2}' | tee $CHECKBOX_DATA/bluetooth_address)
+ output=$(hcitool dev | tail -n+2 | awk '{print $2}' | tee $PLAINBOX_SESSION_SHARE/bluetooth_address)
 echo "$output"
 if [ -z "$output" ]; then
 "BT hardware not available"
@@ -61,7 +61,7 @@ plugin: user-interact-verify
 id: bluetooth/audio-a2dp
 depends: bluetooth/detect-output
 estimated_duration: 120.0
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will check that you can record and hear audio using a bluetooth audio device
diff --git a/jobs/cpu.txt.in b/jobs/cpu.txt.in
index f2d6c90..a88f0c4 100644
--- a/jobs/cpu.txt.in
+++ b/jobs/cpu.txt.in
@@ -3,15 +3,15 @@ id: cpu/scaling_test
 requires:
 package.name == 'fwts'
 user: root
-environ: CHECKBOX_DATA
-command: fwts_test -t cpufreq -l ${CHECKBOX_DATA}/scaling_test.log
+environ: PLAINBOX_SESSION_SHARE
+command: fwts_test -t cpufreq -l ${PLAINBOX_SESSION_SHARE}/scaling_test.log
 _description:
 Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).
 
 plugin: attachment
 id: cpu/scaling_test-log-attach
 depends: cpu/scaling_test
-command: [[ -e ${CHECKBOX_DATA}/scaling_test.log ]] && cat ${CHECKBOX_DATA}/scaling_test.log
+command: [[ -e ${PLAINBOX_SESSION_SHARE}/scaling_test.log ]] && cat ${PLAINBOX_SESSION_SHARE}/scaling_test.log
 _description:
 Attaches the log generated by cpu/scaling_test to the results
 
diff --git a/jobs/firmware.txt.in b/jobs/firmware.txt.in
index a040d2f..df2383c 100644
--- a/jobs/firmware.txt.in
+++ b/jobs/firmware.txt.in
@@ -9,7 +9,7 @@ command:
 id: firmware/fwts_$1
 requires: package.name == 'fwts'
 user: root
- command: fwts_test -t $1 -l $CHECKBOX_DATA/fwts_$1.log
+ command: fwts_test -t $1 -l $PLAINBOX_SESSION_SHARE/fwts_$1.log
 _description: Run $1 test from Firmware Test Suite.
 EOF
 
@@ -24,6 +24,6 @@ command:
 id: firmware/fwts_$1.log
 requires: package.name == 'fwts'
 user: root
- command: [[ -e ${CHECKBOX_DATA}/fwts_$1.log ]] && cat ${CHECKBOX_DATA}/fwts_$1.log
+ command: [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_$1.log ]] && cat ${PLAINBOX_SESSION_SHARE}/fwts_$1.log
 _description: Attach log for FWTS $1 test.
 EOF
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index bb5d24d..b98f437 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -147,7 +147,7 @@ plugin: user-verify
 id: graphics/cycle_resolution
 requires: package.name == 'xorg'
 depends: graphics/VESA_drivers_not_in_use
-command: xrandr_cycle --screenshot-dir $CHECKBOX_DATA
+command: xrandr_cycle --screenshot-dir $PLAINBOX_SESSION_SHARE
 estimated_duration: 250.000
 _description:
 PURPOSE:
@@ -230,7 +230,7 @@ _description: Move a 3D window around the screen
 plugin: shell
 id: graphics/screenshot
 requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot.jpg -q 2>&1 | ansi_parser
 _description:
 PURPOSE:
 Take a screengrab of the current screen (logged on Unity desktop)
@@ -242,7 +242,7 @@ _description:
 plugin: attachment
 id: screenshot.jpg
 depends: graphics/screenshot
-command: base64 ${CHECKBOX_DATA}/screenshot.jpg
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell
@@ -253,7 +253,7 @@ command:
 dbus-launch gsettings set org.gnome.totem repeat true
 totem --fullscreen ${CHECKBOX_SHARE}/data/video/Ogg_Theora_Video.ogv 2>/dev/null &
 set -o pipefail
- sleep 15 && camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
+ sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
 sleep 5 && totem --quit 2>/dev/null
 dbus-launch gsettings set org.gnome.totem repeat false
 _description:
@@ -268,7 +268,7 @@ _description:
 plugin: attachment
 id: screenshot_fullscreen_video.jpg
 depends: graphics/screenshot_fullscreen_video
-command: base64 ${CHECKBOX_DATA}/screenshot_fullscreen_video.jpg
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.
 
 plugin: shell
@@ -279,7 +279,7 @@ command:
 screenshot_validation \
 ${CHECKBOX_SHARE}/data/images/logo_Ubuntu_stacked_black.png \
 --device=${EXTERNAL_WEBCAM_DEVICE:-/dev/external_webcam} \
- -o ${CHECKBOX_DATA}/screenshot_opencv_validation.jpg
+ -o ${PLAINBOX_SESSION_SHARE}/screenshot_opencv_validation.jpg
 _description:
 Take a screengrab of the screen displaying a black and white Ubuntu logo.
 Check that the screenshot matches the original file using OpenCV ORB detection.
@@ -287,5 +287,5 @@ _description:
 plugin: attachment
 id: screenshot_opencv_validation.jpg
 depends: graphics/screenshot_opencv_validation
-command: base64 ${CHECKBOX_DATA}/screenshot_opencv_validation.jpg
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_opencv_validation.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_opencv_validation.
diff --git a/jobs/hibernate.txt.in b/jobs/hibernate.txt.in
index 566068c..14a60d7 100644
--- a/jobs/hibernate.txt.in
+++ b/jobs/hibernate.txt.in
@@ -3,12 +3,12 @@ id: power-management/hibernate_advanced
 requires:
 sleep.disk == 'supported'
 rtc.state == 'supported'
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 user: root
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- fwts_test -l $CHECKBOX_DATA/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
+ fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
 else
 echo "Calling sleep_test"
 sleep_test -s disk -w 120
@@ -27,12 +27,12 @@ _description:
 
 plugin: shell
 id: power-management/hibernate-single-log-check
-command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate-single.log
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && sleep_test_log_check -v s4 $PLAINBOX_SESSION_SHARE/hibernate-single.log
 _description:
 Automated check of the hibernate log for errors discovered by fwts
 
 plugin: attachment
 id: power-management/hibernate-single-log-attach
-command: [ -e $CHECKBOX_DATA/hibernate-single.log ] && cat $CHECKBOX_DATA/hibernate-single.log
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate-single.log
 estimated_duration: 0.5
 description: attaches log from single hibernate/resume test to results
diff --git a/jobs/keys.txt.in b/jobs/keys.txt.in
index 9a50bdb..13c6a9b 100644
--- a/jobs/keys.txt.in
+++ b/jobs/keys.txt.in
@@ -183,7 +183,7 @@ requires:
 package.name == 'alsa-base'
 package.name == 'pulseaudio-utils'
 package.name == 'gstreamer1.0-plugins-good' or package.name == 'gstreamer0.10-plugins-good'
-command: audio_settings store --file=$CHECKBOX_DATA/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$CHECKBOX_DATA/pulseaudio_settings; exit $EXIT_CODE
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; alsa_record_playback; EXIT_CODE=$?; audio_settings restore --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings; exit $EXIT_CODE
 _description:
 PURPOSE:
 This test will test the mute key for your microphone
diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in
index c9f0047..033796f 100644
--- a/jobs/miscellanea.txt.in
+++ b/jobs/miscellanea.txt.in
@@ -52,14 +52,14 @@ requires:
 user: root
 _description:
 Run Firmware Test Suite (fwts) automated tests.
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 command:
- fwts_test -l $CHECKBOX_DATA/fwts_results.log
+ fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_results.log
 
 plugin: attachment
 id: miscellanea/fwts_results.log
 command:
- [[ -e ${CHECKBOX_DATA}/fwts_results.log ]] && cat ${CHECKBOX_DATA}/fwts_results.log
+ [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && cat ${PLAINBOX_SESSION_SHARE}/fwts_results.log
 _description: Attaches the FWTS results log to the submission
 
 plugin: shell
diff --git a/jobs/piglit.txt.in b/jobs/piglit.txt.in
index b81d984..4508122 100644
--- a/jobs/piglit.txt.in
+++ b/jobs/piglit.txt.in
@@ -65,7 +65,7 @@ plugin: shell
 id: piglit/summarize_results
 requires:
 package.name == 'piglit'
-command: [ -e $CHECKBOX_DATA/piglit-results ] && piglit-summary-html.py $CHECKBOX_DATA/piglit-summary/ `find $CHECKBOX_DATA/piglit-results/ -name main` && echo "Successfully summarized piglit results. They are available in $CHECKBOX_DATA/piglit-sumary/"
+command: [ -e $PLAINBOX_SESSION_SHARE/piglit-results ] && piglit-summary-html.py $PLAINBOX_SESSION_SHARE/piglit-summary/ `find $PLAINBOX_SESSION_SHARE/piglit-results/ -name main` && echo "Successfully summarized piglit results. They are available in $PLAINBOX_SESSION_SHARE/piglit-sumary/"
 estimated_duration: 1.380
 _description:
 Runs the piglit results summarizing tool
@@ -75,6 +75,6 @@ id: piglit/tarball
 requires:
 package.name == 'piglit'
 depends: piglit/summarize_results
-command: [ -e $CHECKBOX_DATA/piglit-summary ] && tar cvfz $CHECKBOX_DATA/piglit-results.tar.gz $CHECKBOX_DATA/piglit-summary/
+command: [ -e $PLAINBOX_SESSION_SHARE/piglit-summary ] && tar cvfz $PLAINBOX_SESSION_SHARE/piglit-results.tar.gz $PLAINBOX_SESSION_SHARE/piglit-summary/
 _description:
 Archives the piglit-summary directory into the piglit-results.tar.gz.
diff --git a/jobs/power-management.txt.in b/jobs/power-management.txt.in
index ae664ae..7639907 100644
--- a/jobs/power-management.txt.in
+++ b/jobs/power-management.txt.in
@@ -12,12 +12,12 @@ _description:
 
 plugin: shell
 id: power-management/fwts_wakealarm
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 user: root
 _description: Test ACPI Wakealarm (fwts wakealarm)
 requires:
 package.name == 'fwts'
-command: fwts_test -f aborted -t wakealarm -l $CHECKBOX_DATA/fwts-wakealarm.log
+command: fwts_test -f aborted -t wakealarm -l $PLAINBOX_SESSION_SHARE/fwts-wakealarm.log
 
 plugin: attachment
 id: power-management/fwts_wakealarm-log-attach
@@ -25,17 +25,17 @@ depends: power-management/fwts_wakealarm
 _description: Attach log from fwts wakealarm test
 requires:
 package.name == 'fwts'
-command: [ -e ${CHECKBOX_DATA}/fwts-wakealarm.log ] && cat ${CHECKBOX_DATA}/fwts-wakealarm.log
+command: [ -e ${PLAINBOX_SESSION_SHARE}/fwts-wakealarm.log ] && cat ${PLAINBOX_SESSION_SHARE}/fwts-wakealarm.log
 
 plugin: user-interact-verify
 id: power-management/poweroff
 depends: power-management/fwts_wakealarm
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
-command: pm_test poweroff --log-level=debug --log-dir=$CHECKBOX_DATA
+command: pm_test poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
 _description:
 PURPOSE:
 This test will check the system's ability to power-off and boot.
@@ -51,18 +51,18 @@ _description:
 
 plugin: attachment
 id: power-management/poweroff-log-attach
-command: tar cvfz power-management_poweroff.tgz $CHECKBOX_DATA/*poweroff.1.log && cat $CHECKBOX_DATA/power-management_poweroff.tgz
+command: tar cvfz power-management_poweroff.tgz $PLAINBOX_SESSION_SHARE/*poweroff.1.log && cat $PLAINBOX_SESSION_SHARE/power-management_poweroff.tgz
 _description:
 This will attach any logs from the power-management/poweroff test to the results.
 
 plugin: user-interact-verify
 id: power-management/reboot
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
-command: pm_test reboot --log-level=debug --log-dir=$CHECKBOX_DATA
+command: pm_test reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
 _description:
 PURPOSE:
 This test will check the system's ability to reboot cleanly.
@@ -76,7 +76,7 @@ _description:
 
 plugin: attachment
 id: power-management/reboot-log-attach
-command: tar cvfz power-management_reboot.tgz $CHECKBOX_DATA/*reboot.1.log && cat $CHECKBOX_DATA/power-management_reboot.tgz
+command: tar cvfz power-management_reboot.tgz $PLAINBOX_SESSION_SHARE/*reboot.1.log && cat $PLAINBOX_SESSION_SHARE/power-management_reboot.tgz
 _description:
 This will attach any logs from the power-management/reboot test to the results.
 
diff --git a/jobs/rendercheck.txt.in b/jobs/rendercheck.txt.in
index b0117dc..54dd32e 100644
--- a/jobs/rendercheck.txt.in
+++ b/jobs/rendercheck.txt.in
@@ -2,12 +2,12 @@ plugin: shell
 id: rendercheck/tests
 requires:
 package.name == 'x11-apps'
-command: ( rendercheck_test -b repeat -b gradients -d -o $CHECKBOX_DATA/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $CHECKBOX_DATA/rendercheck-results for details" >&2 && false )
+command: ( rendercheck_test -b repeat -b gradients -d -o $PLAINBOX_SESSION_SHARE/rendercheck-results && echo "Rendercheck tests completed successfully" ) || ( echo "Error running rendercheck. Please see the log $PLAINBOX_SESSION_SHARE/rendercheck-results for details" >&2 && false )
 _description:
 Runs all of the rendercheck test suites. This test can take a few minutes.
 
 plugin: attachment
 id: rendercheck/tarball
 depends: rendercheck/tests
-command: [ -e $CHECKBOX_DATA/rendercheck-results ] && tar cvfz $CHECKBOX_DATA/rendercheck-results.tar.gz $CHECKBOX_DATA/rendercheck-results && cat $CHECKBOX_DATA/rendercheck-results.tar.gz
+command: [ -e $PLAINBOX_SESSION_SHARE/rendercheck-results ] && tar cvfz $PLAINBOX_SESSION_SHARE/rendercheck-results.tar.gz $PLAINBOX_SESSION_SHARE/rendercheck-results && cat $PLAINBOX_SESSION_SHARE/rendercheck-results.tar.gz
 _description: Attach log from rendercheck tests
diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in
index 0589a8e..5e47714 100644
--- a/jobs/stress.txt.in
+++ b/jobs/stress.txt.in
@@ -15,15 +15,15 @@ depends:
 requires:
 sleep.disk == 'supported'
 rtc.state == 'supported'
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 user: root
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- fwts_test -l $CHECKBOX_DATA/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
+ fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate_30_cycles -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=30
 else
 echo "Calling sleep_test"
- set -o pipefail; sleep_test -s disk -i 30 -w 120 | tee $CHECKBOX_DATA/hibernate_30_cycles.log
+ set -o pipefail; sleep_test -s disk -i 30 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
 fi
 _description:
 PURPOSE:
@@ -31,13 +31,13 @@ _description:
 
 plugin: shell
 id: power-management/hibernate-30-cycles-log-check
-command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $CHECKBOX_DATA/hibernate_30_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && sleep_test_log_check -v s4 $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
 _description:
 Automated check of the 30 cycle hibernate log for errors detected by fwts.
 
 plugin: attachment
 id: power-management/hibernate-30-cycle-log-attach
-command: [ -e $CHECKBOX_DATA/hibernate_30_cycles.log ] && cat $CHECKBOX_DATA/hibernate_30_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate_30_cycles.log
 _description:
 Attaches the log from the 30 cycle Hibernate/Resume test if it exists
 
@@ -46,15 +46,15 @@ id: power-management/suspend_30_cycles
 depends:
 power-management/rtc
 suspend/suspend_advanced
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 user: root
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $CHECKBOX_DATA/suspend_30_cycles_times.log
+ set -o pipefail; fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
 else
 echo "Calling sleep_test"
- set -o pipefail; sleep_test -p -s mem -i 30 | tee $CHECKBOX_DATA/suspend_30_cycles.log
+ set -o pipefail; sleep_test -p -s mem -i 30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 fi
 _description:
 PURPOSE:
@@ -63,36 +63,36 @@ _description:
 plugin: shell
 id: power-management/suspend-30-cycles-log-check
 depends: power-management/suspend_30_cycles
-command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_30_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 _description:
 Automated check of the 30 cycle hibernate log for errors detected by fwts.
 
 plugin: attachment
 id: power-management/suspend-30-cycle-log-attach
 depends: power-management/suspend_30_cycles
-command: [ -e $CHECKBOX_DATA/suspend_30_cycles.log ] && cat $CHECKBOX_DATA/suspend_30_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 _description:
 Attaches the log from the 30 cycle Suspend/Resume test if it exists
 
 plugin: shell
 id: power-management/suspend-30-cycles-time-check
 depends: power-management/suspend_30_cycles
-command: [ -e $CHECKBOX_DATA/suspend_30_cycles_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_30_cycles_times.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
 plugin: shell
 id: stress/hibernate_250_cycles
 depends: power-management/rtc
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 user: root
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- fwts_test -l $CHECKBOX_DATA/hibernate_250_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250
+ fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate_250_cycles -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120 --s4-multiple=250
 else
 echo "Calling sleep_test"
- set -o pipefail; sleep_test -s disk -i 250 -w 120 | tee $CHECKBOX_DATA/hibernate_250_cycles.log
+ set -o pipefail; sleep_test -s disk -i 250 -w 120 | tee $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log
 fi
 _description:
 PURPOSE:
@@ -100,22 +100,22 @@ _description:
 
 plugin: attachment
 id: stress/hibernate-250-cycle-log-attach
-command: [ -e $CHECKBOX_DATA/hibernate_250_cycles.log ] && cat $CHECKBOX_DATA/hibernate_250_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate_250_cycles.log
 _description:
 Attaches the log from the 250 cycle Hibernate/Resume test if it exists
 
 plugin: shell
 id: stress/suspend_250_cycles
 depends: power-management/rtc
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 user: root
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- set -o pipefail; fwts_test -l $CHECKBOX_DATA/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee $CHECKBOX_DATA/suspend_250_cycles_times.log
+ set -o pipefail; fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_250_cycles -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=250 | tee $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
 else
 echo "Calling sleep_test"
- set -o pipefail; sleep_test -p -s mem -i 250 | tee $CHECKBOX_DATA/suspend_250_cycles.log
+ set -o pipefail; sleep_test -p -s mem -i 250 | tee $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log
 fi
 _description:
 PURPOSE:
@@ -123,13 +123,13 @@ _description:
 
 plugin: attachment
 id: stress/suspend-250-cycle-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_250_cycles.log ] && cat $CHECKBOX_DATA/suspend_250_cycles.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_250_cycles.log
 _description:
 Attaches the log from the 250 cycle Suspend/Resume test if it exists
 
 plugin: shell
 id: stress/suspend-250-cycles-time-check
-command: [ -e $CHECKBOX_DATA/suspend_250_cycles_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_250_cycles_times.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_250_cycles_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
@@ -138,64 +138,64 @@ id: stress/reboot
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
-command: pm_test -r 100 --silent --log-level=notset reboot --log-dir=$CHECKBOX_DATA
+command: pm_test -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 _description:
 Stress reboot system (100 cycles)
 
 plugin: attachment
 id: stress/reboot_log
 depends: stress/reboot
-command: tar cvfz $CHECKBOX_DATA/stress_reboot.tgz $CHECKBOX_DATA/*reboot.100.log && cat $CHECKBOX_DATA/stress_reboot.tgz
+command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_reboot.tgz $PLAINBOX_SESSION_SHARE/*reboot.100.log && cat $PLAINBOX_SESSION_SHARE/stress_reboot.tgz
 
 plugin: shell
 id: stress/poweroff
 requires:
 package.name == 'upstart'
 package.name == 'fwts'
-command: pm_test -r 100 --silent --log-level=notset poweroff --log-dir=$CHECKBOX_DATA
+command: pm_test -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 _description:
 Stress poweroff system (100 cycles)
 
 plugin: attachment
 id: stress/poweroff_log
 depends: stress/poweroff
-command: tar cvfz $CHECKBOX_DATA/stress_poweroff.tgz $CHECKBOX_DATA/*poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff.tgz
+command: tar cvfz $PLAINBOX_SESSION_SHARE/stress_poweroff.tgz $PLAINBOX_SESSION_SHARE/*poweroff.100.log && cat $PLAINBOX_SESSION_SHARE/stress_poweroff.tgz
 
 plugin: shell
 id: stress/reboot_check
 depends: stress/reboot
-command: pm_log_check --log-level=notset $CHECKBOX_DATA/pm_test.reboot.100.log $CHECKBOX_DATA/pm_log_check_reboot.100.log
+command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.reboot.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log
 _description: Check logs for the stress reboot (100 cycles) test case
 
 plugin: attachment
 id: stress/reboot_check_log
 depends: stress/reboot_check
 command:
- tar cvfz $CHECKBOX_DATA/stress_reboot_check.tgz $CHECKBOX_DATA/pm_log_check_reboot.100.log && cat $CHECKBOX_DATA/stress_reboot_check.tgz
+ tar cvfz $PLAINBOX_SESSION_SHARE/stress_reboot_check.tgz $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log && cat $PLAINBOX_SESSION_SHARE/stress_reboot_check.tgz
 
 plugin: shell
 id: stress/poweroff_check
 depends: stress/poweroff
-command: pm_log_check --log-level=notset $CHECKBOX_DATA/pm_test.poweroff.100.log $CHECKBOX_DATA/pm_log_check_poweroff.100.log
+command: pm_log_check --log-level=notset $PLAINBOX_SESSION_SHARE/pm_test.poweroff.100.log $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log
 _description: Check logs for the stress poweroff (100 cycles) test case
 
 plugin: attachment
 id: stress/poweroff_check_log
 depends: stress/poweroff_check
 command:
- tar cvfz $CHECKBOX_DATA/stress_poweroff_check.tgz $CHECKBOX_DATA/pm_log_check_poweroff.100.log && cat $CHECKBOX_DATA/stress_poweroff_check.tgz
+ tar cvfz $PLAINBOX_SESSION_SHARE/stress_poweroff_check.tgz $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log && cat $PLAINBOX_SESSION_SHARE/stress_poweroff_check.tgz
 
 plugin: shell
 id: stress/graphics
 requires:
 package.name == 'x11-apps'
 user: root
-environ: CHECKBOX_DATA
-command: graphics_stress_test -b repeat -d -o $CHECKBOX_DATA/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $CHECKBOX_DATA/graphics-stress-results for details" && false
+environ: PLAINBOX_SESSION_SHARE
+command: graphics_stress_test -b repeat -d -o $PLAINBOX_SESSION_SHARE/graphics-stress-results && echo "Graphics Stress Test completed successfully" || echo "Graphics Stress Test completed, but there are errors. Please see the log $PLAINBOX_SESSION_SHARE/graphics-stress-results for details" && false
 _description:
 Run the graphics stress test. This test can take a few minutes.
 
@@ -204,7 +204,7 @@ id: stress/graphics-tarball
 requires:
 package.name == 'x11-apps'
 depends: stress/graphics
-command: [ -e $CHECKBOX_DATA/graphics-stress-results ] && tar cvfz $CHECKBOX_DATA/graphics-stress-results.tar.gz $CHECKBOX_DATA/graphics-stress-results
+command: [ -e $PLAINBOX_SESSION_SHARE/graphics-stress-results ] && tar cvfz $PLAINBOX_SESSION_SHARE/graphics-stress-results.tar.gz $PLAINBOX_SESSION_SHARE/graphics-stress-results
 _description: Attaches the graphics stress results to the submission.
 
 plugin: shell
@@ -235,14 +235,14 @@ _description:
 plugin: shell
 id: stress/network_restart
 user: root
-environ: CHECKBOX_DATA
-command: network_restart -t 1 -o $CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
+command: network_restart -t 1 -o $PLAINBOX_SESSION_SHARE
 _description: Ping ubuntu.com and restart network interfaces 100 times
 
 plugin: attachment
 id: stress/network_restart_log
 depends: stress/network_restart
-command: file=$CHECKBOX_DATA/network_restart.log; if [ -e "$file" ]; then iconv -t 'ascii' -c "$file"; fi
+command: file=$PLAINBOX_SESSION_SHARE/network_restart.log; if [ -e "$file" ]; then iconv -t 'ascii' -c "$file"; fi
 
 plugin: manual
 id: stress/wireless_hotkey
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 5c0b2b2..ec75bd5 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -3,13 +3,13 @@ id: suspend/network_before_suspend
 depends: ethernet/detect
 estimated_duration: 1.2
 _description: Record the current network before suspending.
-command: set -o pipefail; gateway_ping_test | tee $CHECKBOX_DATA/network_before_suspend.txt
+command: set -o pipefail; gateway_ping_test | tee $PLAINBOX_SESSION_SHARE/network_before_suspend.txt
 
 plugin: shell
 id: suspend/resolution_before_suspend
 estimated_duration: 1.2
 _description: Record the current resolution before suspending.
-command: xrandr -q |grep '*'| awk '{print $1}' > $CHECKBOX_DATA/resolution_before_suspend.txt
+command: xrandr -q |grep '*'| awk '{print $1}' > $PLAINBOX_SESSION_SHARE/resolution_before_suspend.txt
 
 plugin: shell
 id: suspend/audio_before_suspend
@@ -18,26 +18,26 @@ requires:
 device.category == 'AUDIO'
 package.name == 'alsa-base'
 _description: Record mixer settings before suspending.
-command: audio_settings store --file=$CHECKBOX_DATA/audio_settings_before_suspend
+command: audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_before_suspend
 
 plugin: shell
 id: suspend/cpu_before_suspend
 estimated_duration: 1.2
 _description: Verify that all the CPUs are online before suspending
-command: cpuinfo_resource > $CHECKBOX_DATA/cpuinfo_before_suspend
+command: cpuinfo_resource > $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend
 
 plugin: shell
 id: suspend/memory_before_suspend
 estimated_duration: 1.2
 _description:
 Dumps memory info to a file for comparison after suspend test has been run
-command: meminfo_resource > $CHECKBOX_DATA/meminfo_before_suspend
+command: meminfo_resource > $PLAINBOX_SESSION_SHARE/meminfo_before_suspend
 
 plugin: shell
 id: suspend/wireless_before_suspend
 depends: wireless/wireless_connection
 requires: device.category == 'WIRELESS'
-command: nmcli -t -f UUID con status > $CHECKBOX_DATA/connections && connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
+command: nmcli -t -f UUID con status > $PLAINBOX_SESSION_SHARE/connections && connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
 estimated_duration: 20.0
 _description:
 This test disconnects all connections and then connects to the wireless
@@ -213,14 +213,14 @@ requires:
 sleep.mem == 'supported'
 rtc.state == 'supported'
 user: root
-environ: CHECKBOX_DATA
+environ: PLAINBOX_SESSION_SHARE
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- set -o pipefail; fwts_test -f none -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
+ set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 else
 echo "Calling sleep_test"
- set -o pipefail; sleep_test -p | tee $CHECKBOX_DATA/suspend_single_times.log
+ set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 fi
 estimated_duration: 90.0
 _description:
@@ -243,27 +243,27 @@ requires:
 _description:
 This is the automated version of suspend/suspend_advanced.
 user: root
-environ: CHECKBOX_DATA
-command: set -o pipefail; fwts_test -f none -l $CHECKBOX_DATA/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $CHECKBOX_DATA/suspend_single_times.log
+environ: PLAINBOX_SESSION_SHARE
+command: set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 estimated_duration: 90.000
 
 plugin: shell
 id: suspend/suspend-single-log-check
 estimated_duration: 1.2
-command: [ -e $CHECKBOX_DATA/suspend_single.log ] && sleep_test_log_check -v s3 $CHECKBOX_DATA/suspend_single.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/suspend_single.log
 _description:
 Automated check of the suspend log to look for errors reported by fwts
 
 plugin: attachment
 id: suspend/suspend-single-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_single.log ] && cat $CHECKBOX_DATA/suspend_single.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
 plugin: shell
 id: suspend/suspend-time-check
 estimated_duration: 1.2
-command: [ -e $CHECKBOX_DATA/suspend_single_times.log ] && sleep_time_check $CHECKBOX_DATA/suspend_single_times.log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/suspend_single_times.log
 _description:
 Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
@@ -304,14 +304,14 @@ id: suspend/network_after_suspend
 estimated_duration: 20.0
 depends: suspend/suspend_advanced suspend/network_before_suspend
 _description: Test the network after resuming.
-command: network_wait; gateway_ping_test | diff $CHECKBOX_DATA/network_before_suspend.txt -
+command: network_wait; gateway_ping_test | diff $PLAINBOX_SESSION_SHARE/network_before_suspend.txt -
 
 plugin: shell
 id: suspend/resolution_after_suspend
 depends: suspend/suspend_advanced suspend/resolution_before_suspend
 estimated_duration: 1.2
 _description: Test to see that we have the same resolution after resuming as before.
-command: xrandr -q |grep '*'| awk '{print $1}' | diff $CHECKBOX_DATA/resolution_before_suspend.txt -
+command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/resolution_before_suspend.txt -
 
 plugin: shell
 id: suspend/audio_after_suspend
@@ -322,7 +322,7 @@ requires:
 depends: suspend/suspend_advanced suspend/audio_before_suspend
 _description: Verify that mixer settings after suspend are the same as before suspend.
 command:
- audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
+ audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_after_suspend; diff $PLAINBOX_SESSION_SHARE/audio_settings_before_suspend $PLAINBOX_SESSION_SHARE/audio_settings_after_suspend
 
 plugin: shell
 id: suspend/audio_after_suspend_auto
@@ -333,21 +333,21 @@ requires:
 depends: suspend/suspend_advanced_auto suspend/audio_before_suspend
 _description: Verify that mixer settings after suspend are the same as before suspend.
 command:
- audio_settings store --file=$CHECKBOX_DATA/audio_settings_after_suspend; diff $CHECKBOX_DATA/audio_settings_before_suspend $CHECKBOX_DATA/audio_settings_after_suspend
+ audio_settings store --file=$PLAINBOX_SESSION_SHARE/audio_settings_after_suspend; diff $PLAINBOX_SESSION_SHARE/audio_settings_before_suspend $PLAINBOX_SESSION_SHARE/audio_settings_after_suspend
 
 plugin: shell
 id: suspend/cpu_after_suspend
 estimated_duration: 1.2
 depends: suspend/suspend_advanced suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
-command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
+command: cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -
 
 plugin: shell
 id: suspend/cpu_after_suspend_auto
 estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend
 _description: Verify that all CPUs are online after resuming.
-command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend -
+command: cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -
 
 plugin: shell
 id: suspend/memory_after_suspend
@@ -355,7 +355,7 @@ estimated_duration: 1.2
 depends: suspend/suspend_advanced suspend/memory_before_suspend
 _description:
 Verify that all memory is available after resuming from suspend.
-command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
+command: meminfo_resource | diff $PLAINBOX_SESSION_SHARE/meminfo_before_suspend -
 
 plugin: shell
 id: suspend/memory_after_suspend_auto
@@ -363,7 +363,7 @@ estimated_duration: 1.2
 depends: suspend/suspend_advanced_auto suspend/memory_before_suspend
 _description:
 Verify that all memory is available after resuming from suspend.
-command: meminfo_resource | diff $CHECKBOX_DATA/meminfo_before_suspend -
+command: meminfo_resource | diff $PLAINBOX_SESSION_SHARE/meminfo_before_suspend -
 
 plugin: manual
 id: suspend/display_after_suspend
@@ -382,7 +382,7 @@ id: suspend/wireless_after_suspend
 depends: suspend/suspend_advanced suspend/wireless_before_suspend
 requires:
 device.category == 'WIRELESS'
-command: connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
+command: connect_wireless && gateway_ping_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
 estimated_duration: 20.0
 _description:
 This test checks that the wireless interface is working after suspending the system. It
@@ -754,7 +754,7 @@ command:
 sleep 3
 fi
 output=$(hcitool dev | tail -n+2 | awk '{print $2}')
- echo $output | diff $CHECKBOX_DATA/bluetooth_address -
+ echo $output | diff $PLAINBOX_SESSION_SHARE/bluetooth_address -
 if [ -z "$output" ]; then
 echo "BT hardware not available"
 exit 1
@@ -1009,7 +1009,7 @@ id: suspend/cycle_resolutions_after_suspend
 estimated_duration: 120.0
 requires: package.name == 'xorg'
 depends: suspend/suspend_advanced graphics/cycle_resolution
-command: xrandr_cycle --keyword=after_suspend --screenshot-dir $CHECKBOX_DATA
+command: xrandr_cycle --keyword=after_suspend --screenshot-dir $PLAINBOX_SESSION_SHARE
 _description:
 PURPOSE:
 This test will cycle through the detected display modes
@@ -1026,12 +1026,12 @@ depends: suspend/suspend_advanced_auto graphics/cycle_resolution
 _description:
 This test will check to make sure supported video modes work after a suspend and resume.
 This is done automatically by taking screenshots and uploading them as an attachment.
-command: xrandr_cycle --keyword=after_suspend --screenshot-dir $CHECKBOX_DATA
+command: xrandr_cycle --keyword=after_suspend --screenshot-dir $PLAINBOX_SESSION_SHARE
 
 plugin: attachment
 id: suspend/xrandr_screens_after_suspend.tar.gz
 depends: suspend/cycle_resolutions_after_suspend_auto
-command: [ -e $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz ] && cat $CHECKBOX_DATA/xrandr_screens_after_suspend.tgz
+command: [ -e $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend_auto test to the results submission.
 
 plugin: shell
@@ -1068,7 +1068,7 @@ _description:
 
 plugin: attachment
 id: suspend/suspend-auto-single-log-attach
-command: [ -e $CHECKBOX_DATA/suspend_auto_single_log ] && cat $CHECKBOX_DATA/suspend_auto_single_log
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && cat $PLAINBOX_SESSION_SHARE/suspend_auto_single_log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
@@ -1077,7 +1077,7 @@ id: suspend/screenshot_after_suspend
 estimated_duration: 10.0
 depends: suspend/suspend_advanced_auto
 requires: package.name == 'fswebcam'
-command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${CHECKBOX_DATA}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
+command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg -q 2>&1 | ansi_parser
 _description:
 PURPOSE:
 Take a screengrab of the current screen after suspend (logged on Unity desktop)
@@ -1089,7 +1089,7 @@ _description:
 plugin: attachment
 id: screenshot_after_suspend.jpg
 depends: suspend/screenshot_after_suspend
-command: base64 ${CHECKBOX_DATA}/screenshot_after_suspend.jpg
+command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell