specify repo on the command line to override configuration

Author: lzrd

scripts/README.md

@@ -58,7 +58,7 @@ Rhai calls the script's `main() -> i64 {}`.
   - rhai_fs::FilesystemPackage - file system access
   - [rhai_chrono::ChronoPackage](https://github.com/iganev/rhai-chrono) - standard time formats.
 
-### Modified Rhai behaviod
+### Modified Rhai behavior
   - The `debug("message")` function is routed to the faux-mgs slog logging.
     Prefixing a message with "crit|", "trace|", "error|", "warn|", "error|", or "debug|"
     will log at that corresponding level. Leaving off the prefix or using some other
@@ -113,15 +113,26 @@ cargo -q run --bin faux-mgs --features=rhaiscript -- \
   --per-attempt-timeout-millis=${PER_ATTEMPT_MS} \
   "$@"
 ```
+
+
 A `getops` utility function provides command line parsing within
 the script.
 
+### An update/rollback test
+
 For the upgrade-rollback script, a JSON configuration file supplies
 paths or other parameters needed to configure the script.
 
-then for instance:
+For convenience, it is assumed that there are two repos with there
+respective Grapefruit SP and RoT images built.
+
+#### Running update-rollback between the master branch and your new code:
+
 ```bash
-./FM rhai scripts/upgrade-rollback.rhai -- -c scripts/targets.json
+BASELINE=$HOME/Oxide/src/hubris/master
+UNDER_TEST=$HOME/Oxide/src/hubris/my-new-branch
+./FM rhai scripts/upgrade-rollback.rhai -- \
+    -c scripts/targets.json ${BASELINE} ${UNDER_TEST}
 ```
 
 See the scripts themselves for further information.

scripts/targets.json

@@ -1,7 +1,7 @@
 {
   "repo-home": "${HOME}/Oxide/src",
   "base_repo": "${repo-home}/hubris/master",
-  "ut_repo": "${repo-home}/hubris/epoch",
+  "ut_repo": "${repo-home}/hubris/${UT_WORKTREE}",
 
   "keyset": "bart",
   "keyset-dvt-dock": "${repo-home}/dvt-dock/${keyset}",

scripts/upgrade-rollback.rhai

@@ -5,10 +5,12 @@ fn usage(prog, error) {
     if error != () {
         print(`Error: ${error}`);
     }
-    print(`Usage: faux-mgs ... rhai ${prog} [-v] [-h] [-c config.json]`);
+    print(`Usage: faux-mgs ... rhai ${prog} [-v] [-h] [-c config.json] [path0] [path1]`);
     print("  -c CONFIG.JSON # Path to configuration");
     print("  -v # be verbose");
     print("  -h # Help. Print this message");
+    print("path0 - optionally override configuration base_repo value");
+    print("path1 - optionally override configuration ut_repo value");
     print("");
 }
 
@@ -152,7 +154,7 @@ fn main() {
 
         debug(`info|${v.up_down} SP Hubris to ${v.label} image`);
         if !update_sp(v.sp_path) {
-            debug(`error|Failed to ${v.up_down} SP Hubris to ${v.label} image: ${r}`);
+            debug(`error|Failed to ${v.up_down} SP Hubris to ${v.label} image`);
             return 1;
         }
 
@@ -229,6 +231,22 @@ fn process_cli(argv) {
         print(`config=${config}`);
     }
 
+    // Optionally override baseline and under test repo from command line
+    let repo_path = parsed?.positional[0];
+    if repo_path != () {
+      print("override config base_repo:");
+      print(`  was: ${config?.base_repo}`);
+      config.base_repo = repo_path;
+      print(`  now: ${config?.base_repo}`);
+    }
+    let repo_path = parsed?.positional[1];
+    if repo_path != () {
+      print("override config ut_repo:");
+      print(`  was: ${config?.ut_repo}`);
+      config.ut_repo = repo_path;
+      print(`  now: ${config?.ut_repo}`);
+    }
+
     // Expand the paths to archives so that the config file
     // can use vars from the environment and the configuration file itself.
     conf["sp_bord"] = util::env_expand(config.bord.sp, config);