diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml index 05b2a0140bd..f22c6a4db86 100644 --- a/.buildkite/packaging.pipeline.yml +++ b/.buildkite/packaging.pipeline.yml @@ -38,160 +38,158 @@ steps: artifact_paths: - build/distributions/** - - group: Packaging snapshot - key: packaging-snapshot - steps: - # x86 - - label: ":ubuntu: {{matrix}}/Packaging Linux Snapshot" - env: - PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" - SNAPSHOT: true - command: | - .buildkite/scripts/packaging/package-dra.sh {{matrix}} - agents: - provider: gcp - image: "${IMAGE_UBUNTU_X86_64}" - machineType: "${GCP_HI_PERF_MACHINE_TYPE}" - artifact_paths: - - build/distributions/**/* - matrix: - - auditbeat - - filebeat - - heartbeat - - metricbeat - - packetbeat - - winlogbeat - - x-pack/auditbeat - - x-pack/dockerlogbeat - - x-pack/filebeat - - x-pack/functionbeat - - x-pack/heartbeat - - x-pack/metricbeat - - x-pack/packetbeat - - x-pack/winlogbeat + # - group: Packaging snapshot + # key: packaging-snapshot + # steps: + # # x86 + # - label: ":ubuntu: {{matrix}}/Packaging Linux Snapshot" + # env: + # PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" + # SNAPSHOT: true + # command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" + # agents: + # provider: gcp + # image: "${IMAGE_UBUNTU_X86_64}" + # machineType: "${GCP_HI_PERF_MACHINE_TYPE}" + # artifact_paths: + # - build/distributions/**/* + # matrix: + # - auditbeat + # - filebeat + # - heartbeat + # - metricbeat + # - packetbeat + # - winlogbeat + # - x-pack/auditbeat + # - x-pack/dockerlogbeat + # - x-pack/filebeat + # - x-pack/functionbeat + # - x-pack/heartbeat + # - x-pack/metricbeat + # - x-pack/packetbeat + # - x-pack/winlogbeat - ## ARM - - label: ":linux: {{matrix}}/Packaging Linux arm64 Snapshot" - env: - PLATFORMS: "linux/arm64" - PACKAGES: "docker" - SNAPSHOT: true - command: | - .buildkite/scripts/packaging/package-dra.sh {{matrix}} - agents: - provider: "aws" - imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" - instanceType: "${AWS_ARM_INSTANCE_TYPE}" - artifact_paths: - - build/distributions/**/* - matrix: - - auditbeat - - filebeat - - heartbeat - - metricbeat - - packetbeat - - x-pack/auditbeat - - x-pack/dockerlogbeat - - x-pack/filebeat - - x-pack/heartbeat - - x-pack/metricbeat - - x-pack/packetbeat + # ## ARM + # - label: ":linux: {{matrix}}/Packaging Linux arm64 Snapshot" + # env: + # PLATFORMS: "linux/arm64" + # PACKAGES: "docker" + # SNAPSHOT: true + # command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" + # agents: + # provider: "aws" + # imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" + # instanceType: "${AWS_ARM_INSTANCE_TYPE}" + # artifact_paths: + # - build/distributions/**/* + # matrix: + # - auditbeat + # - filebeat + # - heartbeat + # - metricbeat + # - packetbeat + # - x-pack/auditbeat + # - x-pack/dockerlogbeat + # - x-pack/filebeat + # - x-pack/heartbeat + # - x-pack/metricbeat + # - x-pack/packetbeat - ## Osquerybeat and agentbeat require msitools to be installed - ## TODO: pre-install msitools to the VM and delete this exclusion - - label: ":ubuntu: {{matrix}}/Packaging Linux Snapshot" - env: - PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" - SNAPSHOT: true - command: | - .buildkite/scripts/install-msitools.sh - .buildkite/scripts/packaging/package-dra.sh {{matrix}} - agents: - provider: gcp - image: "${IMAGE_UBUNTU_X86_64}" - machineType: "${GCP_HI_PERF_MACHINE_TYPE}" - artifact_paths: - - build/distributions/**/* - matrix: - - x-pack/agentbeat - - x-pack/osquerybeat + # ## Osquerybeat and agentbeat require msitools to be installed + # ## TODO: pre-install msitools to the VM and delete this exclusion + # - label: ":ubuntu: {{matrix}}/Packaging Linux Snapshot" + # env: + # PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" + # SNAPSHOT: true + # command: | + # .buildkite/scripts/install-msitools.sh + # .buildkite/scripts/packaging/package-dra.sh {{matrix}} + # agents: + # provider: gcp + # image: "${IMAGE_UBUNTU_X86_64}" + # machineType: "${GCP_HI_PERF_MACHINE_TYPE}" + # artifact_paths: + # - build/distributions/**/* + # matrix: + # - x-pack/agentbeat + # - x-pack/osquerybeat - - group: Packaging staging + # - group: Packaging staging - key: packaging-staging - ## Only for release and main - if: "build.branch =~ /\\d+\\.\\d+/ || build.branch == 'main'" - steps: - # x86 - - label: ":ubuntu: {{matrix}}/Packaging Linux Staging" - env: - PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" - SNAPSHOT: false - command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" - agents: - provider: gcp - image: "${IMAGE_UBUNTU_X86_64}" - machineType: "${GCP_HI_PERF_MACHINE_TYPE}" - artifact_paths: - - build/distributions/**/* - matrix: - - auditbeat - - filebeat - - heartbeat - - metricbeat - - packetbeat - - winlogbeat - - x-pack/auditbeat - - x-pack/dockerlogbeat - - x-pack/filebeat - - x-pack/functionbeat - - x-pack/heartbeat - - x-pack/metricbeat - - x-pack/packetbeat - - x-pack/winlogbeat + # key: packaging-staging + # ## Only for release and main + # if: "build.branch =~ /\\d+\\.\\d+/ || build.branch == 'main'" + # steps: + # # x86 + # - label: ":ubuntu: {{matrix}}/Packaging Linux Staging" + # env: + # PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" + # SNAPSHOT: false + # command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" + # agents: + # provider: gcp + # image: "${IMAGE_UBUNTU_X86_64}" + # machineType: "${GCP_HI_PERF_MACHINE_TYPE}" + # artifact_paths: + # - build/distributions/**/* + # matrix: + # - auditbeat + # - filebeat + # - heartbeat + # - metricbeat + # - packetbeat + # - winlogbeat + # - x-pack/auditbeat + # - x-pack/dockerlogbeat + # - x-pack/filebeat + # - x-pack/functionbeat + # - x-pack/heartbeat + # - x-pack/metricbeat + # - x-pack/packetbeat + # - x-pack/winlogbeat - ## ARM - - label: ":linux: {{matrix}}/Packaging Linux arm64 Staging" - env: - PLATFORMS: "linux/arm64" - PACKAGES: "docker" - SNAPSHOT: false - command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" - agents: - provider: "aws" - imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" - instanceType: "${AWS_ARM_INSTANCE_TYPE}" - artifact_paths: - - build/distributions/** - matrix: - - auditbeat - - filebeat - - heartbeat - - metricbeat - - packetbeat - - x-pack/auditbeat - - x-pack/dockerlogbeat - - x-pack/filebeat - - x-pack/heartbeat - - x-pack/metricbeat - - x-pack/packetbeat + # ## ARM + # - label: ":linux: {{matrix}}/Packaging Linux arm64 Staging" + # env: + # PLATFORMS: "linux/arm64" + # PACKAGES: "docker" + # SNAPSHOT: false + # command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" + # agents: + # provider: "aws" + # imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" + # instanceType: "${AWS_ARM_INSTANCE_TYPE}" + # artifact_paths: + # - build/distributions/** + # matrix: + # - auditbeat + # - filebeat + # - heartbeat + # - metricbeat + # - packetbeat + # - x-pack/auditbeat + # - x-pack/dockerlogbeat + # - x-pack/filebeat + # - x-pack/heartbeat + # - x-pack/metricbeat + # - x-pack/packetbeat - ## Osquerybeat and agentbeat require msitools to be installed - ## TODO: pre-install msitools to the VM and delete this exclusion - - label: ":ubuntu: {{matrix}}/Packaging Linux Staging" - env: - PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" - SNAPSHOT: false - command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" - agents: - provider: gcp - image: "${IMAGE_UBUNTU_X86_64}" - machineType: "${GCP_HI_PERF_MACHINE_TYPE}" - artifact_paths: - - build/distributions/** - matrix: - - x-pack/agentbeat - - x-pack/osquerybeat + # ## Osquerybeat and agentbeat require msitools to be installed + # ## TODO: pre-install msitools to the VM and delete this exclusion + # - label: ":ubuntu: {{matrix}}/Packaging Linux Staging" + # env: + # PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" + # SNAPSHOT: false + # command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}" + # agents: + # provider: gcp + # image: "${IMAGE_UBUNTU_X86_64}" + # machineType: "${GCP_HI_PERF_MACHINE_TYPE}" + # artifact_paths: + # - build/distributions/** + # matrix: + # - x-pack/agentbeat + # - x-pack/osquerybeat - group: DRA publish key: dra @@ -200,10 +198,10 @@ steps: key: dra-snapshot env: DRA_WORKFLOW: snapshot - depends_on: - - packaging-snapshot + # depends_on: + # - packaging-snapshot command: | - buildkite-agent artifact download "build/**/*" . + buildkite-agent artifact download "build/**/*" . --build 018f0d0c-5a6e-497d-9e96-e35747d1be87 ls -lah build ls -lah build/distributions .buildkite/scripts/dra.sh