status: make revision commit explicit

named-data · May 11, 2024 · f632918 · f632918
1 parent ed89702
commit f632918
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/framework/ndn-testbed-status/src/App.vue b/framework/ndn-testbed-status/src/App.vue
@@ -174,7 +174,8 @@ export default defineComponent({
     },
 
     getRevUrl(router: IRouter) {
-      return `${TESTBED_REPO}/commit/${router.status!.revision}`;
+      const ref = router.status?.revision_commit ?? router.status?.revision;
+      return `${TESTBED_REPO}/commit/${ref}`;
     },
 
     getFromNow<T extends number>(timestamp: T) {

diff --git a/framework/ndn-testbed-status/src/testbed.ts b/framework/ndn-testbed-status/src/testbed.ts
@@ -14,6 +14,7 @@ interface IRouter {
 interface IStatus {
     timestamp: number;
     revision: string;
+    revision_commit: string;
     host_info?: {
         kernel: string;
         os: string;

diff --git a/framework/status-json.py b/framework/status-json.py
@@ -25,6 +25,11 @@ def get_revision():
     cmd = ['git', 'describe', '--dirty', '--always']
     return subprocess.check_output(cmd, timeout=5).decode('utf-8').strip()
 
+def get_revision_commit():
+    print('Getting git revision commit', file=sys.stderr)
+    cmd = ['git', 'rev-parse', 'HEAD']
+    return subprocess.check_output(cmd, timeout=5).decode('utf-8').strip()
+
 def get_host_info():
     print('Getting host info', file=sys.stderr)
     info = compose.info()
@@ -138,6 +143,7 @@ def get_ws_tls_status(host: dict) -> bool:
     status = {
         'timestamp': run_safe(get_timestamp),
         'revision': run_safe(get_revision),
+        'revision_commit': run_safe(get_revision_commit),
         'host_info': run_safe(get_host_info),
         'tls': run_safe(get_tls_status, host),
         'ws-tls': run_safe(get_ws_tls_status, host),