Undo workaround to bookworm configs

antonblock · antonblock · commit cf0876487dc7 · 2025-11-01T16:43:05.000-04:00
diff --git a/kokoro/config/build/presubmit/bookworm_aarch64.gcl b/kokoro/config/build/presubmit/bookworm_aarch64.gcl
@@ -3,7 +3,7 @@ import '../common.gcl' as common
 config build = common.build {
   params {
     environment {
-      DISTRO = 'plucky'
+      DISTRO = 'bookworm'
       PKGFORMAT = 'deb'
     }
   }
diff --git a/kokoro/config/build/presubmit/bookworm_x86_64.gcl b/kokoro/config/build/presubmit/bookworm_x86_64.gcl
@@ -3,7 +3,7 @@ import '../common.gcl' as common
 config build = common.build {
   params {
     environment {
-      DISTRO = 'plucky'
+      DISTRO = 'bookworm'
       PKGFORMAT = 'deb'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/bookworm_aarch64.gcl b/kokoro/config/test/ops_agent/presubmit/bookworm_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bookworm'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/bookworm_aarch64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/bookworm_aarch64_uap_plugin.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bookworm'
       ARCH = 'aarch64'
       IS_OPS_AGENT_UAP_PLUGIN = 'true'
     }
diff --git a/kokoro/config/test/ops_agent/presubmit/bookworm_x86_64.gcl b/kokoro/config/test/ops_agent/presubmit/bookworm_x86_64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bookworm'
       ARCH = 'x86_64'
     }
   }
diff --git a/kokoro/config/test/ops_agent/presubmit/bookworm_x86_64_uap_plugin.gcl b/kokoro/config/test/ops_agent/presubmit/bookworm_x86_64_uap_plugin.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bookworm'
       ARCH = 'x86_64'
       IS_OPS_AGENT_UAP_PLUGIN = 'true'
     }
diff --git a/kokoro/config/test/ops_agent/release/bullseye_aarch64.gcl b/kokoro/config/test/ops_agent/release/bullseye_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bullseye'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/ops_agent/release/bullseye_x86_64.gcl b/kokoro/config/test/ops_agent/release/bullseye_x86_64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.ops_agent_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bullseye'
       ARCH = 'x86_64'
     }
   }
diff --git a/kokoro/config/test/third_party_apps/presubmit/bookworm_aarch64.gcl b/kokoro/config/test/third_party_apps/presubmit/bookworm_aarch64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.third_party_apps_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bookworm'
       ARCH = 'aarch64'
     }
   }
diff --git a/kokoro/config/test/third_party_apps/presubmit/bookworm_x86_64.gcl b/kokoro/config/test/third_party_apps/presubmit/bookworm_x86_64.gcl
@@ -3,7 +3,7 @@ import 'common.gcl' as common
 config build = common.third_party_apps_test {
   params {
     environment {
-      TARGET = 'plucky'
+      TARGET = 'bookworm'
       ARCH = 'x86_64'
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import '../common.gcl' as common`
`3`	`3`	`config build = common.build {`
`4`	`4`	`params {`
`5`	`5`	`environment {`
`6`		`- DISTRO = 'plucky'`
	`6`	`+ DISTRO = 'bookworm'`
`7`	`7`	`PKGFORMAT = 'deb'`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import 'common.gcl' as common`
`3`	`3`	`config build = common.ops_agent_test {`
`4`	`4`	`params {`
`5`	`5`	`environment {`
`6`		`- TARGET = 'plucky'`
	`6`	`+ TARGET = 'bookworm'`
`7`	`7`	`ARCH = 'aarch64'`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import 'common.gcl' as common`
`3`	`3`	`config build = common.third_party_apps_test {`
`4`	`4`	`params {`
`5`	`5`	`environment {`
`6`		`- TARGET = 'plucky'`
	`6`	`+ TARGET = 'bookworm'`
`7`	`7`	`ARCH = 'aarch64'`
`8`	`8`	`}`
`9`	`9`	`}`