From d8be2ced58ef22dad6ee1265ddaeef6b38259b1c Mon Sep 17 00:00:00 2001
From: Evan Benn <evanbenn@chromium.org>
Date: Wed, 9 Nov 2022 16:57:53 +1100
Subject: flashrom_tester: Log some cros lsb-release information

os-release does not quite have as much information so use lsb-release.

BUG=b:258289727
BRANCH=None
TEST=flashrom_tester --libflashrom host Lock

Change-Id: If3452ead9e02e0ddeaa0fdf4852d7c17a8ab7650
Signed-off-by: Evan Benn <evanbenn@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/69403
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 util/flashrom_tester/src/cros_sysinfo.rs | 10 ++++++++++
 util/flashrom_tester/src/tester.rs       |  2 ++
 util/flashrom_tester/src/tests.rs        |  3 +++
 3 files changed, 15 insertions(+)

(limited to 'util/flashrom_tester')

diff --git a/util/flashrom_tester/src/cros_sysinfo.rs b/util/flashrom_tester/src/cros_sysinfo.rs
index e047f8e61..37e1ec659 100644
--- a/util/flashrom_tester/src/cros_sysinfo.rs
+++ b/util/flashrom_tester/src/cros_sysinfo.rs
@@ -34,6 +34,7 @@
 //
 
 use std::ffi::OsStr;
+use std::fs;
 use std::io::Result as IoResult;
 use std::process::{Command, Stdio};
 
@@ -58,3 +59,12 @@ pub fn system_info() -> IoResult<String> {
 pub fn bios_info() -> IoResult<String> {
     dmidecode_dispatch(&["-q", "-t0"])
 }
+
+pub fn release_description() -> IoResult<String> {
+    for l in fs::read_to_string("/etc/lsb-release")?.lines() {
+        if l.starts_with("CHROMEOS_RELEASE_DESCRIPTION") {
+            return Ok(l.to_string());
+        }
+    }
+    Err(std::io::ErrorKind::NotFound.into())
+}
diff --git a/util/flashrom_tester/src/tester.rs b/util/flashrom_tester/src/tester.rs
index bedccaff9..d19e45cfc 100644
--- a/util/flashrom_tester/src/tester.rs
+++ b/util/flashrom_tester/src/tester.rs
@@ -348,6 +348,7 @@ pub enum TestConclusion {
 pub struct ReportMetaData {
     pub chip_name: String,
     pub os_release: String,
+    pub cros_release: String,
     pub system_info: String,
     pub bios_info: String,
 }
@@ -451,6 +452,7 @@ pub fn collate_all_test_runs(
             println!();
             println!("  %---------------------------%");
             println!("   os release: {}", meta_data.os_release);
+            println!("   cros release: {}", meta_data.cros_release);
             println!("   chip name: {}", meta_data.chip_name);
             println!("   system info: \n{}", meta_data.system_info);
             println!("   bios info: \n{}", meta_data.bios_info);
diff --git a/util/flashrom_tester/src/tests.rs b/util/flashrom_tester/src/tests.rs
index 5cbe9d214..e6968c817 100644
--- a/util/flashrom_tester/src/tests.rs
+++ b/util/flashrom_tester/src/tests.rs
@@ -134,12 +134,15 @@ pub fn generic<'a, TN: Iterator<Item = &'a str>>(
     }
 
     let os_release = sys_info::os_release().unwrap_or("<Unknown OS>".to_string());
+    let cros_release = cros_sysinfo::release_description()
+        .unwrap_or("<Unknown or not a ChromeOS release>".to_string());
     let system_info = cros_sysinfo::system_info().unwrap_or("<Unknown System>".to_string());
     let bios_info = cros_sysinfo::bios_info().unwrap_or("<Unknown BIOS>".to_string());
 
     let meta_data = tester::ReportMetaData {
         chip_name,
         os_release,
+        cros_release,
         system_info,
         bios_info,
     };
-- 
cgit v1.2.3