Update agent config path in release script (#143)

signalfx · Mar 3, 2021 · 15356b2 · 15356b2
1 parent 6ee49fa
commit 15356b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/buildscripts/packaging/release/helpers/constants.py b/internal/buildscripts/packaging/release/helpers/constants.py
@@ -47,4 +47,4 @@
 # MSI
 WIX_IMAGE = "felfert/wix:latest"
 WXS_PATH = "internal/buildscripts/packaging/msi/splunk-otel-collector.wxs"
-MSI_CONFIG = "cmd/otelcol/config/collector/agent_config_windows.yaml"
+MSI_CONFIG = "cmd/otelcol/config/collector/agent_config.yaml"
diff --git a/internal/buildscripts/packaging/release/sign_release.py b/internal/buildscripts/packaging/release/sign_release.py
@@ -124,11 +124,12 @@ def main():
         if resp.lower() not in ("y", "yes"):
             sys.exit(1)
 
+    if not args.assets_dir:
+        args.assets_dir = os.path.join(ASSETS_BASE_DIR, args.tag)
+
     if args.path:
         assets = get_local_assets(args)
     else:
-        if not args.assets_dir:
-            args.assets_dir = os.path.join(ASSETS_BASE_DIR, args.tag)
         resp = input(f"Downloading assets from {github_release.html_url} to '{args.assets_dir}'.\nContinue? [y/N]: ")
         if resp.lower() not in ("y", "yes"):
             sys.exit(1)