skylab_test_runner: add a field for prejob deadline
We want to have a global deadline on these, since provision tasks
sometimes just get stuck.
I initially had this as a proto Duration type, but that was going to be
uglier in infra/config, where we'd need to construct one of those via
python dicts.
BUG=chromium:972660
TEST=regen
Change-Id: I465965c395c3f66a1e24cf582d9ce60ee23ed3e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2318058
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Commit-Queue: Sean Abraham <seanabraham@chromium.org>
Tested-by: Sean Abraham <seanabraham@chromium.org>
diff --git a/go/test_platform/skylab_test_runner/config.pb.go b/go/test_platform/skylab_test_runner/config.pb.go
index dcfd426..b9710d2 100644
--- a/go/test_platform/skylab_test_runner/config.pb.go
+++ b/go/test_platform/skylab_test_runner/config.pb.go
@@ -142,10 +142,12 @@
// Storage: gs://abci-ssp/autotest-containers/{name}.tar.xz
//
// See go/ctp-ssp for an overview of SSP.
- SspBaseImageName string `protobuf:"bytes,3,opt,name=ssp_base_image_name,json=sspBaseImageName,proto3" json:"ssp_base_image_name,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ SspBaseImageName string `protobuf:"bytes,3,opt,name=ssp_base_image_name,json=sspBaseImageName,proto3" json:"ssp_base_image_name,omitempty"`
+ // The maximum duration for prejobs (e.g. provisioning).
+ PrejobDeadlineSeconds int64 `protobuf:"varint,4,opt,name=prejob_deadline_seconds,json=prejobDeadlineSeconds,proto3" json:"prejob_deadline_seconds,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *Config_Harness) Reset() { *m = Config_Harness{} }
@@ -194,6 +196,13 @@
return ""
}
+func (m *Config_Harness) GetPrejobDeadlineSeconds() int64 {
+ if m != nil {
+ return m.PrejobDeadlineSeconds
+ }
+ return 0
+}
+
// Output defines parameters around how the task will deliver output to
// the callers, e.g. Google Storage bucket.
type Config_Output struct {
@@ -247,29 +256,31 @@
}
var fileDescriptor_b2c5f9be4f684081 = []byte{
- // 369 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x6b, 0xdb, 0x30,
- 0x1c, 0xc5, 0x49, 0x0c, 0x0e, 0x51, 0x32, 0x18, 0x5a, 0x18, 0x21, 0x87, 0x91, 0x6d, 0x97, 0x1c,
- 0x16, 0x2b, 0x6c, 0x3b, 0xf7, 0x90, 0x16, 0xda, 0x84, 0xd0, 0x80, 0x73, 0xeb, 0x45, 0x95, 0x1d,
- 0xd9, 0x11, 0xb5, 0xf5, 0x37, 0xfa, 0xcb, 0x81, 0x7c, 0x88, 0x7e, 0xe0, 0xde, 0x8a, 0x65, 0xbb,
- 0xb4, 0xf4, 0x90, 0x1c, 0xfd, 0xde, 0xfb, 0x3d, 0x3d, 0x0b, 0x91, 0xb9, 0x95, 0x68, 0x79, 0x91,
- 0x09, 0x9b, 0x80, 0xc9, 0x19, 0x3e, 0x9d, 0x32, 0x11, 0x71, 0x27, 0x9a, 0x52, 0x6b, 0x69, 0x58,
- 0x0c, 0x3a, 0x51, 0x69, 0x50, 0x18, 0xb0, 0x40, 0xa7, 0x1f, 0xe2, 0xc1, 0xe7, 0xf8, 0xaf, 0x17,
- 0x8f, 0xf8, 0xd7, 0x0e, 0xa1, 0x57, 0xc4, 0xcb, 0x44, 0x34, 0xee, 0x4c, 0x3b, 0xb3, 0xc1, 0xdf,
- 0x3f, 0xc1, 0x39, 0x34, 0xa8, 0xb1, 0x60, 0x23, 0xa2, 0xb0, 0x02, 0xe9, 0x9a, 0xf4, 0x0e, 0xc2,
- 0x68, 0x89, 0x38, 0xee, 0xba, 0x8e, 0xc5, 0xc5, 0x1d, 0x77, 0x35, 0x17, 0xb6, 0x05, 0xf4, 0x96,
- 0xf8, 0x50, 0xda, 0xa2, 0xb4, 0x63, 0xcf, 0x55, 0xb1, 0x8b, 0xab, 0xb6, 0x0e, 0x0b, 0x1b, 0x7c,
- 0xf2, 0x48, 0xbc, 0x8d, 0x88, 0xe8, 0x6f, 0xf2, 0x45, 0xec, 0x73, 0xa5, 0x39, 0x4a, 0x73, 0x54,
- 0xb1, 0x74, 0x7f, 0xd9, 0x0f, 0x87, 0x4e, 0xdc, 0xd5, 0x1a, 0xfd, 0x4f, 0xbe, 0xc7, 0x06, 0x90,
- 0x2b, 0x7d, 0x94, 0xda, 0x82, 0x39, 0xbd, 0xa5, 0xbb, 0x2e, 0x3d, 0xaa, 0xdc, 0x55, 0x6b, 0x36,
- 0xd4, 0xe4, 0xb9, 0x43, 0x7a, 0xcd, 0x7e, 0xfa, 0x93, 0x0c, 0x45, 0x69, 0xc1, 0xcd, 0xda, 0x2b,
- 0xd3, 0x9c, 0x32, 0x68, 0xb5, 0x1b, 0x65, 0xe8, 0x82, 0x8c, 0xf0, 0xa4, 0xe3, 0x03, 0x87, 0x24,
- 0xc9, 0x40, 0xec, 0x39, 0x96, 0x51, 0x15, 0xad, 0x8f, 0xa0, 0xce, 0xdb, 0xd6, 0xd6, 0xce, 0x39,
- 0x74, 0x4e, 0xbe, 0x21, 0x16, 0x3c, 0x12, 0x28, 0xb9, 0xca, 0x45, 0x2a, 0xb9, 0x16, 0xb9, 0x74,
- 0x17, 0xd3, 0x0f, 0xbf, 0x22, 0x16, 0x4b, 0x81, 0x72, 0x55, 0x19, 0xf7, 0x22, 0x97, 0x93, 0x19,
- 0xf1, 0xeb, 0x3b, 0xa0, 0x3f, 0xc8, 0x20, 0x45, 0x6e, 0x00, 0xde, 0x8f, 0xe9, 0xa7, 0x18, 0x02,
- 0x54, 0x53, 0x96, 0x9b, 0x87, 0x75, 0x0a, 0x41, 0x7c, 0x30, 0x90, 0xab, 0x32, 0x0f, 0xc0, 0xa4,
- 0xac, 0xfd, 0x00, 0x64, 0x4a, 0x27, 0x46, 0x30, 0xf7, 0x8e, 0x58, 0x0a, 0xec, 0xdc, 0xc3, 0x8b,
- 0x7c, 0x17, 0xfd, 0xf7, 0x1a, 0x00, 0x00, 0xff, 0xff, 0xf0, 0xf3, 0xc3, 0xe3, 0xa3, 0x02, 0x00,
- 0x00,
+ // 405 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6f, 0xd3, 0x30,
+ 0x14, 0xc6, 0xd5, 0x75, 0xea, 0x54, 0x77, 0x48, 0xc8, 0x0c, 0x88, 0x7a, 0x40, 0x05, 0x2e, 0x3d,
+ 0xb0, 0x78, 0x02, 0xc4, 0x91, 0xc3, 0x98, 0x04, 0x9b, 0x2a, 0x26, 0xa5, 0x37, 0x2e, 0xe6, 0x39,
+ 0x71, 0x52, 0x43, 0xe2, 0x17, 0xf9, 0x39, 0x93, 0xfa, 0x67, 0xf1, 0x47, 0xf0, 0x7f, 0xa1, 0xd8,
+ 0x09, 0x02, 0xed, 0xb0, 0x1e, 0xfd, 0xfd, 0xbe, 0xef, 0xb3, 0x9f, 0xf5, 0xd8, 0xb9, 0xd7, 0xe4,
+ 0x65, 0x5b, 0x83, 0x2f, 0xd1, 0x35, 0x82, 0x7e, 0xee, 0x6b, 0x50, 0x32, 0x88, 0xae, 0xb3, 0x56,
+ 0x3b, 0x91, 0xa3, 0x2d, 0x4d, 0x95, 0xb6, 0x0e, 0x3d, 0xf2, 0xd5, 0x7f, 0xf6, 0xf4, 0xbe, 0xfd,
+ 0xd5, 0xaf, 0x63, 0x36, 0xfb, 0x14, 0x22, 0xfc, 0x23, 0x9b, 0xd6, 0xa0, 0x92, 0xc9, 0x6a, 0xb2,
+ 0x5e, 0xbc, 0x7d, 0x93, 0x3e, 0x14, 0x4d, 0x63, 0x2c, 0xdd, 0x80, 0xca, 0xfa, 0x20, 0xbf, 0x61,
+ 0x27, 0x3b, 0x70, 0x56, 0x13, 0x25, 0x47, 0xa1, 0xe3, 0xe2, 0xe0, 0x8e, 0x2f, 0x31, 0x97, 0x8d,
+ 0x05, 0xfc, 0x33, 0x9b, 0x61, 0xe7, 0xdb, 0xce, 0x27, 0xd3, 0x50, 0x25, 0x0e, 0xae, 0xba, 0x0d,
+ 0xb1, 0x6c, 0x88, 0x2f, 0xbf, 0xb3, 0xe9, 0x06, 0x14, 0x7f, 0xcd, 0x1e, 0x41, 0xd1, 0x18, 0x2b,
+ 0x49, 0xbb, 0x3b, 0x93, 0xeb, 0x30, 0xe5, 0x3c, 0x3b, 0x0d, 0xe2, 0x36, 0x6a, 0xfc, 0x3d, 0x7b,
+ 0x96, 0x3b, 0x24, 0x69, 0xec, 0x9d, 0xb6, 0x1e, 0xdd, 0xfe, 0xaf, 0xfb, 0x28, 0xb8, 0xcf, 0x7a,
+ 0x7a, 0x3d, 0xc2, 0x21, 0xb5, 0xfc, 0x3d, 0x61, 0x27, 0xc3, 0xfb, 0xf9, 0x4b, 0x76, 0x0a, 0x9d,
+ 0xc7, 0xf0, 0xac, 0xc2, 0xb8, 0xe1, 0x96, 0xc5, 0xa8, 0x5d, 0x19, 0xc7, 0x2f, 0xd8, 0x19, 0xed,
+ 0x6d, 0xbe, 0x93, 0x58, 0x96, 0x35, 0x42, 0x21, 0xa9, 0x53, 0xbd, 0x35, 0x5e, 0xc1, 0x03, 0xbb,
+ 0x8d, 0x68, 0x1b, 0x08, 0x3f, 0x67, 0x4f, 0x88, 0x5a, 0xa9, 0x80, 0xb4, 0x34, 0x0d, 0x54, 0x5a,
+ 0x5a, 0x68, 0x74, 0xf8, 0x98, 0x79, 0xf6, 0x98, 0xa8, 0xbd, 0x04, 0xd2, 0xd7, 0x3d, 0xf8, 0x0a,
+ 0x8d, 0xe6, 0x1f, 0xd8, 0xf3, 0xd6, 0xe9, 0x1f, 0xa8, 0x64, 0xa1, 0xa1, 0xa8, 0x8d, 0xd5, 0x92,
+ 0x74, 0x8e, 0xb6, 0xa0, 0xe4, 0x78, 0x35, 0x59, 0x4f, 0xb3, 0xa7, 0x11, 0x5f, 0x0d, 0x74, 0x1b,
+ 0xe1, 0x72, 0xcd, 0x66, 0xf1, 0xef, 0xf8, 0x0b, 0xb6, 0xa8, 0x48, 0x3a, 0xc4, 0x7f, 0x87, 0x98,
+ 0x57, 0x94, 0x21, 0xf6, 0x23, 0x5c, 0x6e, 0xbe, 0xdd, 0x54, 0x98, 0xe6, 0x3b, 0x87, 0x8d, 0xe9,
+ 0x9a, 0x14, 0x5d, 0x25, 0xc6, 0x03, 0x92, 0x30, 0xb6, 0x74, 0x20, 0xc2, 0xfe, 0x89, 0x0a, 0xc5,
+ 0x43, 0x0b, 0xab, 0x66, 0xc1, 0xfa, 0xee, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x9e, 0x6b,
+ 0xa1, 0xdb, 0x02, 0x00, 0x00,
}
diff --git a/src/test_platform/skylab_test_runner/config.proto b/src/test_platform/skylab_test_runner/config.proto
index bf79e6c..3b58ddf 100644
--- a/src/test_platform/skylab_test_runner/config.proto
+++ b/src/test_platform/skylab_test_runner/config.proto
@@ -38,6 +38,9 @@
//
// See go/ctp-ssp for an overview of SSP.
string ssp_base_image_name = 3;
+
+ // The maximum duration for prejobs (e.g. provisioning).
+ int64 prejob_deadline_seconds = 4;
}
// Output defines parameters around how the task will deliver output to
