Merge pull request #1239 from buildkite/pdp-1831-packer-builds-on-windows-fail-bc-docker-requires-a-restart

Author: triarius

.buildkite/pipeline.yaml

@@ -26,8 +26,6 @@ steps:
     name: ":go: fixperms build"
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE}"
-    depends_on:
-      - "fixperms-tests"
     artifact_paths: "build/fix-perms-*"
     plugins:
       - docker-compose#v2.1.0:

Makefile

@@ -3,14 +3,26 @@
 VERSION = $(shell git describe --tags --candidates=1)
 SHELL = /bin/bash -o pipefail
 
-PACKER_VERSION ?= 1.8.6
+PACKER_VERSION ?= 1.9.4
 PACKER_LINUX_FILES = $(exec find packer/linux)
 PACKER_WINDOWS_FILES = $(exec find packer/windows)
 
 AWS_REGION ?= us-east-1
 
-ARM64_INSTANCE_TYPE = m6g.xlarge
-AMD64_INSTANCE_TYPE = c5.xlarge
+ARM64_INSTANCE_TYPE = m7g.xlarge
+AMD64_INSTANCE_TYPE = m7a.xlarge
+WIN64_INSTANCE_TYPE = m7i.xlarge
+
+BUILDKITE_BUILD_NUMBER ?= none
+BUILDKITE_PIPELINE_DEFAULT_BRANCH ?= main
+
+IS_RELEASED ?= false
+ifeq ($(BUILDKITE_BRANCH),$(BUILDKITE_PIPELINE_DEFAULT_BRANCH))
+	IS_RELEASED = true
+endif
+ifeq ($(BUILDKITE_BRANCH),$(BUILDKITE_TAG))
+	IS_RELEASED = true
+endif
 
 all: packer build
 
@@ -87,9 +99,13 @@ packer-linux-amd64.output: $(PACKER_LINUX_FILES)
 		-v "$(PWD):/src" \
 		--rm \
 		-w /src/packer/linux \
-		hashicorp/packer:$(PACKER_VERSION) build -timestamp-ui -var 'region=$(AWS_REGION)' \
-			-var 'arch=x86_64' -var 'goarch=amd64' -var 'instance_type=$(AMD64_INSTANCE_TYPE)' \
-			buildkite-ami.json | tee $@
+		hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
+			-var 'region=$(AWS_REGION)' \
+			-var 'arch=x86_64' \
+			-var 'instance_type=$(AMD64_INSTANCE_TYPE)' \
+			-var 'build_number=$(BUILDKITE_BUILD_NUMBER)' \
+			-var 'is_released=$(IS_RELEASED)' \
+			buildkite-ami.pkr.hcl | tee $@
 
 build/linux-arm64-ami.txt: packer-linux-arm64.output env-AWS_REGION
 	mkdir -p build
@@ -108,9 +124,13 @@ packer-linux-arm64.output: $(PACKER_LINUX_FILES)
 		-v "$(PWD):/src" \
 		--rm \
 		-w /src/packer/linux \
-		hashicorp/packer:$(PACKER_VERSION) build -timestamp-ui -var 'region=$(AWS_REGION)' \
-			-var 'arch=arm64' -var 'goarch=arm64' -var 'instance_type=$(ARM64_INSTANCE_TYPE)' \
-			buildkite-ami.json | tee $@
+		hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
+			-var 'region=$(AWS_REGION)' \
+			-var 'arch=arm64' \
+			-var 'instance_type=$(ARM64_INSTANCE_TYPE)' \
+			-var 'build_number=$(BUILDKITE_BUILD_NUMBER)' \
+			-var 'is_released=$(IS_RELEASED)' \
+			buildkite-ami.pkr.hcl | tee $@
 
 build/windows-amd64-ami.txt: packer-windows-amd64.output env-AWS_REGION
 	mkdir -p build
@@ -129,8 +149,13 @@ packer-windows-amd64.output: $(PACKER_WINDOWS_FILES)
 		-v "$(PWD):/src" \
 		--rm \
 		-w /src/packer/windows \
-		hashicorp/packer:$(PACKER_VERSION) build -timestamp-ui -var 'region=$(AWS_REGION)' \
-			buildkite-ami.json | tee $@
+		hashicorp/packer:full-$(PACKER_VERSION) build -timestamp-ui \
+			-var 'region=$(AWS_REGION)' \
+			-var 'arch=x86_64' \
+			-var 'instance_type=$(WIN64_INSTANCE_TYPE)' \
+			-var 'build_number=$(BUILDKITE_BUILD_NUMBER)' \
+			-var 'is_released=$(IS_RELEASED)' \
+			buildkite-ami.pkr.hcl | tee $@
 
 # -----------------------------------------
 # Cloudformation helpers

packer/linux/buildkite-ami.json

@@ -0,0 +1,101 @@
+packer {
+  required_plugins {
+    amazon = {
+      source  = "github.com/hashicorp/amazon"
+      version = "~> 1"
+    }
+  }
+}
+
+variable "arch" {
+  type    = string
+  default = "x86_64"
+}
+
+variable "instance_type" {
+  type    = string
+  default = "m7a.xlarge"
+}
+
+variable "region" {
+  type    = string
+  default = "us-east-1"
+}
+
+variable "build_number" {
+  type    = string
+  default = "none"
+}
+
+variable "is_released" {
+  type    = bool
+  default = false
+}
+
+data "amazon-ami" "al2023" {
+  filters = {
+    architecture        = var.arch
+    name                = "al2023-ami-minimal-*"
+    virtualization-type = "hvm"
+  }
+  most_recent = true
+  owners      = ["amazon"]
+  region      = var.region
+}
+
+source "amazon-ebs" "elastic-ci-stack-ami" {
+  ami_description = "Buildkite Elastic Stack (Amazon Linux 2023 w/ docker)"
+  ami_groups      = ["all"]
+  ami_name        = "buildkite-stack-linux-${var.arch}-${replace(timestamp(), ":", "-")}"
+  instance_type   = var.instance_type
+  region          = var.region
+  source_ami      = data.amazon-ami.al2023.id
+  ssh_username    = "ec2-user"
+
+  tags = {
+    Name          = "elastic-ci-stack-linux-${var.arch}"
+    OSVersion     = "Amazon Linux 2023"
+    BuildNumber   = var.build_number
+    IsReleased    = var.is_released
+    SourceAMIID   = data.amazon-ami.al2023.id
+    SourceAMIName = data.amazon-ami.al2023.name
+  }
+}
+
+build {
+  sources = ["source.amazon-ebs.elastic-ci-stack-ami"]
+
+  provisioner "file" {
+    destination = "/tmp"
+    source      = "conf"
+  }
+
+  provisioner "file" {
+    destination = "/tmp/plugins"
+    source      = "../../plugins"
+  }
+
+  provisioner "shell" {
+    script = "scripts/install-utils.sh"
+  }
+
+  provisioner "shell" {
+    script = "scripts/install-cloudwatch-agent.sh"
+  }
+
+  provisioner "shell" {
+    script = "scripts/install-docker.sh"
+  }
+
+  provisioner "shell" {
+    script = "scripts/install-buildkite-agent.sh"
+  }
+
+  provisioner "shell" {
+    script = "scripts/install-buildkite-utils.sh"
+  }
+
+  provisioner "shell" {
+    inline = ["rm /home/ec2-user/.ssh/authorized_keys"]
+  }
+}