Merge pull request #1181 from buildkite/pdp-1415-using-nvme-storage-appears-to-fail-in-v600

Author: triarius

.buildkite/steps/launch.sh

@@ -31,7 +31,8 @@ if [[ "$os" == "windows" ]]; then
 fi
 
 if [[ "$arch" == "arm64" ]]; then
-  instance_type="t4g.small"
+  instance_type="m6gd.medium"
+  enable_instance_storage="true"
 fi
 
 cat << EOF > config.json
@@ -95,6 +96,10 @@ cat << EOF > config.json
   {
     "ParameterKey": "ScaleInIdlePeriod",
     "ParameterValue": "60"
+  },
+  {
+    "ParameterKey": "EnableInstanceStorage",
+    "ParameterValue": "${enable_instance_storage:-false}"
   }
 ]
 EOF

goss.yaml

@@ -140,9 +140,10 @@ command:
   /usr/local/bin/docker-low-disk-gc:
     exit-status: 0
 
+  # test that we can build a docker image
   docker buildx build -f tests/Dockerfile --progress=plain -t buildkite-postgres:latest tests:
     exit-status: 0
-    timeout: 30000
+    timeout: 60000
 
   # Check docker userns is enabled
   # Note that goss will evaluate the outer layer of templating, and docker will evaluate the second
@@ -166,7 +167,7 @@ command:
   # Check that docker containers can run
   docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker:latest version:
     exit-status: 0
-    timeout: 30000
+    timeout: 60000
 
   # Check that userns allows writing as buildkite-agent
   sh -c 'docker run --rm -v "$PWD:/pwd" alpine:latest touch /pwd/test && stat -c %U:%G test' && rm test:

packer/linux/conf/bin/bk-configure-docker.sh

@@ -32,6 +32,7 @@ fi
 
 # Move docker root to the ephemeral device
 if [[ "${BUILDKITE_ENABLE_INSTANCE_STORAGE:-false}" == "true" ]]; then
+  mkdir -p /mnt/ephemeral/docker
   cat <<< "$(jq '."data-root"="/mnt/ephemeral/docker"' /etc/docker/daemon.json)" > /etc/docker/daemon.json
 fi
 

packer/linux/conf/bin/bk-mount-instance-storage.sh

@@ -8,7 +8,6 @@ exec > >(tee -a /var/log/elastic-stack.log | logger -t user-data -s 2>/dev/conso
 # Mount instance storage if we can
 # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html
 
-# Move docker root to the ephemeral device
 if [[ "${BUILDKITE_ENABLE_INSTANCE_STORAGE:-false}" != "true" ]]; then
   echo "Skipping mounting instance storage"
   exit 0
@@ -17,8 +16,7 @@ fi
 #shellcheck disable=SC2207
 devices=($(nvme list | grep "Amazon EC2 NVMe Instance Storage" | cut -f1 -d' '))
 
-if [ -z "${devices[*]}" ]
-then
+if [ -z "${devices[*]}" ]; then
   echo "No Instance Storage NVMe drives to mount" >&2
   exit 0
 fi