From 21ebd3419f6de49ee9f78cac84173ab8f872a1b7 Mon Sep 17 00:00:00 2001
From: Lujie Duan <lujieduan@google.com>
Date: Thu, 9 Jul 2026 18:13:39 +0000
Subject: [PATCH 1/2] Add Kokoro build configs for new distro resolute_x86_64

---
 kokoro/config/build/presubmit/resolute_x86_64.gcl      | 10 ++++++++++
 .../test/ops_agent/presubmit/resolute_x86_64.gcl       | 10 ++++++++++
 .../config/test/ops_agent/release/resolute_x86_64.gcl  | 10 ++++++++++
 .../third_party_apps/presubmit/resolute_x86_64.gcl     | 10 ++++++++++
 .../test/third_party_apps/release/resolute_x86_64.gcl  | 10 ++++++++++
 project.yaml                                           | 10 ++++++++++
 6 files changed, 60 insertions(+)
 create mode 100644 kokoro/config/build/presubmit/resolute_x86_64.gcl
 create mode 100644 kokoro/config/test/ops_agent/presubmit/resolute_x86_64.gcl
 create mode 100644 kokoro/config/test/ops_agent/release/resolute_x86_64.gcl
 create mode 100644 kokoro/config/test/third_party_apps/presubmit/resolute_x86_64.gcl
 create mode 100644 kokoro/config/test/third_party_apps/release/resolute_x86_64.gcl

diff --git a/kokoro/config/build/presubmit/resolute_x86_64.gcl b/kokoro/config/build/presubmit/resolute_x86_64.gcl
new file mode 100644
index 0000000000..81e2f8640e
--- /dev/null
+++ b/kokoro/config/build/presubmit/resolute_x86_64.gcl
@@ -0,0 +1,10 @@
+import '../common.gcl' as common
+
+config build = common.build {
+  params {
+    environment {
+      DISTRO = 'resolute'
+      PKGFORMAT = 'deb'
+    }
+  }
+}
diff --git a/kokoro/config/test/ops_agent/presubmit/resolute_x86_64.gcl b/kokoro/config/test/ops_agent/presubmit/resolute_x86_64.gcl
new file mode 100644
index 0000000000..9a60c98478
--- /dev/null
+++ b/kokoro/config/test/ops_agent/presubmit/resolute_x86_64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.ops_agent_test {
+  params {
+    environment {
+      TARGET = 'resolute'
+      ARCH = 'x86_64'
+    }
+  }
+}
diff --git a/kokoro/config/test/ops_agent/release/resolute_x86_64.gcl b/kokoro/config/test/ops_agent/release/resolute_x86_64.gcl
new file mode 100644
index 0000000000..9a60c98478
--- /dev/null
+++ b/kokoro/config/test/ops_agent/release/resolute_x86_64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.ops_agent_test {
+  params {
+    environment {
+      TARGET = 'resolute'
+      ARCH = 'x86_64'
+    }
+  }
+}
diff --git a/kokoro/config/test/third_party_apps/presubmit/resolute_x86_64.gcl b/kokoro/config/test/third_party_apps/presubmit/resolute_x86_64.gcl
new file mode 100644
index 0000000000..a8fdd2602a
--- /dev/null
+++ b/kokoro/config/test/third_party_apps/presubmit/resolute_x86_64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'resolute'
+      ARCH = 'x86_64'
+    }
+  }
+}
diff --git a/kokoro/config/test/third_party_apps/release/resolute_x86_64.gcl b/kokoro/config/test/third_party_apps/release/resolute_x86_64.gcl
new file mode 100644
index 0000000000..a8fdd2602a
--- /dev/null
+++ b/kokoro/config/test/third_party_apps/release/resolute_x86_64.gcl
@@ -0,0 +1,10 @@
+import 'common.gcl' as common
+
+config build = common.third_party_apps_test {
+  params {
+    environment {
+      TARGET = 'resolute'
+      ARCH = 'x86_64'
+    }
+  }
+}
diff --git a/project.yaml b/project.yaml
index 0e754b9a5f..b3f36d0273 100644
--- a/project.yaml
+++ b/project.yaml
@@ -13,6 +13,16 @@
 # limitations under the License.
 
 targets:
+  resolute:
+    package_extension:
+      deb
+    architectures:
+      x86_64:
+        test_distros:
+          representative:
+          - ubuntu-os-cloud:ubuntu-2604-lts-amd64
+          exhaustive:
+          - ubuntu-os-cloud:ubuntu-minimal-2604-lts-amd64
   questing:
     os_versions: [ubuntu-25.10*]
     package_extension:

From 75de96b5ee23cafad2111cebe5031c08a77faf69 Mon Sep 17 00:00:00 2001
From: Lujie Duan <lujieduan@google.com>
Date: Thu, 9 Jul 2026 14:18:27 -0400
Subject: [PATCH 2/2] Remove extra project.yaml section

---
 project.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/project.yaml b/project.yaml
index b3f36d0273..0e754b9a5f 100644
--- a/project.yaml
+++ b/project.yaml
@@ -13,16 +13,6 @@
 # limitations under the License.
 
 targets:
-  resolute:
-    package_extension:
-      deb
-    architectures:
-      x86_64:
-        test_distros:
-          representative:
-          - ubuntu-os-cloud:ubuntu-2604-lts-amd64
-          exhaustive:
-          - ubuntu-os-cloud:ubuntu-minimal-2604-lts-amd64
   questing:
     os_versions: [ubuntu-25.10*]
     package_extension: