summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoung Gyu Park <younggyu@google.com>2018-05-09 18:45:05 +0900
committerYoung Gyu Park <younggyu@google.com>2018-05-09 18:45:05 +0900
commit34dd5c24c4d0adb6a0e31cb49948a4e6ab6b4446 (patch)
tree46de26fa7a37ac41735e63b1aecfbec30a1f09dc
parentd3edb7b7e958bba8aded6057ee6a647906469d35 (diff)
downloaddashboard-34dd5c24c4d0adb6a0e31cb49948a4e6ab6b4446.tar.gz
Crash Security Vulnerability Report Template variables update
Test: go/vts-web-staging/show_plan_release?plan=vts&type=suite&page=1 Bug: 79183660 Change-Id: I43450bdbae93c0a03f4b48a0dd57399225ccbd03
-rw-r--r--src/main/java/com/android/vts/entity/TestSuiteResultEntity.java25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java b/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java
index 3ebece7..1063141 100644
--- a/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java
+++ b/src/main/java/com/android/vts/entity/TestSuiteResultEntity.java
@@ -80,14 +80,16 @@ public class TestSuiteResultEntity {
String bugTrackingSystem = systemConfigProp.getProperty("bug.tracking.system");
- InputStream btsInputStream =
- TestSuiteResultEntity.class
- .getClassLoader()
- .getResourceAsStream(
- "bug_tracking_system/"
- + bugTrackingSystem
- + "/config.properties");
- bugTrackingSystemProp.load(btsInputStream);
+ if (!bugTrackingSystem.isEmpty()) {
+ InputStream btsInputStream =
+ TestSuiteResultEntity.class
+ .getClassLoader()
+ .getResourceAsStream(
+ "bug_tracking_system/"
+ + bugTrackingSystem
+ + "/config.properties");
+ bugTrackingSystemProp.load(btsInputStream);
+ }
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
@@ -353,11 +355,14 @@ public class TestSuiteResultEntity {
Map<String, String> valuesMap = new HashMap<>();
valuesMap.put("suiteBuildNumber", suiteBuildNumber);
+ valuesMap.put("branch", branch);
+ valuesMap.put("target", target);
+ valuesMap.put("deviceName", deviceName);
valuesMap.put("buildId", buildId);
+ valuesMap.put("suiteName", suiteName);
+ valuesMap.put("suitePlan", suitePlan);
valuesMap.put("hostName", hostName);
valuesMap.put("resultPath", resultPath);
- valuesMap.put("buildVendorFingerprint", buildVendorFingerprint);
- valuesMap.put("buildSystemFingerprint", buildSystemFingerprint);
StrSubstitutor sub = new StrSubstitutor(valuesMap);
String resolvedDescription = sub.replace(templateDescription);