Skip to content

Commit

Permalink
Fix for jenkins test exec directory location
Browse files Browse the repository at this point in the history
  • Loading branch information
mkavulich committed Nov 12, 2024
1 parent a12b8e1 commit c2c48f7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ush/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,12 +399,12 @@ def setup(USHdir, user_config_fn="config.yaml", debug: bool = False):

# Create a dictionary of config options from defaults, machine, and
# user config files.
build_config_fp = os.path.join(USHdir, os.pardir, "exec", "build_settings.yaml")
default_config_fp = os.path.join(USHdir, "config_defaults.yaml")
user_config_fp = os.path.join(USHdir, user_config_fn)
expt_config = load_config_for_setup(USHdir, default_config_fp, user_config_fp)

# Load build settings as a dictionary; will be used later to make sure the build is consistent with the user settings
build_config_fp = os.path.join(expt_config["user"].get("EXECdir"), "build_settings.yaml")
build_config = load_config_file(build_config_fp)
logger.debug(f"Read build configuration from {build_config_fp}\n{build_config}")

Expand Down

0 comments on commit c2c48f7

Please sign in to comment.