Force package target to download acs file from manifest

.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml

@@ -45,58 +45,58 @@ steps:
   - wait: ~
     if: build.env("ManifestURL") == null
 
-  - group: ":Packaging Artefacts"
-    key: "package"
-    steps:
-      - label: "Package elastic-agent"
-        key: package_elastic-agent
-        command: |
-          if [[ -z "$${ManifestURL}" ]]; then
-            export ManifestURL=$(buildkite-agent meta-data get ManifestURL --default "")
-            if [[ -z "$${ManifestURL}" ]]; then
-              echo ":broken_heart: Missing ManifestURL variable or empty string provided"
-              echo "Provided ManifestURL: ${ManifestURL}"
-              exit 1
-            fi
-          fi
-          if [[ -z "$${MAGEFILE_VERBOSE}" ]]; then
-            export MAGEFILE_VERBOSE=$(buildkite-agent meta-data get MAGEFILE_VERBOSE --default "0")
-          fi
-          .buildkite/x-pack/elastic-agent/scripts/steps/package.sh
-        artifact_paths:
-          - "x-pack/elastic-agent/build/distributions/**/*"
-        agents:
-          provider: "gcp"
-          image: "family/platform-ingest-beats-ubuntu-2204"
+  # - group: ":Packaging Artefacts"
+  #   key: "package"
+  #   steps:
+  #     - label: "Package elastic-agent"
+  #       key: package_elastic-agent
+  #       command: |
+  #         if [[ -z "$${ManifestURL}" ]]; then
+  #           export ManifestURL=$(buildkite-agent meta-data get ManifestURL --default "")
+  #           if [[ -z "$${ManifestURL}" ]]; then
+  #             echo ":broken_heart: Missing ManifestURL variable or empty string provided"
+  #             echo "Provided ManifestURL: ${ManifestURL}"
+  #             exit 1
+  #           fi
+  #         fi
+  #         if [[ -z "$${MAGEFILE_VERBOSE}" ]]; then
+  #           export MAGEFILE_VERBOSE=$(buildkite-agent meta-data get MAGEFILE_VERBOSE --default "0")
+  #         fi
+  #         .buildkite/x-pack/elastic-agent/scripts/steps/package.sh
+  #       artifact_paths:
+  #         - "x-pack/elastic-agent/build/distributions/**/*"
+  #       agents:
+  #         provider: "gcp"
+  #         image: "family/platform-ingest-beats-ubuntu-2204"
+
+  #     - label: "Package ARM elastic-agent"
+  #       env:
+  #         PLATFORMS: "linux/arm64"
+  #         PACKAGES: "docker"
+  #       key: package_elastic-agent-arm
+  #       command: |
+  #         if [[ -z "$${ManifestURL}" ]]; then
+  #           export ManifestURL=$(buildkite-agent meta-data get ManifestURL --default "")
+  #           if [[ -z "$${ManifestURL}" ]]; then
+  #             echo ":broken_heart: Missing ManifestURL variable or empty string provided"
+  #             echo "Provided ManifestURL: ${ManifestURL}"
+  #             exit 1
+  #           fi
+  #         fi
+  #         if [[ -z "$${MAGEFILE_VERBOSE}" ]]; then
+  #           export MAGEFILE_VERBOSE=$(buildkite-agent meta-data get MAGEFILE_VERBOSE --default "0")
+  #         fi
+  #         .buildkite/x-pack/elastic-agent/scripts/steps/package.sh
+  #       artifact_paths:
+  #         - "x-pack/elastic-agent/build/distributions/**/*"
+  #       agents:
+  #         provider: "aws"
+  #         instanceType: "t4g.2xlarge"
+  #         imagePrefix: "platform-ingest-beats-ubuntu-2004-aarch64"
 
-      - label: "Package ARM elastic-agent"
-        env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
-        key: package_elastic-agent-arm
-        command: |
-          if [[ -z "$${ManifestURL}" ]]; then
-            export ManifestURL=$(buildkite-agent meta-data get ManifestURL --default "")
-            if [[ -z "$${ManifestURL}" ]]; then
-              echo ":broken_heart: Missing ManifestURL variable or empty string provided"
-              echo "Provided ManifestURL: ${ManifestURL}"
-              exit 1
-            fi
-          fi
-          if [[ -z "$${MAGEFILE_VERBOSE}" ]]; then
-            export MAGEFILE_VERBOSE=$(buildkite-agent meta-data get MAGEFILE_VERBOSE --default "0")
-          fi
-          .buildkite/x-pack/elastic-agent/scripts/steps/package.sh
-        artifact_paths:
-          - "x-pack/elastic-agent/build/distributions/**/*"
-        agents:
-          provider: "aws"
-          instanceType: "t4g.2xlarge"
-          imagePrefix: "platform-ingest-beats-ubuntu-2004-aarch64"
-  #
   - label: ":elastic-stack: Publishing to DRA"
     key: dra-publish
-    depends_on: package
+    # depends_on: package
     agents:
       provider: "gcp"
     env:
@@ -105,7 +105,7 @@ steps:
     command: |
       echo "+++ Restoring Artifacts"
       mkdir build       
-      buildkite-agent artifact download "x-pack/elastic-agent/build/**/*" .
+      buildkite-agent artifact download "x-pack/elastic-agent/build/**/*" . --build 018ec2a4-ee3d-4a15-9e64-afbf25039705
       echo "+++ Changing permissions for the release manager"
       sudo chown -R :1000 x-pack/elastic-agent/build/distributions/
       echo "+++ Running DRA publish step"

.buildkite/x-pack/elastic-agent/scripts/steps/dra-publish.sh

@@ -15,7 +15,7 @@ CI_DRA_ROLE_PATH="kv/ci-shared/release/dra-role"
 
 # force main branch on PR's or it won't execute
 # because the PR branch does not have a project folder in release-manager
-if  [[ "${BUILDKITE_PULL_REQUEST:="false"}" != "false" || "$BUILDKITE_BRANCH" == "xpack_agent_core_publish" ]]; then
+if  [[ "${BUILDKITE_PULL_REQUEST:="false"}" != "false" || "$BUILDKITE_BRANCH" == "acs_filies_quick_fix" ]]; then
     BRANCH=7.17
     # DRY_RUN="--dry-run"
     echo "+++ Running in PR or test branch and setting branch 7.17 and --dry-run"

.buildkite/x-pack/elastic-agent/scripts/steps/package.sh

@@ -16,7 +16,7 @@ echo "--- Packaging Elastic Agent"
 
 echo $ManifestURL
 
-export AGENT_DROP_PATH=build/elastic-agent-drop
+export AGENT_DROP_PATH=build/distributions/elastic-agent-drop
 mkdir -p $AGENT_DROP_PATH
 
 mage -v -d x-pack/elastic-agent clean downloadManifest package ironbank fixDRADockerArtifacts

dev-tools/mage/manifest/manifest.go

@@ -26,6 +26,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 	"time"
 
 	artifacts "github.com/elastic/beats/v7/dev-tools/mage/artifacts"
@@ -90,8 +91,13 @@ func resolveManifestPackage(project artifacts.Project, pkg string, reqPackage st
 	if mg.Verbose() {
 		log.Printf(">>>>>>>>>>> Project branch/commit [%s, %s]", project.Branch, project.CommitHash)
 	}
-	return []string{val.URL, val.ShaURL, val.AscURL}
 
+	// Force the asc file to be downloaded even is the acs_url is empty
+	if len(val.AscURL) == 0 && strings.HasSuffix(val.URL, ".tar.gz") {
+		return []string{val.URL, val.ShaURL, val.URL + ".asc"}
+	}
+
+	return []string{val.URL, val.ShaURL, val.AscURL}
 }
 
 // DownloadComponentsFromManifest is going to download a set of components from the given manifest into the destination

x-pack/elastic-agent/magefile.go

@@ -690,7 +690,7 @@ func packageAgent(requiredPackages []string, packagingFn func()) {
 		}
 
 		// cleanup after build
-		defer os.RemoveAll(dropPath)
+		// defer os.RemoveAll(dropPath)
 		defer os.Unsetenv(agentDropPath)
 
 		packedBeats := []string{"filebeat", "heartbeat", "metricbeat", "osquerybeat"}