Fix defaults in packaging scripts

Author: swiatekm

.buildkite/scripts/steps/integration-package.sh

@@ -9,10 +9,6 @@ source .buildkite/scripts/common.sh
 #
 # Making a change here can affect the released images to agentless, so be cautious.
 
-export USE_PACKAGE_VERSION="true"
 export WINDOWS_NPCAP="true"
-# Always compile core from this checkout; integration tests and agentless
-# release builds must exercise the core from this commit.
-export AGENT_CORE_SOURCE=local
 
 mage package

.buildkite/scripts/steps/package.sh

@@ -7,13 +7,11 @@ source "${_SELF}/../common.sh"
 
 mage clean
 
-# When MANIFEST_URL is provided (DRA full-package run), download core from the
-# manifest. Otherwise compile core from this checkout and read version/snapshot
-# from .package-version.
-if test -z "${MANIFEST_URL:-}"; then
-  export AGENT_CORE_SOURCE=local
-  export USE_PACKAGE_VERSION=true
-else
+# Default behavior (no MANIFEST_URL): compile core from this checkout and read
+# version/snapshot from .package-version (AGENT_CORE_SOURCE=local and
+# USE_PACKAGE_VERSION=true are both defaults). When MANIFEST_URL is provided
+# (DRA full-package run), download core from the manifest instead.
+if [ -n "${MANIFEST_URL:-}" ]; then
   export AGENT_CORE_SOURCE=manifest
   export USE_PACKAGE_VERSION=false
 fi