Add Manifest for test results artifacts.
BUG=b:189364270
TEST=Manual
Change-Id: I89f308bae12e2595edb16ba7086c201752f3a802
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/config/+/3170248
Commit-Queue: Jason Kusuma <jkusuma@google.com>
Reviewed-by: Seewai Fu <seewaifu@google.com>
Reviewed-by: Jaques Clapauch <jaquesc@google.com>
diff --git a/generated/descriptors.json b/generated/descriptors.json
index ea234f7..3a04cd3 100644
--- a/generated/descriptors.json
+++ b/generated/descriptors.json
@@ -15020,6 +15020,75 @@
"isImport": false,
"isSyntaxUnspecified": false
},
+ "messageType": [
+ {
+ "field": [
+ {
+ "jsonName": "version",
+ "label": "LABEL_OPTIONAL",
+ "name": "version",
+ "number": 1,
+ "type": "TYPE_UINT32"
+ },
+ {
+ "jsonName": "artifacts",
+ "label": "LABEL_REPEATED",
+ "name": "artifacts",
+ "number": 2,
+ "type": "TYPE_MESSAGE",
+ "typeName": ".chromiumos.test.artifact.Artifact"
+ }
+ ],
+ "name": "Manifest"
+ },
+ {
+ "enumType": [
+ {
+ "name": "ArtifactType",
+ "value": [
+ {
+ "name": "ARTIFACT_TYPE_UNSPECIFIED",
+ "number": 0
+ },
+ {
+ "name": "TEST_RESULT",
+ "number": 1
+ }
+ ]
+ }
+ ],
+ "field": [
+ {
+ "jsonName": "type",
+ "label": "LABEL_OPTIONAL",
+ "name": "type",
+ "number": 1,
+ "type": "TYPE_ENUM",
+ "typeName": ".chromiumos.test.artifact.Artifact.ArtifactType"
+ },
+ {
+ "jsonName": "gsUrl",
+ "label": "LABEL_OPTIONAL",
+ "name": "gs_url",
+ "number": 2,
+ "type": "TYPE_STRING"
+ }
+ ],
+ "name": "Artifact"
+ }
+ ],
+ "name": "chromiumos/test/artifact/manifest.proto",
+ "options": {
+ "goPackage": "go.chromium.org/chromiumos/config/go/test/artifact"
+ },
+ "package": "chromiumos.test.artifact",
+ "syntax": "proto3"
+ },
+ {
+ "bufExtension": {
+ "isImport": false,
+ "isSyntaxUnspecified": false
+ },
"dependency": [
"chromiumos/test/api/dut_attribute.proto"
],
diff --git a/go/test/artifact/manifest.pb.go b/go/test/artifact/manifest.pb.go
new file mode 100644
index 0000000..1c2dbae
--- /dev/null
+++ b/go/test/artifact/manifest.pb.go
@@ -0,0 +1,182 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: chromiumos/test/artifact/manifest.proto
+
+package artifact
+
+import (
+ fmt "fmt"
+ proto "github.com/golang/protobuf/proto"
+ math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+// Capture the various artifact types.
+// NEXT TAG: 2
+type Artifact_ArtifactType int32
+
+const (
+ Artifact_ARTIFACT_TYPE_UNSPECIFIED Artifact_ArtifactType = 0
+ Artifact_TEST_RESULT Artifact_ArtifactType = 1
+)
+
+var Artifact_ArtifactType_name = map[int32]string{
+ 0: "ARTIFACT_TYPE_UNSPECIFIED",
+ 1: "TEST_RESULT",
+}
+
+var Artifact_ArtifactType_value = map[string]int32{
+ "ARTIFACT_TYPE_UNSPECIFIED": 0,
+ "TEST_RESULT": 1,
+}
+
+func (x Artifact_ArtifactType) String() string {
+ return proto.EnumName(Artifact_ArtifactType_name, int32(x))
+}
+
+func (Artifact_ArtifactType) EnumDescriptor() ([]byte, []int) {
+ return fileDescriptor_b3e7e898d8809b0a, []int{1, 0}
+}
+
+// Manifest for test result artifacts.
+// NEXT TAG: 3
+type Manifest struct {
+ // Captures the manifest version.
+ Version uint32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
+ // List of associated test result artifacts.
+ Artifacts []*Artifact `protobuf:"bytes,2,rep,name=artifacts,proto3" json:"artifacts,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *Manifest) Reset() { *m = Manifest{} }
+func (m *Manifest) String() string { return proto.CompactTextString(m) }
+func (*Manifest) ProtoMessage() {}
+func (*Manifest) Descriptor() ([]byte, []int) {
+ return fileDescriptor_b3e7e898d8809b0a, []int{0}
+}
+
+func (m *Manifest) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_Manifest.Unmarshal(m, b)
+}
+func (m *Manifest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_Manifest.Marshal(b, m, deterministic)
+}
+func (m *Manifest) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Manifest.Merge(m, src)
+}
+func (m *Manifest) XXX_Size() int {
+ return xxx_messageInfo_Manifest.Size(m)
+}
+func (m *Manifest) XXX_DiscardUnknown() {
+ xxx_messageInfo_Manifest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Manifest proto.InternalMessageInfo
+
+func (m *Manifest) GetVersion() uint32 {
+ if m != nil {
+ return m.Version
+ }
+ return 0
+}
+
+func (m *Manifest) GetArtifacts() []*Artifact {
+ if m != nil {
+ return m.Artifacts
+ }
+ return nil
+}
+
+// Artifact information.
+// NEXT TAG: 3
+type Artifact struct {
+ // Type of the artifact.
+ Type Artifact_ArtifactType `protobuf:"varint,1,opt,name=type,proto3,enum=chromiumos.test.artifact.Artifact_ArtifactType" json:"type,omitempty"`
+ // URL of Google Storage location containing the artifact
+ // e.g. gs://foo/bar/baz.ext
+ GsUrl string `protobuf:"bytes,2,opt,name=gs_url,json=gsUrl,proto3" json:"gs_url,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *Artifact) Reset() { *m = Artifact{} }
+func (m *Artifact) String() string { return proto.CompactTextString(m) }
+func (*Artifact) ProtoMessage() {}
+func (*Artifact) Descriptor() ([]byte, []int) {
+ return fileDescriptor_b3e7e898d8809b0a, []int{1}
+}
+
+func (m *Artifact) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_Artifact.Unmarshal(m, b)
+}
+func (m *Artifact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_Artifact.Marshal(b, m, deterministic)
+}
+func (m *Artifact) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Artifact.Merge(m, src)
+}
+func (m *Artifact) XXX_Size() int {
+ return xxx_messageInfo_Artifact.Size(m)
+}
+func (m *Artifact) XXX_DiscardUnknown() {
+ xxx_messageInfo_Artifact.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Artifact proto.InternalMessageInfo
+
+func (m *Artifact) GetType() Artifact_ArtifactType {
+ if m != nil {
+ return m.Type
+ }
+ return Artifact_ARTIFACT_TYPE_UNSPECIFIED
+}
+
+func (m *Artifact) GetGsUrl() string {
+ if m != nil {
+ return m.GsUrl
+ }
+ return ""
+}
+
+func init() {
+ proto.RegisterEnum("chromiumos.test.artifact.Artifact_ArtifactType", Artifact_ArtifactType_name, Artifact_ArtifactType_value)
+ proto.RegisterType((*Manifest)(nil), "chromiumos.test.artifact.Manifest")
+ proto.RegisterType((*Artifact)(nil), "chromiumos.test.artifact.Artifact")
+}
+
+func init() {
+ proto.RegisterFile("chromiumos/test/artifact/manifest.proto", fileDescriptor_b3e7e898d8809b0a)
+}
+
+var fileDescriptor_b3e7e898d8809b0a = []byte{
+ // 268 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4f, 0xce, 0x28, 0xca,
+ 0xcf, 0xcd, 0x2c, 0xcd, 0xcd, 0x2f, 0xd6, 0x2f, 0x49, 0x2d, 0x2e, 0xd1, 0x4f, 0x2c, 0x2a, 0xc9,
+ 0x4c, 0x4b, 0x4c, 0x2e, 0xd1, 0xcf, 0x4d, 0xcc, 0xcb, 0x4c, 0x4b, 0x2d, 0x2e, 0xd1, 0x2b, 0x28,
+ 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x40, 0x28, 0xd4, 0x03, 0x29, 0xd4, 0x83, 0x29, 0x54, 0x4a, 0xe3,
+ 0xe2, 0xf0, 0x85, 0xaa, 0x15, 0x92, 0xe0, 0x62, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93,
+ 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x82, 0x71, 0x85, 0x1c, 0xb8, 0x38, 0x61, 0x3a, 0x8a, 0x25,
+ 0x98, 0x14, 0x98, 0x35, 0xb8, 0x8d, 0x94, 0xf4, 0x70, 0x99, 0xa9, 0xe7, 0x08, 0x65, 0x04, 0x21,
+ 0x34, 0x29, 0x2d, 0x63, 0xe4, 0xe2, 0x80, 0x89, 0x0b, 0x39, 0x73, 0xb1, 0x94, 0x54, 0x16, 0xa4,
+ 0x82, 0x6d, 0xe1, 0x33, 0xd2, 0x27, 0x6c, 0x12, 0x9c, 0x11, 0x52, 0x59, 0x90, 0x1a, 0x04, 0xd6,
+ 0x2c, 0x24, 0xca, 0xc5, 0x96, 0x5e, 0x1c, 0x5f, 0x5a, 0x94, 0x23, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1,
+ 0x19, 0xc4, 0x9a, 0x5e, 0x1c, 0x5a, 0x94, 0xa3, 0x64, 0xc7, 0xc5, 0x83, 0xac, 0x58, 0x48, 0x96,
+ 0x4b, 0xd2, 0x31, 0x28, 0xc4, 0xd3, 0xcd, 0xd1, 0x39, 0x24, 0x3e, 0x24, 0x32, 0xc0, 0x35, 0x3e,
+ 0xd4, 0x2f, 0x38, 0xc0, 0xd5, 0xd9, 0xd3, 0xcd, 0xd3, 0xd5, 0x45, 0x80, 0x41, 0x88, 0x9f, 0x8b,
+ 0x3b, 0xc4, 0x35, 0x38, 0x24, 0x3e, 0xc8, 0x35, 0x38, 0xd4, 0x27, 0x44, 0x80, 0xd1, 0xc9, 0x24,
+ 0xca, 0x28, 0x3d, 0x1f, 0xee, 0x22, 0xbd, 0xfc, 0xa2, 0x74, 0x7d, 0xa4, 0x50, 0x4e, 0xce, 0xcf,
+ 0x4b, 0xcb, 0x4c, 0xd7, 0x4f, 0xcf, 0x47, 0x0d, 0xef, 0x24, 0x36, 0x70, 0x38, 0x1b, 0x03, 0x02,
+ 0x00, 0x00, 0xff, 0xff, 0x5e, 0x32, 0x29, 0xdb, 0x92, 0x01, 0x00, 0x00,
+}
diff --git a/proto/chromiumos/test/artifact/manifest.proto b/proto/chromiumos/test/artifact/manifest.proto
new file mode 100644
index 0000000..472fba2
--- /dev/null
+++ b/proto/chromiumos/test/artifact/manifest.proto
@@ -0,0 +1,39 @@
+// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+syntax = "proto3";
+
+package chromiumos.test.artifact;
+
+option go_package = "go.chromium.org/chromiumos/config/go/test/artifact";
+
+// Manifest for test result artifacts.
+// NEXT TAG: 3
+message Manifest {
+
+ // Captures the manifest version.
+ uint32 version = 1;
+
+ // List of associated test result artifacts.
+ repeated Artifact artifacts = 2;
+}
+
+// Artifact information.
+// NEXT TAG: 3
+message Artifact {
+
+ // Capture the various artifact types.
+ // NEXT TAG: 2
+ enum ArtifactType {
+ ARTIFACT_TYPE_UNSPECIFIED = 0;
+ TEST_RESULT = 1;
+ }
+
+ // Type of the artifact.
+ ArtifactType type = 1;
+
+ // URL of Google Storage location containing the artifact
+ // e.g. gs://foo/bar/baz.ext
+ string gs_url = 2;
+}
diff --git a/python/chromiumos/test/artifact/__init__.py b/python/chromiumos/test/artifact/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/python/chromiumos/test/artifact/__init__.py
diff --git a/python/chromiumos/test/artifact/manifest_pb2.py b/python/chromiumos/test/artifact/manifest_pb2.py
new file mode 100644
index 0000000..0abfd2b
--- /dev/null
+++ b/python/chromiumos/test/artifact/manifest_pb2.py
@@ -0,0 +1,149 @@
+# Generated by the protocol buffer compiler. DO NOT EDIT!
+# source: chromiumos/test/artifact/manifest.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+ name='chromiumos/test/artifact/manifest.proto',
+ package='chromiumos.test.artifact',
+ syntax='proto3',
+ serialized_options=_b('Z2go.chromium.org/chromiumos/config/go/test/artifact'),
+ serialized_pb=_b('\n\'chromiumos/test/artifact/manifest.proto\x12\x18\x63hromiumos.test.artifact\"R\n\x08Manifest\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x35\n\tartifacts\x18\x02 \x03(\x0b\x32\".chromiumos.test.artifact.Artifact\"\x99\x01\n\x08\x41rtifact\x12=\n\x04type\x18\x01 \x01(\x0e\x32/.chromiumos.test.artifact.Artifact.ArtifactType\x12\x0e\n\x06gs_url\x18\x02 \x01(\t\">\n\x0c\x41rtifactType\x12\x1d\n\x19\x41RTIFACT_TYPE_UNSPECIFIED\x10\x00\x12\x0f\n\x0bTEST_RESULT\x10\x01\x42\x34Z2go.chromium.org/chromiumos/config/go/test/artifactb\x06proto3')
+)
+
+
+
+_ARTIFACT_ARTIFACTTYPE = _descriptor.EnumDescriptor(
+ name='ArtifactType',
+ full_name='chromiumos.test.artifact.Artifact.ArtifactType',
+ filename=None,
+ file=DESCRIPTOR,
+ values=[
+ _descriptor.EnumValueDescriptor(
+ name='ARTIFACT_TYPE_UNSPECIFIED', index=0, number=0,
+ serialized_options=None,
+ type=None),
+ _descriptor.EnumValueDescriptor(
+ name='TEST_RESULT', index=1, number=1,
+ serialized_options=None,
+ type=None),
+ ],
+ containing_type=None,
+ serialized_options=None,
+ serialized_start=245,
+ serialized_end=307,
+)
+_sym_db.RegisterEnumDescriptor(_ARTIFACT_ARTIFACTTYPE)
+
+
+_MANIFEST = _descriptor.Descriptor(
+ name='Manifest',
+ full_name='chromiumos.test.artifact.Manifest',
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ fields=[
+ _descriptor.FieldDescriptor(
+ name='version', full_name='chromiumos.test.artifact.Manifest.version', index=0,
+ number=1, type=13, cpp_type=3, label=1,
+ has_default_value=False, default_value=0,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='artifacts', full_name='chromiumos.test.artifact.Manifest.artifacts', index=1,
+ number=2, type=11, cpp_type=10, label=3,
+ has_default_value=False, default_value=[],
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+ serialized_options=None,
+ is_extendable=False,
+ syntax='proto3',
+ extension_ranges=[],
+ oneofs=[
+ ],
+ serialized_start=69,
+ serialized_end=151,
+)
+
+
+_ARTIFACT = _descriptor.Descriptor(
+ name='Artifact',
+ full_name='chromiumos.test.artifact.Artifact',
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ fields=[
+ _descriptor.FieldDescriptor(
+ name='type', full_name='chromiumos.test.artifact.Artifact.type', index=0,
+ number=1, type=14, cpp_type=8, label=1,
+ has_default_value=False, default_value=0,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ serialized_options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='gs_url', full_name='chromiumos.test.artifact.Artifact.gs_url', index=1,
+ number=2, type=9, cpp_type=9, label=1,
+ has_default_value=False, default_value=_b("").decode('utf-8'),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ serialized_options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ _ARTIFACT_ARTIFACTTYPE,
+ ],
+ serialized_options=None,
+ is_extendable=False,
+ syntax='proto3',
+ extension_ranges=[],
+ oneofs=[
+ ],
+ serialized_start=154,
+ serialized_end=307,
+)
+
+_MANIFEST.fields_by_name['artifacts'].message_type = _ARTIFACT
+_ARTIFACT.fields_by_name['type'].enum_type = _ARTIFACT_ARTIFACTTYPE
+_ARTIFACT_ARTIFACTTYPE.containing_type = _ARTIFACT
+DESCRIPTOR.message_types_by_name['Manifest'] = _MANIFEST
+DESCRIPTOR.message_types_by_name['Artifact'] = _ARTIFACT
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Manifest = _reflection.GeneratedProtocolMessageType('Manifest', (_message.Message,), dict(
+ DESCRIPTOR = _MANIFEST,
+ __module__ = 'chromiumos.test.artifact.manifest_pb2'
+ # @@protoc_insertion_point(class_scope:chromiumos.test.artifact.Manifest)
+ ))
+_sym_db.RegisterMessage(Manifest)
+
+Artifact = _reflection.GeneratedProtocolMessageType('Artifact', (_message.Message,), dict(
+ DESCRIPTOR = _ARTIFACT,
+ __module__ = 'chromiumos.test.artifact.manifest_pb2'
+ # @@protoc_insertion_point(class_scope:chromiumos.test.artifact.Artifact)
+ ))
+_sym_db.RegisterMessage(Artifact)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)