Merge pull request #34527 from def-/pr-scratch

def- · web-flow · commit 12b93c19fc4b · 2025-12-16T10:11:36.000+01:00
bin/scratch: Update to Ubuntu 24.04 LTS
diff --git a/misc/python/materialize/cli/scratch/__init__.py b/misc/python/materialize/cli/scratch/__init__.py
@@ -17,3 +17,6 @@ def check_required_vars() -> None:
         os.environ["AWS_PROFILE"] = "mz-scratch-admin"
         if not os.environ.get("AWS_DEFAULT_REGION"):
             os.environ["AWS_DEFAULT_REGION"] = "us-east-1"
+    # Can't run with those set, use SSO instead
+    os.environ.pop("AWS_ACCESS_KEY_ID", None)
+    os.environ.pop("AWS_SECRET_ACCESS_KEY", None)
diff --git a/misc/scratch/big-dev-box.json b/misc/scratch/big-dev-box.json
@@ -2,7 +2,7 @@
     "name": "one-off load testing",
     "launch_script": "true",
     "instance_type": "r5a.4xlarge",
-    "ami": "ami-09d56f8956ab235b3",
+    "ami": "ami-0ecb62995f68bb549",
     "size_gb": 200,
     "tags": {}
 }
diff --git a/misc/scratch/ci-aarch64-large.json b/misc/scratch/ci-aarch64-large.json
@@ -1,8 +1,8 @@
 {
-    "name": "c7g.12xlarge as used by CI, when a large box is needed (aarch64-large)",
+    "name": "c8g.12xlarge as used by CI, when a large box is needed (aarch64-large)",
     "launch_script": "true",
-    "instance_type": "c7g.12xlarge",
-    "ami": "ami-0568072f574d822a4",
+    "instance_type": "c8g.12xlarge",
+    "ami": "ami-01b9f1e7dc427266e",
     "size_gb": 128,
     "tags": {}
 }
diff --git a/misc/scratch/ci-aarch64-medium.json b/misc/scratch/ci-aarch64-medium.json
@@ -1,8 +1,8 @@
 {
-    "name": "c7g.4xlarge as used by CI, when a medium box is needed (aarch64-medium)",
+    "name": "c8g.4xlarge as used by CI, when a medium box is needed (aarch64-medium)",
     "launch_script": "true",
-    "instance_type": "c7g.4xlarge",
-    "ami": "ami-0568072f574d822a4",
+    "instance_type": "c8g.4xlarge",
+    "ami": "ami-01b9f1e7dc427266e",
     "size_gb": 128,
     "tags": {}
 }
diff --git a/misc/scratch/ci-aarch64.json b/misc/scratch/ci-aarch64.json
@@ -1,8 +1,8 @@
 {
-    "name": "c7g.2xlarge as used by the CI (aarch64)",
+    "name": "c8g.2xlarge as used by the CI (aarch64)",
     "launch_script": "true",
-    "instance_type": "c7g.2xlarge",
-    "ami": "ami-0568072f574d822a4",
+    "instance_type": "c8g.2xlarge",
+    "ami": "ami-01b9f1e7dc427266e",
     "size_gb": 128,
     "tags": {}
 }
diff --git a/misc/scratch/ci-x86_64-large.json b/misc/scratch/ci-x86_64-large.json
@@ -2,7 +2,7 @@
     "name": "m7a.8xlarge as used by CI",
     "launch_script": "true",
     "instance_type": "m7a.8xlarge",
-    "ami": "ami-09d56f8956ab235b3",
+    "ami": "ami-0ecb62995f68bb549",
     "size_gb": 250,
     "tags": {}
 }
diff --git a/misc/scratch/ci.json b/misc/scratch/ci.json
@@ -1,8 +1,8 @@
 {
-    "name": "c6a.2xlarge as used by the CI",
+    "name": "c7a.2xlarge as used by the CI",
     "launch_script": "true",
-    "instance_type": "c6a.2xlarge",
-    "ami": "ami-09d56f8956ab235b3",
+    "instance_type": "c7a.2xlarge",
+    "ami": "ami-0ecb62995f68bb549",
     "size_gb": 128,
     "tags": {}
 }
diff --git a/misc/scratch/dev-box.json b/misc/scratch/dev-box.json
@@ -2,7 +2,7 @@
     "name": "one-off testing",
     "launch_script": "true",
     "instance_type": "t3.2xlarge",
-    "ami": "ami-09d56f8956ab235b3",
+    "ami": "ami-0ecb62995f68bb549",
     "size_gb": 50,
     "tags": {}
 }
diff --git a/misc/scratch/persist-benchmarking.json b/misc/scratch/persist-benchmarking.json
@@ -2,7 +2,7 @@
     "name": "persist benchmarking",
     "launch_script": "true",
     "instance_type": "m6i.8xlarge",
-    "ami": "ami-09d56f8956ab235b3",
+    "ami": "ami-0ecb62995f68bb549",
     "size_gb": 200,
     "tags": {}
 }
diff --git a/misc/scratch/remote-dev.json b/misc/scratch/remote-dev.json
@@ -1,8 +1,8 @@
 {
   "name": "vs code remote dev",
   "launch_script": "true",
-  "instance_type": "c6a.4xlarge",
-  "ami": "ami-09d56f8956ab235b3",
+  "instance_type": "c7a.4xlarge",
+  "ami": "ami-0ecb62995f68bb549",
   "size_gb": 100,
   "tags": {}
 }
diff --git a/misc/scratch/small.json b/misc/scratch/small.json
@@ -2,7 +2,7 @@
   "name": "small",
   "launch_script": "true",
   "instance_type": "t3.small",
-  "ami": "ami-09d56f8956ab235b3",
+  "ami": "ami-0ecb62995f68bb549",
   "size_gb": 64,
   "tags": {}
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "one-off load testing",`
`3`	`3`	`"launch_script": "true",`
`4`	`4`	`"instance_type": "r5a.4xlarge",`
`5`		`- "ami": "ami-09d56f8956ab235b3",`
	`5`	`+ "ami": "ami-0ecb62995f68bb549",`
`6`	`6`	`"size_gb": 200,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`		`- "name": "c7g.12xlarge as used by CI, when a large box is needed (aarch64-large)",`
	`2`	`+ "name": "c8g.12xlarge as used by CI, when a large box is needed (aarch64-large)",`
`3`	`3`	`"launch_script": "true",`
`4`		`- "instance_type": "c7g.12xlarge",`
`5`		`- "ami": "ami-0568072f574d822a4",`
	`4`	`+ "instance_type": "c8g.12xlarge",`
	`5`	`+ "ami": "ami-01b9f1e7dc427266e",`
`6`	`6`	`"size_gb": 128,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`		`- "name": "c7g.4xlarge as used by CI, when a medium box is needed (aarch64-medium)",`
	`2`	`+ "name": "c8g.4xlarge as used by CI, when a medium box is needed (aarch64-medium)",`
`3`	`3`	`"launch_script": "true",`
`4`		`- "instance_type": "c7g.4xlarge",`
`5`		`- "ami": "ami-0568072f574d822a4",`
	`4`	`+ "instance_type": "c8g.4xlarge",`
	`5`	`+ "ami": "ami-01b9f1e7dc427266e",`
`6`	`6`	`"size_gb": 128,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`		`- "name": "c7g.2xlarge as used by the CI (aarch64)",`
	`2`	`+ "name": "c8g.2xlarge as used by the CI (aarch64)",`
`3`	`3`	`"launch_script": "true",`
`4`		`- "instance_type": "c7g.2xlarge",`
`5`		`- "ami": "ami-0568072f574d822a4",`
	`4`	`+ "instance_type": "c8g.2xlarge",`
	`5`	`+ "ami": "ami-01b9f1e7dc427266e",`
`6`	`6`	`"size_gb": 128,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "m7a.8xlarge as used by CI",`
`3`	`3`	`"launch_script": "true",`
`4`	`4`	`"instance_type": "m7a.8xlarge",`
`5`		`- "ami": "ami-09d56f8956ab235b3",`
	`5`	`+ "ami": "ami-0ecb62995f68bb549",`
`6`	`6`	`"size_gb": 250,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`		`- "name": "c6a.2xlarge as used by the CI",`
	`2`	`+ "name": "c7a.2xlarge as used by the CI",`
`3`	`3`	`"launch_script": "true",`
`4`		`- "instance_type": "c6a.2xlarge",`
`5`		`- "ami": "ami-09d56f8956ab235b3",`
	`4`	`+ "instance_type": "c7a.2xlarge",`
	`5`	`+ "ami": "ami-0ecb62995f68bb549",`
`6`	`6`	`"size_gb": 128,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "one-off testing",`
`3`	`3`	`"launch_script": "true",`
`4`	`4`	`"instance_type": "t3.2xlarge",`
`5`		`- "ami": "ami-09d56f8956ab235b3",`
	`5`	`+ "ami": "ami-0ecb62995f68bb549",`
`6`	`6`	`"size_gb": 50,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "persist benchmarking",`
`3`	`3`	`"launch_script": "true",`
`4`	`4`	`"instance_type": "m6i.8xlarge",`
`5`		`- "ami": "ami-09d56f8956ab235b3",`
	`5`	`+ "ami": "ami-0ecb62995f68bb549",`
`6`	`6`	`"size_gb": 200,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vs code remote dev",`
`3`	`3`	`"launch_script": "true",`
`4`		`- "instance_type": "c6a.4xlarge",`
`5`		`- "ami": "ami-09d56f8956ab235b3",`
	`4`	`+ "instance_type": "c7a.4xlarge",`
	`5`	`+ "ami": "ami-0ecb62995f68bb549",`
`6`	`6`	`"size_gb": 100,`
`7`	`7`	`"tags": {}`
`8`	`8`	`}`