Add a skylab_model field to target test requirements HwTest proto.

Add a skylab_model field to the target test requirements HwTest protocol
buffer. This will be used to make more specific test configurations for
release builders.


Change-Id: I5abebca3cc93949a728b2dccb69036a283a1362c
Reviewed-by: Sean Abraham <>
Commit-Queue: David Burger <>
Tested-by: David Burger <>
diff --git a/go/testplans/target_test_requirements_config.pb.go b/go/testplans/target_test_requirements_config.pb.go
index e53cefe..7cb63a8 100644
--- a/go/testplans/target_test_requirements_config.pb.go
+++ b/go/testplans/target_test_requirements_config.pb.go
@@ -206,7 +206,10 @@
 	// word.
 	// e.g. could use device_target 'caroline' to test the build_target
 	// 'caroline-arcnext'.
-	SkylabBoard     string                    `protobuf:"bytes,11,opt,name=skylab_board,json=skylabBoard,proto3" json:"skylab_board,omitempty"`
+	SkylabBoard string `protobuf:"bytes,11,opt,name=skylab_board,json=skylabBoard,proto3" json:"skylab_board,omitempty"`
+	// Key that further specifies the device to test on in Skylab.
+	// e.g. for skylab_board 'octopus', may require skylab_model 'ampton'
+	SkylabModel     string                    `protobuf:"bytes,15,opt,name=skylab_model,json=skylabModel,proto3" json:"skylab_model,omitempty"`
 	HwTestSuiteType HwTestCfg_HwTestSuiteType `protobuf:"varint,13,opt,name=hw_test_suite_type,json=hwTestSuiteType,proto3,enum=testplans.HwTestCfg_HwTestSuiteType" json:"hw_test_suite_type,omitempty"`
 	// The swarming pool in which to run the test suite, e.g. DUT_POOL_QUOTA.
 	Pool                 string   `protobuf:"bytes,14,opt,name=pool,proto3" json:"pool,omitempty"`
@@ -261,6 +264,13 @@
 	return ""
+func (m *HwTestCfg_HwTest) GetSkylabModel() string {
+	if m != nil {
+		return m.SkylabModel
+	}
+	return ""
 func (m *HwTestCfg_HwTest) GetHwTestSuiteType() HwTestCfg_HwTestSuiteType {
 	if m != nil {
 		return m.HwTestSuiteType
@@ -812,63 +822,64 @@
 var fileDescriptor_4af54ecd79c6f0f9 = []byte{
-	// 922 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x92, 0xdb, 0xc4,
-	0x13, 0x8e, 0x6c, 0xc7, 0x2b, 0xb7, 0xbc, 0xb6, 0x7e, 0xf3, 0x4b, 0x15, 0x5a, 0x07, 0x52, 0x46,
-	0x81, 0x2a, 0x53, 0x50, 0x76, 0x95, 0xb3, 0x70, 0xe0, 0xb6, 0xde, 0x38, 0xd9, 0x5d, 0x2a, 0xcb,
-	0x22, 0x6b, 0x43, 0xc1, 0x45, 0x25, 0xc9, 0x63, 0x59, 0x85, 0xe4, 0x11, 0xa3, 0xf1, 0x6e, 0x7c,
-	0xe5, 0x71, 0xa8, 0xca, 0x85, 0x13, 0x27, 0x1e, 0x86, 0x77, 0xe0, 0x4e, 0x69, 0x66, 0xac, 0x3f,
-	0x76, 0x0c, 0xe1, 0xe4, 0x99, 0x9e, 0xee, 0xe9, 0xef, 0xeb, 0x6f, 0xba, 0x2d, 0x18, 0x31, 0x9c,
-	0xb2, 0x24, 0x72, 0x57, 0xe9, 0x88, 0xb9, 0x34, 0xc0, 0xcc, 0xc9, 0x0c, 0x0e, 0xc5, 0x3f, 0xaf,
-	0x43, 0x8a, 0x63, 0xbc, 0x62, 0xa9, 0xe3, 0x93, 0xd5, 0x22, 0x0c, 0x86, 0x09, 0x25, 0x8c, 0xa0,
-	0x56, 0x1e, 0xd0, 0x7b, 0x12, 0x10, 0x12, 0x44, 0x78, 0xc4, 0x0f, 0xbc, 0xf5, 0x62, 0x74, 0x4f,
-	0xdd, 0x24, 0xc1, 0x34, 0x15, 0xae, 0xe6, 0xdb, 0x1a, 0x74, 0x6d, 0x9c, 0xb2, 0xd9, 0x3a, 0x64,
-	0xf8, 0x9c, 0xc4, 0x31, 0x59, 0xa1, 0x8f, 0xa1, 0x3d, 0x0f, 0xd3, 0x24, 0x72, 0x37, 0xce, 0xca,
-	0x8d, 0xb1, 0xa1, 0xf4, 0x95, 0x41, 0xcb, 0xd2, 0xa4, 0xed, 0xda, 0x8d, 0x31, 0xfa, 0x0a, 0x54,
-	0x9f, 0x86, 0x2c, 0xf4, 0xdd, 0xc8, 0xa8, 0xf5, 0x95, 0x81, 0x36, 0xee, 0x0d, 0x45, 0xa6, 0xe1,
-	0x36, 0xd3, 0x70, 0x42, 0x48, 0xf4, 0xda, 0x8d, 0xd6, 0xd8, 0xca, 0x7d, 0xd1, 0x2d, 0xfc, 0x8f,
-	0x63, 0x4f, 0xb3, 0x74, 0x4e, 0x40, 0xc9, 0x3a, 0x49, 0x8d, 0x7a, 0xbf, 0x3e, 0xd0, 0xc6, 0x9f,
-	0x0d, 0x73, 0xd4, 0xc3, 0x1d, 0x44, 0xc5, 0xfe, 0x65, 0x16, 0x61, 0x75, 0x59, 0x65, 0x9f, 0xa2,
-	0x2f, 0x00, 0xcd, 0xc3, 0xd4, 0xf5, 0x22, 0xec, 0x78, 0x1b, 0x67, 0x8e, 0x17, 0xee, 0x3a, 0x62,
-	0x46, 0xa3, 0xaf, 0x0c, 0x54, 0x4b, 0x97, 0x27, 0x93, 0xcd, 0x73, 0x61, 0xef, 0x7d, 0x0d, 0x9d,
-	0xea, 0x85, 0x68, 0x00, 0xfa, 0x2e, 0x2c, 0xc9, 0xba, 0x53, 0x4d, 0x65, 0xfe, 0x55, 0x83, 0xd6,
-	0xc5, 0x7d, 0x16, 0x7e, 0xbe, 0x08, 0xd0, 0x29, 0x1c, 0x2d, 0xef, 0xb9, 0x1a, 0x86, 0xc2, 0x49,
-	0x3c, 0x2e, 0x91, 0xc8, 0xdd, 0xe4, 0xca, 0x6a, 0x2e, 0xf9, 0x6f, 0xef, 0x4f, 0x05, 0x9a, 0xc2,
-	0x84, 0xc6, 0xd0, 0xf4, 0x39, 0x45, 0xa3, 0x2d, 0xab, 0x78, 0xb0, 0x08, 0x96, 0xf4, 0x44, 0x8f,
-	0xe0, 0x21, 0xc7, 0x29, 0x11, 0x8a, 0x4d, 0x26, 0x5a, 0xfa, 0xd3, 0x26, 0x72, 0x3d, 0xc7, 0x23,
-	0x2e, 0x9d, 0x1b, 0x9a, 0x10, 0x4d, 0xd8, 0x26, 0x99, 0x09, 0x7d, 0x07, 0x48, 0xa2, 0x95, 0x44,
-	0xd9, 0x26, 0xc1, 0xc6, 0x71, 0x5f, 0x19, 0x74, 0xc6, 0x9f, 0xfc, 0x03, 0x70, 0x0e, 0xc2, 0xde,
-	0x24, 0xd8, 0xea, 0x2e, 0xab, 0x06, 0x84, 0xa0, 0x91, 0x10, 0x12, 0x19, 0x1d, 0x9e, 0x8d, 0xaf,
-	0xaf, 0x1a, 0x6a, 0x4d, 0xd7, 0xcc, 0x57, 0xd0, 0xdd, 0x89, 0x46, 0x26, 0x3c, 0xb9, 0xf8, 0xde,
-	0xb1, 0xa7, 0x33, 0xdb, 0x99, 0xdd, 0x5e, 0xda, 0x53, 0xc7, 0xfe, 0xe1, 0x66, 0xea, 0xdc, 0x5e,
-	0xcf, 0x6e, 0xa6, 0xe7, 0x97, 0x2f, 0x2e, 0xa7, 0xcf, 0xf5, 0x07, 0xa8, 0x0d, 0xea, 0xd9, 0xad,
-	0xfd, 0x6d, 0xe6, 0xa4, 0x2b, 0x48, 0x85, 0x86, 0x7d, 0x36, 0xb3, 0xf5, 0x9a, 0xf9, 0x87, 0x02,
-	0xdd, 0x57, 0xc4, 0x8b, 0x5c, 0xef, 0x75, 0xbc, 0xad, 0xfe, 0x0b, 0xd0, 0x62, 0x6e, 0x2a, 0x2b,
-	0xf0, 0x69, 0x89, 0xc8, 0x4e, 0x80, 0xdc, 0x73, 0x2d, 0x20, 0xce, 0xd7, 0x3d, 0x1f, 0xa0, 0x38,
-	0x29, 0x49, 0x52, 0x7f, 0x6f, 0x49, 0x1e, 0x03, 0x6f, 0x39, 0x51, 0x50, 0x21, 0x8b, 0x9a, 0x19,
-	0x32, 0xda, 0xbc, 0x1e, 0x75, 0xf3, 0xf7, 0x1a, 0x1c, 0xdb, 0x6e, 0xca, 0x0a, 0xf8, 0x53, 0x68,
-	0x33, 0x37, 0x65, 0xce, 0x5d, 0x5c, 0xc6, 0xff, 0xb4, 0x9c, 0xae, 0xec, 0x5f, 0xda, 0x59, 0xc0,
-	0xf2, 0x75, 0xef, 0x73, 0x68, 0x67, 0x27, 0xd9, 0x7a, 0xfa, 0x26, 0xa1, 0x39, 0x16, 0xfc, 0x26,
-	0xa1, 0x65, 0x2c, 0xd9, 0x61, 0xef, 0x37, 0x05, 0xa0, 0xb8, 0xa7, 0xc4, 0xb5, 0xf1, 0xde, 0x5c,
-	0x3f, 0x02, 0x10, 0xaf, 0xa7, 0x34, 0x1b, 0x5a, 0xdc, 0xc2, 0x27, 0xc3, 0x37, 0xd0, 0xe1, 0xac,
-	0x0a, 0x0c, 0xb5, 0x3d, 0x5d, 0xf6, 0x79, 0x6d, 0xd1, 0x5b, 0xbc, 0x24, 0xdb, 0xdd, 0x55, 0x43,
-	0xad, 0xeb, 0x0d, 0xf3, 0x57, 0x05, 0x5a, 0x45, 0xd9, 0x4e, 0xe1, 0xa8, 0x5a, 0xb1, 0x72, 0xcf,
-	0x15, 0xb7, 0xca, 0x4a, 0x35, 0xef, 0x44, 0x95, 0x02, 0x68, 0xee, 0x71, 0x56, 0xff, 0x0b, 0xe7,
-	0xa2, 0x6d, 0xf8, 0xc0, 0x6b, 0x59, 0xad, 0x7c, 0x32, 0x5c, 0x35, 0x54, 0x45, 0xaf, 0x71, 0xb0,
-	0xaa, 0x19, 0x40, 0xc7, 0xe6, 0x43, 0xfa, 0x9c, 0x86, 0x0c, 0xd3, 0xd0, 0x45, 0x4f, 0xa1, 0xed,
-	0xad, 0xc3, 0x68, 0xee, 0x88, 0xe1, 0x2d, 0xc2, 0x2f, 0x1e, 0x58, 0x1a, 0xb7, 0x0a, 0xe7, 0xac,
-	0x7d, 0xf9, 0x16, 0x53, 0x51, 0xd7, 0xba, 0x68, 0x5f, 0x69, 0xcb, 0x2a, 0x3b, 0x39, 0x06, 0x6d,
-	0x3b, 0xfe, 0x37, 0x09, 0x36, 0xdf, 0xd6, 0xe1, 0xe4, 0x06, 0x53, 0x11, 0xcf, 0xb9, 0x96, 0xfe,
-	0x0f, 0xd0, 0x04, 0xba, 0xd2, 0xd9, 0x97, 0x38, 0xb8, 0x54, 0xda, 0xf8, 0xa4, 0xa2, 0x43, 0x19,
-	0xa8, 0xd5, 0x61, 0x55, 0xe0, 0xa7, 0xa0, 0x6d, 0xe7, 0x85, 0xbf, 0x08, 0x64, 0x3b, 0x3c, 0x7a,
-	0xd7, 0xa0, 0xb0, 0x5a, 0xcb, 0x7c, 0x26, 0xbe, 0x04, 0x24, 0xbb, 0x52, 0xca, 0xc4, 0x83, 0xf7,
-	0xdf, 0xd7, 0x4e, 0x73, 0x5a, 0xdd, 0x78, 0xa7, 0xbd, 0x4f, 0x41, 0x2b, 0xdf, 0xf0, 0x70, 0x2f,
-	0x7d, 0x11, 0xdb, 0xba, 0xcb, 0xa3, 0xce, 0x40, 0x2f, 0x77, 0x15, 0x0f, 0x6d, 0xf2, 0x50, 0xe3,
-	0xd0, 0x0b, 0xb4, 0x8e, 0x59, 0xa5, 0x31, 0xaf, 0xe1, 0x83, 0x79, 0x48, 0xb1, 0xcf, 0x9c, 0xbd,
-	0x9b, 0x8e, 0xfe, 0xe5, 0xa6, 0xff, 0x8b, 0xc0, 0x8a, 0x51, 0x0e, 0x80, 0x5f, 0x14, 0x38, 0x79,
-	0xb7, 0x58, 0x59, 0x4e, 0x0c, 0x1f, 0x26, 0x98, 0x3a, 0x87, 0xfe, 0xdf, 0xe5, 0x53, 0x2f, 0x4f,
-	0xe9, 0x83, 0xda, 0x5b, 0x27, 0xc9, 0xa1, 0xa3, 0xc9, 0x97, 0x3f, 0x3e, 0x0b, 0xc8, 0xd0, 0x5f,
-	0x52, 0x12, 0x87, 0xeb, 0x78, 0x48, 0x68, 0x30, 0xda, 0x6e, 0x48, 0x3a, 0x0a, 0x57, 0x0b, 0xea,
-	0x8a, 0x4f, 0x85, 0x51, 0x40, 0x8a, 0xcf, 0x0e, 0xaf, 0xc9, 0x6d, 0xcf, 0xfe, 0x0e, 0x00, 0x00,
-	0xff, 0xff, 0xc7, 0xf2, 0x5d, 0x2b, 0x8a, 0x08, 0x00, 0x00,
+	// 933 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x41, 0x8f, 0xdb, 0x44,
+	0x14, 0xae, 0x93, 0x34, 0xeb, 0x3c, 0x67, 0x93, 0x30, 0x54, 0xc2, 0x9b, 0x42, 0xb5, 0xa4, 0x20,
+	0x05, 0x81, 0x12, 0x29, 0x5d, 0x38, 0x70, 0xdb, 0x6c, 0xd3, 0xee, 0x2e, 0xda, 0x65, 0x71, 0xbc,
+	0x45, 0x70, 0xb1, 0x6c, 0x67, 0xe2, 0x58, 0xd8, 0x19, 0x33, 0x9e, 0xec, 0x36, 0x57, 0x24, 0xfe,
+	0x03, 0xbf, 0x01, 0xa9, 0x17, 0x4e, 0x9c, 0xf8, 0x6d, 0xc8, 0x33, 0x13, 0x7b, 0x9c, 0x34, 0xd0,
+	0x9e, 0x32, 0xf3, 0xe6, 0xbd, 0x79, 0xdf, 0xf7, 0xbe, 0x79, 0x2f, 0x86, 0x21, 0xc3, 0x29, 0x4b,
+	0x22, 0x77, 0x99, 0x0e, 0x99, 0x4b, 0x03, 0xcc, 0x9c, 0xcc, 0xe0, 0x50, 0xfc, 0xeb, 0x2a, 0xa4,
+	0x38, 0xc6, 0x4b, 0x96, 0x3a, 0x3e, 0x59, 0xce, 0xc3, 0x60, 0x90, 0x50, 0xc2, 0x08, 0x6a, 0xe4,
+	0x01, 0xdd, 0x27, 0x01, 0x21, 0x41, 0x84, 0x87, 0xfc, 0xc0, 0x5b, 0xcd, 0x87, 0xf7, 0xd4, 0x4d,
+	0x12, 0x4c, 0x53, 0xe1, 0xda, 0x7b, 0x53, 0x81, 0xb6, 0x8d, 0x53, 0x36, 0x5d, 0x85, 0x0c, 0x9f,
+	0x91, 0x38, 0x26, 0x4b, 0xf4, 0x29, 0x34, 0x67, 0x61, 0x9a, 0x44, 0xee, 0xda, 0x59, 0xba, 0x31,
+	0x36, 0xb5, 0x63, 0xad, 0xdf, 0xb0, 0x0c, 0x69, 0xbb, 0x76, 0x63, 0x8c, 0xbe, 0x01, 0xdd, 0xa7,
+	0x21, 0x0b, 0x7d, 0x37, 0x32, 0x2b, 0xc7, 0x5a, 0xdf, 0x18, 0x75, 0x07, 0x22, 0xd3, 0x60, 0x93,
+	0x69, 0x30, 0x26, 0x24, 0x7a, 0xe5, 0x46, 0x2b, 0x6c, 0xe5, 0xbe, 0xe8, 0x16, 0x3e, 0xe0, 0xd8,
+	0xd3, 0x2c, 0x9d, 0x13, 0x50, 0xb2, 0x4a, 0x52, 0xb3, 0x7a, 0x5c, 0xed, 0x1b, 0xa3, 0x2f, 0x06,
+	0x39, 0xea, 0xc1, 0x16, 0xa2, 0x62, 0xff, 0x32, 0x8b, 0xb0, 0xda, 0xac, 0xb4, 0x4f, 0xd1, 0x57,
+	0x80, 0x66, 0x61, 0xea, 0x7a, 0x11, 0x76, 0xbc, 0xb5, 0x33, 0xc3, 0x73, 0x77, 0x15, 0x31, 0xb3,
+	0x76, 0xac, 0xf5, 0x75, 0xab, 0x23, 0x4f, 0xc6, 0xeb, 0xe7, 0xc2, 0xde, 0xfd, 0x16, 0x5a, 0xe5,
+	0x0b, 0x51, 0x1f, 0x3a, 0xdb, 0xb0, 0x24, 0xeb, 0x56, 0x39, 0x55, 0xef, 0x8f, 0x2a, 0x34, 0xce,
+	0xef, 0xb3, 0xf0, 0xb3, 0x79, 0x80, 0x4e, 0xe0, 0x60, 0x71, 0xcf, 0xd5, 0x30, 0x35, 0x4e, 0xe2,
+	0xb1, 0x42, 0x22, 0x77, 0x93, 0x2b, 0xab, 0xbe, 0xe0, 0xbf, 0xdd, 0xdf, 0x2b, 0x50, 0x17, 0x26,
+	0x34, 0x82, 0xba, 0xcf, 0x29, 0x9a, 0x4d, 0x59, 0xc5, 0xbd, 0x45, 0xb0, 0xa4, 0x27, 0x7a, 0x04,
+	0x0f, 0x39, 0x4e, 0x89, 0x50, 0x6c, 0x32, 0xd1, 0xd2, 0x5f, 0xd6, 0x91, 0xeb, 0x39, 0x1e, 0x71,
+	0xe9, 0xcc, 0x34, 0x84, 0x68, 0xc2, 0x36, 0xce, 0x4c, 0x8a, 0x4b, 0x4c, 0x66, 0x38, 0x32, 0xdb,
+	0xaa, 0xcb, 0x55, 0x66, 0x42, 0x3f, 0x00, 0x92, 0x84, 0x64, 0x2d, 0xd8, 0x3a, 0xc1, 0xe6, 0xe1,
+	0xb1, 0xd6, 0x6f, 0x8d, 0x3e, 0xfb, 0x0f, 0x6e, 0x1c, 0xa7, 0xbd, 0x4e, 0xb0, 0xd5, 0x5e, 0x94,
+	0x0d, 0x08, 0x41, 0x2d, 0x21, 0x24, 0x32, 0x5b, 0x3c, 0x1b, 0x5f, 0x5f, 0xd6, 0xf4, 0x4a, 0xc7,
+	0xe8, 0x5d, 0x41, 0x7b, 0x2b, 0x1a, 0xf5, 0xe0, 0xc9, 0xf9, 0x8f, 0x8e, 0x3d, 0x99, 0xda, 0xce,
+	0xf4, 0xf6, 0xc2, 0x9e, 0x38, 0xf6, 0x4f, 0x37, 0x13, 0xe7, 0xf6, 0x7a, 0x7a, 0x33, 0x39, 0xbb,
+	0x78, 0x71, 0x31, 0x79, 0xde, 0x79, 0x80, 0x9a, 0xa0, 0x9f, 0xde, 0xda, 0xdf, 0x67, 0x4e, 0x1d,
+	0x0d, 0xe9, 0x50, 0xb3, 0x4f, 0xa7, 0x76, 0xa7, 0xd2, 0xfb, 0x47, 0x83, 0xf6, 0x15, 0xf1, 0x22,
+	0xd7, 0x7b, 0x15, 0x6f, 0x04, 0x7a, 0x01, 0x46, 0xcc, 0x4d, 0xaa, 0x48, 0x9f, 0x2b, 0x44, 0xb6,
+	0x02, 0xe4, 0x9e, 0xcb, 0x05, 0x71, 0xbe, 0xee, 0xfa, 0x00, 0xc5, 0x89, 0xa2, 0x5a, 0xf5, 0x9d,
+	0x55, 0x7b, 0x0c, 0xbc, 0x2b, 0x45, 0x41, 0x85, 0x72, 0x7a, 0x66, 0xc8, 0x68, 0xf3, 0x7a, 0x54,
+	0x7b, 0x7f, 0x57, 0xe0, 0xd0, 0x76, 0x53, 0x56, 0xc0, 0x9f, 0x40, 0x93, 0xb9, 0x29, 0x73, 0xee,
+	0x62, 0x15, 0xff, 0x53, 0x35, 0x9d, 0xea, 0xaf, 0xec, 0x2c, 0x60, 0xf9, 0xba, 0xfb, 0x25, 0x34,
+	0xb3, 0x93, 0x6c, 0x3d, 0x79, 0x9d, 0xd0, 0x1c, 0x0b, 0x7e, 0x9d, 0x50, 0x15, 0x4b, 0x76, 0xd8,
+	0xfd, 0x4b, 0x03, 0x28, 0xee, 0x51, 0xb8, 0xd6, 0xde, 0x99, 0xeb, 0x27, 0x00, 0xe2, 0xf5, 0x28,
+	0xe3, 0xa3, 0xc1, 0x2d, 0x7c, 0x78, 0x7c, 0x07, 0x2d, 0xce, 0xaa, 0xc0, 0x50, 0xd9, 0xd1, 0x65,
+	0x97, 0xd7, 0x06, 0xbd, 0xc5, 0x4b, 0xb2, 0xd9, 0x5d, 0xd6, 0xf4, 0x6a, 0xa7, 0xd6, 0xfb, 0x53,
+	0x83, 0x46, 0x51, 0xb6, 0x13, 0x38, 0x28, 0x57, 0x4c, 0x6d, 0xcb, 0xe2, 0x56, 0x59, 0xa9, 0xfa,
+	0x9d, 0xa8, 0x52, 0x00, 0xf5, 0x1d, 0xce, 0xfa, 0xfb, 0x70, 0x2e, 0xda, 0x86, 0xcf, 0xc4, 0x86,
+	0xd5, 0xc8, 0x87, 0xc7, 0x65, 0x4d, 0xd7, 0x3a, 0x15, 0x0e, 0x56, 0xef, 0x05, 0xd0, 0xb2, 0xf9,
+	0x1c, 0x3f, 0xa3, 0x21, 0xc3, 0x34, 0x74, 0xd1, 0x53, 0x68, 0x7a, 0xab, 0x30, 0x9a, 0x39, 0x62,
+	0xbe, 0x8b, 0xf0, 0xf3, 0x07, 0x96, 0xc1, 0xad, 0xc2, 0x39, 0x6b, 0x5f, 0xbe, 0xc5, 0x54, 0xd4,
+	0xb5, 0x2a, 0xda, 0x57, 0xda, 0xb2, 0xca, 0x8e, 0x0f, 0xc1, 0xd8, 0xfc, 0x43, 0xac, 0x13, 0xdc,
+	0x7b, 0x53, 0x85, 0xa3, 0x1b, 0x4c, 0x45, 0x3c, 0xe7, 0xaa, 0xfc, 0x65, 0xa0, 0x31, 0xb4, 0xa5,
+	0xb3, 0x2f, 0x71, 0x70, 0xa9, 0x8c, 0xd1, 0x51, 0x49, 0x07, 0x15, 0xa8, 0xd5, 0x62, 0x65, 0xe0,
+	0x27, 0x60, 0x6c, 0xe6, 0x85, 0x3f, 0x0f, 0x64, 0x3b, 0x3c, 0x7a, 0xdb, 0xa0, 0xb0, 0x1a, 0x8b,
+	0x7c, 0x6c, 0xbe, 0x04, 0x24, 0xbb, 0x52, 0xca, 0xc4, 0x83, 0x77, 0xdf, 0xd7, 0x56, 0x73, 0x5a,
+	0xed, 0x78, 0xab, 0xbd, 0x4f, 0xc0, 0x50, 0x6f, 0x78, 0xb8, 0x93, 0xbe, 0x88, 0x6d, 0xdc, 0xe5,
+	0x51, 0xa7, 0xd0, 0x51, 0xbb, 0x8a, 0x87, 0xd6, 0x79, 0xa8, 0xb9, 0xef, 0x05, 0x5a, 0x87, 0xac,
+	0xd4, 0x98, 0xd7, 0xf0, 0xd1, 0x2c, 0xa4, 0xd8, 0x67, 0xce, 0xce, 0x4d, 0x07, 0xff, 0x73, 0xd3,
+	0x87, 0x22, 0xb0, 0x64, 0x94, 0x03, 0xe0, 0x37, 0x0d, 0x8e, 0xde, 0x2e, 0x56, 0x96, 0x13, 0xc3,
+	0xc7, 0x09, 0xa6, 0xce, 0xbe, 0x4f, 0x00, 0xf9, 0xd4, 0xd5, 0x29, 0xbd, 0x57, 0x7b, 0xeb, 0x28,
+	0xd9, 0x77, 0x34, 0xfe, 0xfa, 0xe7, 0x67, 0x01, 0x19, 0xf8, 0x0b, 0x4a, 0xe2, 0x70, 0x15, 0x0f,
+	0x08, 0x0d, 0x86, 0x9b, 0x0d, 0x49, 0x87, 0xe1, 0x72, 0x4e, 0x5d, 0xf1, 0x35, 0x31, 0x0c, 0x48,
+	0xf1, 0x65, 0xe2, 0xd5, 0xb9, 0xed, 0xd9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x06, 0x68, 0x3b,
+	0xd1, 0xad, 0x08, 0x00, 0x00,
diff --git a/src/testplans/target_test_requirements_config.proto b/src/testplans/target_test_requirements_config.proto
index 1ef2fef..4ea4a91 100644
--- a/src/testplans/target_test_requirements_config.proto
+++ b/src/testplans/target_test_requirements_config.proto
@@ -48,6 +48,10 @@
     // 'caroline-arcnext'.
     string skylab_board = 11;
+    // Key that further specifies the device to test on in Skylab.
+    // e.g. for skylab_board 'octopus', may require skylab_model 'ampton'
+    string skylab_model = 15;
     HwTestSuiteType hw_test_suite_type = 13;
     // The swarming pool in which to run the test suite, e.g. DUT_POOL_QUOTA.