Skip to content
Snippets Groups Projects

Got EVLA CMS restores working via casa_envoy, using casa_restorepipescript.py when it exists

Merged Sam Kagan requested to merge use-casa-version-pipescript-in-casa-envoy into 2.8.4-DEVELOPMENT
1 unresolved thread

Restores have been manually tested both with a PPR in the arguments (but no piperestorescript in the cal tar) and without one (with a piperestorescript in the cal tar). No other use-cases of casa_envoy have been manually tested.

To test restores with piperestorescript:

  1. Copy the following from /lustre/aoc/cluster/pipeline/dsoc-dev/workspaces/skagan_testing/test_data/with_piperestorescript_2 into your own testing directory:
    1. rawdata/
    2. metadata.json
  2. Add empty products and working directories
  3. Remove rawdata/products
  4. Call /lustre/aoc/cluster/pipeline/dsoc-dev/workspaces/skagan_testing/skagan-casa_envoy3 --restore metadata.json

Without piperestorescript (differences bolded):

  1. Copy the following from /lustre/aoc/cluster/pipeline/dsoc-dev/workspaces/skagan_testing/test_data/sans_piperestorescript_with_ppr_in_args into your own testing directory:
    1. rawdata/
    2. metadata.json
    3. PPR.xml
  2. Add empty products and working directories
  3. Remove rawdata/products
  4. Call /lustre/aoc/cluster/pipeline/dsoc-dev/workspaces/skagan_testing/skagan-casa_envoy3 --restore metadata.json PPR.xml
Edited by Sam Kagan

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Sam Kagan added 1 commit

    added 1 commit

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • bda2148e - Added failing tests for updated restore CLI and multiple-code-path error

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • 35fa69d6 - Passed tests assuming PPR comes in thru restore args

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • b6089a2b - Passed test with no PPR in args for restore

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • 235f2fd7 - Passed PPR parameter to launcher from foundation when needed

    Compare with previous version

  • Sam Kagan added 3 commits

    added 3 commits

    • a6b86cd3 - Revert "Passed PPR parameter to launcher from foundation when needed"
    • e6dbe8a2 - Revert "Passed test with no PPR in args for restore"
    • 401c4494 - Updated file auditor to reject absent PPR with no piperestorescript

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • 8fa37ff9 - Passed tests for auditor changes

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • c44c4be7 - Moved common settings/parameter constants to Pytest fixtures

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • d39c39af - Added tests for auditing restore without PPR

    Compare with previous version

  • Sam Kagan added 1 commit

    added 1 commit

    • b83b779a - Added tests for auditing restore with a PPR

    Compare with previous version

  • Sam Kagan added 2 commits

    added 2 commits

    • fbf32403 - Allowed PPR_FILENAME to be unset, removed unnecessary checks
    • cdc2080a - Added additional auditor test for cal w/o PPR

    Compare with previous version

  • Sam Kagan added 32 commits

    added 32 commits

    • cdc2080a...77a55d83 - 11 commits from branch 2.8.4-DEVELOPMENT
    • 77a55d83...dbc9d36e - 11 earlier commits
    • 928753c4 - Passed PPR parameter to launcher from foundation when needed
    • cd1a1595 - Revert "Passed PPR parameter to launcher from foundation when needed"
    • f03c0307 - Revert "Passed test with no PPR in args for restore"
    • d93adafa - Updated file auditor to reject absent PPR with no piperestorescript
    • 3d90d581 - Passed tests for auditor changes
    • f495519f - Moved common settings/parameter constants to Pytest fixtures
    • 9ac046c5 - Added tests for auditing restore without PPR
    • e687396a - Added tests for auditing restore with a PPR
    • cd23df5e - Allowed PPR_FILENAME to be unset, removed unnecessary checks
    • 3c9e6f22 - Added additional auditor test for cal w/o PPR

    Compare with previous version

  • Sam Kagan added 11 commits

    added 11 commits

    • 350c729f - 1 earlier commit
    • 3489f3d0 - Drafted change to use piperestorescript if it exists
    • bc14d439 - Fixed and added tests, removed deprecated dep
    • dd03df63 - Added custom __eq__() to RunnerIF
    • 139d5f83 - Responded to MR feedback
    • 98e66e39 - Added failing tests for updated restore CLI and multiple-code-path error
    • 6b7ca1e6 - Passed tests assuming PPR comes in thru restore args
    • 12d17f9b - Updated file auditor to reject absent PPR with no piperestorescript
    • 0274ea5d - Moved common settings/parameter constants to Pytest fixtures
    • 6b894098 - Added tests for auditing restore w/ and w/o PPR, and for cal w/o PPR
    • d77b5e35 - Allowed PPR_FILENAME to be unset, removed unnecessary checks

    Compare with previous version

  • Sam Kagan marked this merge request as ready

    marked this merge request as ready

  • Sam Kagan changed title from Draft: Updated casa_envoy to use casa_restorepipescript.py for restores when it exists to Got EVLA CMS restores working via casa_envoy, using casa_restorepipescript.py when it exists

    changed title from Draft: Updated casa_envoy to use casa_restorepipescript.py for restores when it exists to Got EVLA CMS restores working via casa_envoy, using casa_restorepipescript.py when it exists

  • Sam Kagan changed the description

    changed the description

  • Sam Kagan changed the description

    changed the description

  • Sam Kagan added 32 commits

    added 32 commits

    • d77b5e35...2f269998 - 21 commits from branch 2.8.4-DEVELOPMENT
    • c1c30a25 - 1 earlier commit
    • f45c7d1c - Drafted change to use piperestorescript if it exists
    • ee59609e - Fixed and added tests, removed deprecated dep
    • 329f19ff - Added custom __eq__() to RunnerIF
    • 0256b660 - Responded to MR feedback
    • 05a20bd4 - Added failing tests for updated restore CLI and multiple-code-path error
    • 42d40475 - Passed tests assuming PPR comes in thru restore args
    • 3a106420 - Updated file auditor to reject absent PPR with no piperestorescript
    • 421bfe92 - Moved common settings/parameter constants to Pytest fixtures
    • 53fa6d6b - Added tests for auditing restore w/ and w/o PPR, and for cal w/o PPR
    • 2c6ce997 - Allowed PPR_FILENAME to be unset, removed unnecessary checks

    Compare with previous version

  • Charlotte Hausman
  • Charlotte Hausman
  • Charlotte Hausman
  • Charlotte Hausman
  • 88 ^ (args.restore is not None)
    89 ^ (args.split is not None)
    90 ):
    91 raise ValueError(
    92 "Expected exactly one of standard_cal, vlass_cal, standard_img, vlass_img, or restore arguments to be provided, found none or multiple"
    93 )
    81 94 parameters = {}
    82 95
    83 96 if args.parallel is not None:
    84 97 parameters["requested_parallel"] = args.parallel
    85 98
    86 if args.standard_cal is not None or args.vlass_cal is not None:
    99 if args.standard_cal is not None or args.vlass_cal is not None or args.restore is not None:
    87 100 if args.standard_cal:
    88 101 parameters = {**parameters, **_get_settings(path, args.standard_cal)}
    89 if args.restore:
  • Sam Kagan added 2 commits

    added 2 commits

    • 72da669e - Removed test/__init__.py, renamed fixture for casa_envoy
    • d6257343 - Changed multi-action detector to use argparse, removed unneeded test

    Compare with previous version

  • Sam Kagan added 20 commits

    added 20 commits

    • d6257343...1c26be09 - 6 commits from branch 2.8.4-DEVELOPMENT
    • 1c26be09...10ed881d - 4 earlier commits
    • c3b2c716 - Responded to MR feedback
    • 82e3be02 - Added failing tests for updated restore CLI and multiple-code-path error
    • 14a1073a - Passed tests assuming PPR comes in thru restore args
    • 56569f92 - Updated file auditor to reject absent PPR with no piperestorescript
    • f9251eb4 - Moved common settings/parameter constants to Pytest fixtures
    • f3839aa5 - Added tests for auditing restore w/ and w/o PPR, and for cal w/o PPR
    • a40f6c38 - Allowed PPR_FILENAME to be unset, removed unnecessary checks
    • df1edfeb - Removed test/__init__.py, renamed fixture for casa_envoy
    • a4cb9710 - Changed multi-action detector to use argparse, removed unneeded test
    • 40637589 - Updated restore_cms' envoy.sh for new envoy CLI

    Compare with previous version

  • Sam Kagan added 2 commits

    added 2 commits

    • d2f025fa - Changed multi-action detector to use argparse, removed unneeded test
    • 3767852b - Updated restore_cms' envoy.sh for new envoy CLI

    Compare with previous version

  • Charlotte Hausman approved this merge request

    approved this merge request

  • Daniel Nemergut approved this merge request

    approved this merge request

  • Sam Kagan added 1 commit

    added 1 commit

    • 314f663b - Really removed unneeded test

    Compare with previous version

  • mentioned in commit 39ff8d4c

  • Please register or sign in to reply
    Loading