diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_after b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_after
index 84852a1..7cea9a5 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_before b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_before
index cf57127..e5c4a85 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_1_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_after b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_after
index d45bd52..e975c0b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_before b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_before
index 6988e06..79e53bf 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualBase_storage_qual_cq_2_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_0
index 68480c6..dff9f6a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_1
index b9d1739..8d31991 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageQualTrimStress_storage_qual_cq_2_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_0
index b36696a..3c28050 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_1
index b00ece4..9757a4c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_suspend b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_suspend
index b239cc4..1ea6e65 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_suspend
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_1_suspend
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_0
index 1acabb6..c1063b9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_1
index be43ba5..50f6bed 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_cq_hardware_StorageStress_storage_qual_cq_2_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_after b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_after
index c06d890..667ae0b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_before b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_before
index 88c6185..5503170 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualBase_storage_qual_external_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_0
index a406e3f..bdd7336 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_1
index 4d653c7..8554ab1 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_external_hardware_StorageQualSuspendStress_storage_qual_external_suspend_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_after b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_after
index bc57db1..d956f8a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_before b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_before
index be812f0..4aef3aa 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_retention_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_after b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_after
index 904955d..412490d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_before b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_before
index b6074f4..cb3df12 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_suspend_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_after b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_after
index ae30995..bcf93c6 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_before b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_before
index 8b747b8..f938b57 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualBase_trim_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualCheckSetup_retention b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualCheckSetup_retention
index 95c05a9..c54cc02 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualCheckSetup_retention
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualCheckSetup_retention
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_0
index a13a172..97633a4 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_1
index c195d97..4165d25 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_10 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_10
index 802130b..5c0a70b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_10
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_10
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_11 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_11
index 93ac27e..7ddd702 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_11
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_11
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_12 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_12
index c4179a1..6b214c9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_12
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_12
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_13 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_13
index 899e96e..e0ff506 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_13
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_13
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_14 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_14
index 97c7e54..aa0ec8d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_14
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_14
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_15 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_15
index ebceb2b..52dfc35 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_15
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_15
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_16 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_16
index 403a515..f01636c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_16
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_16
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_17 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_17
index 5718f5c..876e7d4 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_17
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_17
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_18 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_18
index ee40a2a..6778cfc 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_18
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_18
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_19 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_19
index b133a97..a6193c2 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_19
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_19
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_2 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_2
index 8785b57..d6d18b2 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_2
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_2
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_20 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_20
index fea00db..03e5553 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_20
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_20
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_21 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_21
index db4c646..44e8585 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_21
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_21
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_22 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_22
index 5c6dd14..a019bd3 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_22
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_22
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_23 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_23
index b4bc2c9..2127716 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_23
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_23
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_24 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_24
index 8197864..e9fd04e 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_24
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_24
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_25 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_25
index 4f281e7..e8a9d00 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_25
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_25
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_26 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_26
index 7f4160b..11063bd 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_26
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_26
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_27 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_27
index 633a0f4..2e527df 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_27
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_27
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_28 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_28
index d81b00e..78fae8f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_28
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_28
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_29 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_29
index 3dfd3b0..d10d73c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_29
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_29
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_3 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_3
index 9500e27..fd42421 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_3
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_3
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_30 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_30
index 330ccff..ad87152 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_30
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_30
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_31 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_31
index a73c8a9..b9fd9eb 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_31
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_31
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_32 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_32
index 8d14e8a..636e618 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_32
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_32
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_33 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_33
index f3463d1..20e522d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_33
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_33
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_34 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_34
index c7adbca..713842f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_34
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_34
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_35 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_35
index 8b27dd1..9fc2b80 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_35
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_35
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_36 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_36
index 81d033c..43a52bb 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_36
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_36
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_37 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_37
index 946724b..95f8631 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_37
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_37
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_38 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_38
index 32d6caf..3162f1f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_38
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_38
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_39 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_39
index 68b15ec..38e1fad 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_39
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_39
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_4 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_4
index ddc7558..ad77cf9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_4
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_4
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_40 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_40
index b0bb5df..f23364c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_40
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_40
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_41 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_41
index eda2e66..bf6beb3 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_41
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_41
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_5 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_5
index 10c23fd..7f32064 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_5
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_5
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_6 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_6
index 99758f2..a69214b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_6
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_6
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_7 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_7
index cbfee3e..8929dc3 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_7
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_7
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_8 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_8
index 635b4e0..e934e0a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_8
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_8
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_9 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_9
index e9a2234..8e7e43f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_9
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualSuspendStress_suspend_suspend_9
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_0
index cf01ac1..2c72e02 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_1
index b55bd22..fc78a22 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_10 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_10
index 05b515f..5bba181 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_10
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_10
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_11 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_11
index 2a239d9..6897083 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_11
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_11
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_12 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_12
index 93e9a56..3bb00cf 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_12
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_12
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_13 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_13
index f6b52b2..e343c4d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_13
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_13
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_14 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_14
index a65aebf..a7ddc4e 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_14
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_14
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_15 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_15
index 9cd7a74..3c97e4d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_15
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_15
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_16 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_16
index b8c6c59..a6c14a0 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_16
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_16
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_17 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_17
index fd4e499..aa6f9d7 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_17
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_17
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_18 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_18
index ee0b1c3..7f5d488 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_18
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_18
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_19 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_19
index c944a66..7042817 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_19
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_19
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_2 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_2
index c5b8c27..33703cb 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_2
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_2
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_20 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_20
index 97977ee..5e0cc6f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_20
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_20
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_21 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_21
index 8add90a..a0ef5d5 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_21
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_21
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_22 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_22
index 8b63d88..8e4139c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_22
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_22
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_23 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_23
index 8701c97..28b4d9b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_23
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_23
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_24 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_24
index 606f0b4..a429543 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_24
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_24
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_25 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_25
index 3af4f05..5372d55 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_25
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_25
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_26 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_26
index c26b50c..3e7e620 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_26
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_26
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_27 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_27
index 14b94d0..7297585 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_27
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_27
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_28 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_28
index c9ea9d3..c1798f9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_28
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_28
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_29 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_29
index 2909054..bcd0332 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_29
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_29
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_3 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_3
index a9df8a0..141daa3 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_3
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_3
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_30 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_30
index 5aef6fd..e2ec32a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_30
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_30
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_31 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_31
index 9e7fe52..94afd2e 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_31
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_31
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_32 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_32
index af2719c..82f3313 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_32
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_32
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_33 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_33
index 9121852..b2e1d98 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_33
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_33
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_34 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_34
index abe6768..afca175 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_34
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_34
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_35 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_35
index 1f45d8e..5afbd34 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_35
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_35
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_36 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_36
index 955c992..33985d9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_36
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_36
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_37 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_37
index 21d8de6..48543fe 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_37
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_37
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_38 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_38
index 30f5c5c..5aef494 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_38
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_38
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_39 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_39
index 0f1f093..eb37b7f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_39
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_39
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_4 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_4
index e66805a..89d2059 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_4
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_4
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_40 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_40
index 7b48ef3..4669b88 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_40
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_40
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_41 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_41
index 954479d..523eeb3 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_41
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_41
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_5 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_5
index 6056f62..de26c55 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_5
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_5
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_6 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_6
index 1db23b7..436adc0 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_6
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_6
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_7 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_7
index b59921d..5e04b08 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_7
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_7
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_8 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_8
index 80e5153..f04b20f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_8
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_8
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_9 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_9
index 45698c6..36e5979 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_9
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageQualTrimStress_trim_9
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_0
index dc3ea93..c2c1781 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_1
index 2f4a8e9..144a8fa 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_10 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_10
index 4988047..141f20e 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_10
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_10
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_11 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_11
index b5070f8..df6b139 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_11
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_11
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_12 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_12
index c7bdf9e..0191221 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_12
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_12
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_13 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_13
index b3d9c19..6179851 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_13
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_13
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_14 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_14
index d4cd101..26be71f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_14
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_14
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_15 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_15
index ab479d9..daa5c5d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_15
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_15
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_16 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_16
index a6ca578..403ff25 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_16
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_16
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_17 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_17
index b24b7f8..fac9fc4 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_17
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_17
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_18 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_18
index fb9ba9c..f0a31c3 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_18
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_18
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_19 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_19
index 34e17cc..ed8432e 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_19
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_19
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_2 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_2
index f8e8213..58eca4b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_2
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_2
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_20 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_20
index be958b8..3a09d95 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_20
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_20
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_21 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_21
index 05e4894..6394804 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_21
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_21
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_22 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_22
index 4892a09..3c1cb49 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_22
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_22
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_23 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_23
index fda4c0e..5f8a03a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_23
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_23
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_24 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_24
index 0cbd32f..a9e3b5b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_24
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_24
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_25 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_25
index cb572b0..eb467f5 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_25
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_25
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_26 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_26
index a131ef7..cb6e87d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_26
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_26
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_27 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_27
index 92e7098..e263e78 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_27
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_27
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_28 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_28
index 8f471c0..57abde0 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_28
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_28
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_29 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_29
index b168351..c11fff1 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_29
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_29
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_3 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_3
index dcb467a..528e30b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_3
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_3
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_30 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_30
index b9cfab5..0f5d36f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_30
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_30
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_31 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_31
index 85d9857..e1b4ec1 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_31
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_31
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_32 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_32
index 5dce85d..f0af86c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_32
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_32
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_33 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_33
index 7d37a03..b8fcb10 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_33
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_33
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_34 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_34
index aeac8f6..e87dd49 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_34
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_34
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_35 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_35
index d07d40c..643e6b7 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_35
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_35
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_36 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_36
index 8a8a203..9c0998b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_36
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_36
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_37 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_37
index 8272961..5afd555 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_37
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_37
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_38 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_38
index 0aece59..9d61421 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_38
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_38
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_39 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_39
index 9ccba74..c801015 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_39
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_39
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_4 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_4
index 7357920..dbcf00c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_4
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_4
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_40 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_40
index 6da4ddb..7dffa26 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_40
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_40
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_41 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_41
index fd91a5e..2f6356c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_41
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_41
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_5 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_5
index fabe3df..9e8da8a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_5
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_5
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_6 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_6
index b2750ae..a4a6666 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_6
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_6
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_7 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_7
index b049246..82256cb 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_7
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_7
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_8 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_8
index 83e6e2a..7d845fd 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_8
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_8
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_9 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_9
index 701ce77..3191ee8 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_9
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_soak_9
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_suspend b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_suspend
index a66faee..5dda4f0 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_suspend
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_retention_suspend
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_0
index b09832e..058c677 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_1
index 4a551e3..b0bf0e2 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_10 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_10
index 6037c71..622a775 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_10
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_10
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_11 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_11
index cedce11..cfc28b9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_11
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_11
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_12 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_12
index 1d38ede..d484ffd 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_12
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_12
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_13 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_13
index fbc12e7..4de92d0 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_13
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_13
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_14 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_14
index 6ed2818..b31eef6 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_14
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_14
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_15 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_15
index 984a655..b0484dc 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_15
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_15
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_16 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_16
index f147a78..9ebd4c3 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_16
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_16
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_17 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_17
index bd5352b..b4dbb70 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_17
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_17
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_18 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_18
index 40badf5..2a59a00 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_18
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_18
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_19 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_19
index 697d0b4..1d9dfac 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_19
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_19
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_2 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_2
index 83c9147..8b80347 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_2
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_2
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_20 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_20
index 8dbd8b9..a4f8a34 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_20
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_20
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_21 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_21
index d612237..642e81c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_21
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_21
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_22 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_22
index 48821eb..17ba1a4 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_22
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_22
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_23 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_23
index cd5ebbf..ea6025d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_23
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_23
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_24 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_24
index 4920aa0..386340d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_24
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_24
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_25 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_25
index 64a7f1b..3cd75af 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_25
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_25
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_26 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_26
index 721c561..ecd3f3f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_26
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_26
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_27 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_27
index 15449dd..1db66b9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_27
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_27
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_28 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_28
index 858e4d0..8e1ff0a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_28
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_28
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_29 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_29
index 8a98fc1..adb5660 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_29
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_29
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_3 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_3
index 1040cee..355dbad 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_3
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_3
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_30 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_30
index 171efc3..092ead1 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_30
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_30
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_31 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_31
index 7e85228..6398532 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_31
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_31
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_32 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_32
index d46ea59..f3d3b94 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_32
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_32
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_33 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_33
index 87cec02..f8759c5 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_33
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_33
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_34 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_34
index 0ad3706..8200363 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_34
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_34
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_35 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_35
index 4d265f5..a73fbf8 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_35
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_35
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_36 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_36
index a0b1716..79eecb7 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_36
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_36
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_37 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_37
index afae6a7..360a15d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_37
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_37
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_38 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_38
index 6755b59..d247f7d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_38
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_38
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_39 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_39
index 8c90697..f5552a9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_39
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_39
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_4 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_4
index d60d843..00cd948 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_4
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_4
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_40 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_40
index 33d60fb..4956977 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_40
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_40
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_41 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_41
index fd04e24..33e2505 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_41
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_41
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_5 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_5
index 153d1ce..0da059c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_5
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_5
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_6 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_6
index ef9ca7f..3cd1eb0 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_6
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_6
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_7 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_7
index 1f044a8..1d09cf7 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_7
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_7
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_8 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_8
index 3f05327..9512a2a 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_8
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_8
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_9 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_9
index 9f4c265..fe386f5 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_9
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_suspend_soak_9
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_0
index 2b43f77..b9a6daa 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_1
index 80f4bd2..6e7288d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_10 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_10
index 6cea340..d4846eb 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_10
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_10
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_11 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_11
index f0500df..c79cd9c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_11
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_11
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_12 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_12
index c308104..d2ba5c6 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_12
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_12
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_13 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_13
index 3b9e727..34a4b13 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_13
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_13
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_14 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_14
index 1f188f3..2dc2157 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_14
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_14
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_15 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_15
index 807e927..fb788bf 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_15
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_15
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_16 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_16
index 3e94630..ef491db 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_16
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_16
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_17 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_17
index 4a907c0..19ce998 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_17
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_17
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_18 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_18
index 1796377..aec8c9c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_18
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_18
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_19 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_19
index a65218b..48f7b26 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_19
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_19
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_2 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_2
index 45e387e..eb56e45 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_2
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_2
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_20 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_20
index f81a6c4..5c9ee91 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_20
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_20
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_21 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_21
index 8115fb5..43fe741 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_21
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_21
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_22 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_22
index cad8417..f2fdb97 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_22
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_22
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_23 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_23
index 107885f..3aced73 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_23
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_23
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_24 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_24
index acf0095..5cb3c48 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_24
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_24
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_25 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_25
index 1c20d12..06d5551 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_25
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_25
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_26 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_26
index 022b6d6..1e7bfe2 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_26
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_26
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_27 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_27
index bcac8ba..a8f0ebc 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_27
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_27
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_28 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_28
index 2a2d42b..afbb8cc 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_28
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_28
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_29 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_29
index 117b86b..82af5eb 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_29
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_29
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_3 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_3
index 28dcf6d..0321a14 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_3
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_3
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_30 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_30
index 1d10474..8422d75 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_30
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_30
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_31 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_31
index dbdc8eb..bb1bc21 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_31
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_31
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_32 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_32
index dd775f4..8c01cff 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_32
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_32
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_33 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_33
index 62a71d6..0642c91 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_33
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_33
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_34 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_34
index ca0a514..60873e7 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_34
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_34
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_35 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_35
index 323222e..5caab1b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_35
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_35
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_36 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_36
index 4a1bdc7..5ad51c4 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_36
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_36
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_37 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_37
index 1ba5973..6fc8564 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_37
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_37
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_38 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_38
index 18b0f1c..bf9e059 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_38
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_38
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_39 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_39
index b0f02ca..9b0a686 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_39
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_39
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_4 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_4
index 10dc398..1b73c4b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_4
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_4
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_40 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_40
index b7ebe39..905881b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_40
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_40
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_41 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_41
index f3604b0..8ff0bce 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_41
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_41
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_5 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_5
index f69503d..e7d162d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_5
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_5
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_6 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_6
index 715a5e8..a66e9a9 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_6
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_6
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_7 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_7
index a649d0e..e56fdba 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_7
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_7
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_8 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_8
index 4ad3da6..76ba4cb 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_8
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_8
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_9 b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_9
index 2a705c9..766b86f 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_9
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_hardware_StorageStress_trim_soak_9
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_after b/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_after
index 877ceac..41ed2ec 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_before b/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_before
index f959fc3..b99563c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageQualBase_storage_qual_mini_soak_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageStress_storage_qual_mini_soak_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageStress_storage_qual_mini_soak_soak_0
index 40a8acc..f4785f0 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageStress_storage_qual_mini_soak_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_mini_soak_hardware_StorageStress_storage_qual_mini_soak_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_after b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_after
index bb1de86..ce2c009 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_before b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_before
index 35143c4..26c89a1 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_retention_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_after b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_after
index c75f64b..9c9dcd5 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_before b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_before
index e631c3f..6d5e5c6 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_suspend_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_after b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_after
index 555392a..d54d2b7 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_after
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_after
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_before b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_before
index 147b992..45cf3f1 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_before
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualBase_trim_before
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualCheckSetup_retention b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualCheckSetup_retention
index fbff400..34a9708 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualCheckSetup_retention
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualCheckSetup_retention
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0
index 66376cd..82f5c5d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1
index 100379f..87a5a50 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0
index 619fa29..5634b16 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1
index dc11b4e..773e03d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_0
index 4cca8b4..e08b4d6 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_1
index 826a861..7711e44 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend
index 46274e7..e51e38d 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_0
index 2e331a1..f18af0c 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_1
index a5b9b59..1d948e8 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_suspend_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_0
index ffc01bb..c149fd6 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_0
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_1
index e34ca5d..1e06dd5 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_trim_soak_1
@@ -26,8 +26,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = 1
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):
diff --git a/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py b/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py
index 3b6042c..63b1e01 100644
--- a/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py
+++ b/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py
@@ -315,8 +315,12 @@
 
 keyval = dict()
 keyval['storage_qual_version'] = {version}
-keyval['bug_id'] = bug_id
-keyval['part_id'] = part_id
+try:
+    keyval['bug_id'] = bug_id
+    keyval['part_id'] = part_id
+except NameError:
+    # bug_id and/or part_id variables not defined
+    pass
 utils.write_keyval(job.resultdir, keyval)
 
 def run(machine):