diff options
-rw-r--r-- | proto/TestSuiteResultMessage.proto | 8 | ||||
-rw-r--r-- | proto/TestSuiteResultMessage_pb2.py | 38 | ||||
-rwxr-xr-x | script/build-java.sh | 2 | ||||
-rwxr-xr-x | script/build-python.sh | 19 | ||||
-rw-r--r-- | src/main/java/com/android/vts/proto/TestSuiteResultMessageProto.java | 876 |
5 files changed, 916 insertions, 27 deletions
diff --git a/proto/TestSuiteResultMessage.proto b/proto/TestSuiteResultMessage.proto index 0b9e210..560ceb6 100644 --- a/proto/TestSuiteResultMessage.proto +++ b/proto/TestSuiteResultMessage.proto @@ -15,6 +15,7 @@ syntax = "proto2"; package android.vts; +import "vti/test_serving/proto/TestScheduleConfigMessage.proto"; option java_package = "com.android.vts.proto"; option java_outer_classname = "TestSuiteResultMessageProto"; option java_multiple_files = false; @@ -61,4 +62,9 @@ message TestSuiteResultMessage { // GCS path to the repacked device[+GSI] image set. repeated string repacked_image_path = 52; -} + + // Fetch info used to fetch and flash certain builds for retry_prompt command. + optional string vendor_build_id = 61; + optional string gsi_build_id = 62; + optional android.test.lab.ScheduleConfigMessage schedule_config = 63; +}
\ No newline at end of file diff --git a/proto/TestSuiteResultMessage_pb2.py b/proto/TestSuiteResultMessage_pb2.py index 5986816..67195d2 100644 --- a/proto/TestSuiteResultMessage_pb2.py +++ b/proto/TestSuiteResultMessage_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: TestSuiteResultMessage.proto +# source: vti/dashboard/proto/TestSuiteResultMessage.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -13,14 +13,16 @@ from google.protobuf import descriptor_pb2 _sym_db = _symbol_database.Default() +from vti.test_serving.proto import TestScheduleConfigMessage_pb2 as vti_dot_test__serving_dot_proto_dot_TestScheduleConfigMessage__pb2 DESCRIPTOR = _descriptor.FileDescriptor( - name='TestSuiteResultMessage.proto', + name='vti/dashboard/proto/TestSuiteResultMessage.proto', package='android.vts', syntax='proto2', - serialized_pb=_b('\n\x1cTestSuiteResultMessage.proto\x12\x0b\x61ndroid.vts\"\xa1\x04\n\x16TestSuiteResultMessage\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x13\n\x0bresult_path\x18\x02 \x01(\t\x12\x1a\n\x0c\x62oot_success\x18\x03 \x01(\x08:\x04true\x12\x0e\n\x06\x62ranch\x18\x0b \x02(\t\x12\x0e\n\x06target\x18\x0c \x02(\t\x12\x10\n\x08\x62uild_id\x18\r \x02(\t\x12\x12\n\nsuite_plan\x18\x15 \x01(\t\x12\x15\n\rsuite_version\x18\x16 \x01(\t\x12\x1a\n\x12suite_build_number\x18\x17 \x01(\t\x12\x12\n\nstart_time\x18\x18 \x01(\x03\x12\x10\n\x08\x65nd_time\x18\x19 \x01(\x03\x12\x11\n\thost_name\x18\x1a \x01(\t\x12\x12\n\nsuite_name\x18\x1b \x01(\t\x12 \n\x18\x62uild_system_fingerprint\x18\x1f \x01(\t\x12 \n\x18\x62uild_vendor_fingerprint\x18 \x01(\t\x12\x14\n\ttest_type\x18! \x01(\x05:\x01\x30\x12\x1e\n\x16passed_test_case_count\x18) \x01(\x05\x12\x1e\n\x16\x66\x61iled_test_case_count\x18* \x01(\x05\x12\x14\n\x0cmodules_done\x18+ \x01(\x05\x12\x15\n\rmodules_total\x18, \x01(\x05\x12\x16\n\x0einfra_log_path\x18\x33 \x01(\t\x12\x1b\n\x13repacked_image_path\x18\x34 \x03(\tB6\n\x15\x63om.android.vts.protoB\x1bTestSuiteResultMessageProtoP\x00') -) + serialized_pb=_b('\n0vti/dashboard/proto/TestSuiteResultMessage.proto\x12\x0b\x61ndroid.vts\x1a\x36vti/test_serving/proto/TestScheduleConfigMessage.proto\"\x92\x05\n\x16TestSuiteResultMessage\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x13\n\x0bresult_path\x18\x02 \x01(\t\x12\x1a\n\x0c\x62oot_success\x18\x03 \x01(\x08:\x04true\x12\x0e\n\x06\x62ranch\x18\x0b \x02(\t\x12\x0e\n\x06target\x18\x0c \x02(\t\x12\x10\n\x08\x62uild_id\x18\r \x02(\t\x12\x12\n\nsuite_plan\x18\x15 \x01(\t\x12\x15\n\rsuite_version\x18\x16 \x01(\t\x12\x1a\n\x12suite_build_number\x18\x17 \x01(\t\x12\x12\n\nstart_time\x18\x18 \x01(\x03\x12\x10\n\x08\x65nd_time\x18\x19 \x01(\x03\x12\x11\n\thost_name\x18\x1a \x01(\t\x12\x12\n\nsuite_name\x18\x1b \x01(\t\x12 \n\x18\x62uild_system_fingerprint\x18\x1f \x01(\t\x12 \n\x18\x62uild_vendor_fingerprint\x18 \x01(\t\x12\x14\n\ttest_type\x18! \x01(\x05:\x01\x30\x12\x1e\n\x16passed_test_case_count\x18) \x01(\x05\x12\x1e\n\x16\x66\x61iled_test_case_count\x18* \x01(\x05\x12\x14\n\x0cmodules_done\x18+ \x01(\x05\x12\x15\n\rmodules_total\x18, \x01(\x05\x12\x16\n\x0einfra_log_path\x18\x33 \x01(\t\x12\x1b\n\x13repacked_image_path\x18\x34 \x03(\t\x12\x17\n\x0fvendor_build_id\x18= \x01(\t\x12\x14\n\x0cgsi_build_id\x18> \x01(\t\x12@\n\x0fschedule_config\x18? \x01(\x0b\x32\'.android.test.lab.ScheduleConfigMessageB6\n\x15\x63om.android.vts.protoB\x1bTestSuiteResultMessageProtoP\x00') + , + dependencies=[vti_dot_test__serving_dot_proto_dot_TestScheduleConfigMessage__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -187,6 +189,27 @@ _TESTSUITERESULTMESSAGE = _descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='vendor_build_id', full_name='android.vts.TestSuiteResultMessage.vendor_build_id', index=22, + number=61, 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, + options=None), + _descriptor.FieldDescriptor( + name='gsi_build_id', full_name='android.vts.TestSuiteResultMessage.gsi_build_id', index=23, + number=62, 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, + options=None), + _descriptor.FieldDescriptor( + name='schedule_config', full_name='android.vts.TestSuiteResultMessage.schedule_config', index=24, + number=63, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], @@ -199,15 +222,16 @@ _TESTSUITERESULTMESSAGE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=46, - serialized_end=591, + serialized_start=122, + serialized_end=780, ) +_TESTSUITERESULTMESSAGE.fields_by_name['schedule_config'].message_type = vti_dot_test__serving_dot_proto_dot_TestScheduleConfigMessage__pb2._SCHEDULECONFIGMESSAGE DESCRIPTOR.message_types_by_name['TestSuiteResultMessage'] = _TESTSUITERESULTMESSAGE TestSuiteResultMessage = _reflection.GeneratedProtocolMessageType('TestSuiteResultMessage', (_message.Message,), dict( DESCRIPTOR = _TESTSUITERESULTMESSAGE, - __module__ = 'TestSuiteResultMessage_pb2' + __module__ = 'vti.dashboard.proto.TestSuiteResultMessage_pb2' # @@protoc_insertion_point(class_scope:android.vts.TestSuiteResultMessage) )) _sym_db.RegisterMessage(TestSuiteResultMessage) diff --git a/script/build-java.sh b/script/build-java.sh index 9b82c97..ed1350b 100755 --- a/script/build-java.sh +++ b/script/build-java.sh @@ -15,5 +15,5 @@ # limitations under the License. pushd ${ANDROID_BUILD_TOP}/test -protoc --proto_path=vti/dashboard --java_out=vti/dashboard/src/main/java vti/dashboard/proto/TestSuiteResultMessage.proto +protoc --proto_path=. --java_out=vti/dashboard/src/main/java vti/dashboard/proto/TestSuiteResultMessage.proto vti/test_serving/proto/TestScheduleConfigMessage.proto popd diff --git a/script/build-python.sh b/script/build-python.sh new file mode 100755 index 0000000..cffdb94 --- /dev/null +++ b/script/build-python.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Copyright 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +pushd ${ANDROID_BUILD_TOP}/test +protoc --proto_path=. --python_out=. vti/dashboard/proto/TestSuiteResultMessage.proto vti/test_serving/proto/TestScheduleConfigMessage.proto +popd diff --git a/src/main/java/com/android/vts/proto/TestSuiteResultMessageProto.java b/src/main/java/com/android/vts/proto/TestSuiteResultMessageProto.java index 1f9ec1b..52f73d1 100644 --- a/src/main/java/com/android/vts/proto/TestSuiteResultMessageProto.java +++ b/src/main/java/com/android/vts/proto/TestSuiteResultMessageProto.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/TestSuiteResultMessage.proto +// source: vti/dashboard/proto/TestSuiteResultMessage.proto package com.android.vts.proto; @@ -359,6 +359,94 @@ public final class TestSuiteResultMessageProto { */ com.google.protobuf.ByteString getInfraLogPathBytes(); + + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + java.util.List<java.lang.String> + getRepackedImagePathList(); + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + int getRepackedImagePathCount(); + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + java.lang.String getRepackedImagePath(int index); + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + com.google.protobuf.ByteString + getRepackedImagePathBytes(int index); + + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + boolean hasVendorBuildId(); + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + java.lang.String getVendorBuildId(); + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + com.google.protobuf.ByteString + getVendorBuildIdBytes(); + + /** + * <code>optional string gsi_build_id = 62;</code> + */ + boolean hasGsiBuildId(); + /** + * <code>optional string gsi_build_id = 62;</code> + */ + java.lang.String getGsiBuildId(); + /** + * <code>optional string gsi_build_id = 62;</code> + */ + com.google.protobuf.ByteString + getGsiBuildIdBytes(); + + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + boolean hasScheduleConfig(); + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage getScheduleConfig(); + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessageOrBuilder getScheduleConfigOrBuilder(); } /** * <pre> @@ -397,6 +485,9 @@ public final class TestSuiteResultMessageProto { modulesDone_ = 0; modulesTotal_ = 0; infraLogPath_ = ""; + repackedImagePath_ = com.google.protobuf.LazyStringArrayList.EMPTY; + vendorBuildId_ = ""; + gsiBuildId_ = ""; } @java.lang.Override @@ -545,6 +636,40 @@ public final class TestSuiteResultMessageProto { infraLogPath_ = bs; break; } + case 418: { + com.google.protobuf.ByteString bs = input.readBytes(); + if (!((mutable_bitField0_ & 0x00200000) == 0x00200000)) { + repackedImagePath_ = new com.google.protobuf.LazyStringArrayList(); + mutable_bitField0_ |= 0x00200000; + } + repackedImagePath_.add(bs); + break; + } + case 490: { + com.google.protobuf.ByteString bs = input.readBytes(); + bitField0_ |= 0x00200000; + vendorBuildId_ = bs; + break; + } + case 498: { + com.google.protobuf.ByteString bs = input.readBytes(); + bitField0_ |= 0x00400000; + gsiBuildId_ = bs; + break; + } + case 506: { + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.Builder subBuilder = null; + if (((bitField0_ & 0x00800000) == 0x00800000)) { + subBuilder = scheduleConfig_.toBuilder(); + } + scheduleConfig_ = input.readMessage(android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(scheduleConfig_); + scheduleConfig_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00800000; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -553,6 +678,9 @@ public final class TestSuiteResultMessageProto { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00200000) == 0x00200000)) { + repackedImagePath_ = repackedImagePath_.getUnmodifiableView(); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -1324,6 +1452,168 @@ public final class TestSuiteResultMessageProto { } } + public static final int REPACKED_IMAGE_PATH_FIELD_NUMBER = 52; + private com.google.protobuf.LazyStringList repackedImagePath_; + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public com.google.protobuf.ProtocolStringList + getRepackedImagePathList() { + return repackedImagePath_; + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public int getRepackedImagePathCount() { + return repackedImagePath_.size(); + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public java.lang.String getRepackedImagePath(int index) { + return repackedImagePath_.get(index); + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public com.google.protobuf.ByteString + getRepackedImagePathBytes(int index) { + return repackedImagePath_.getByteString(index); + } + + public static final int VENDOR_BUILD_ID_FIELD_NUMBER = 61; + private volatile java.lang.Object vendorBuildId_; + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public boolean hasVendorBuildId() { + return ((bitField0_ & 0x00200000) == 0x00200000); + } + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public java.lang.String getVendorBuildId() { + java.lang.Object ref = vendorBuildId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + vendorBuildId_ = s; + } + return s; + } + } + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public com.google.protobuf.ByteString + getVendorBuildIdBytes() { + java.lang.Object ref = vendorBuildId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + vendorBuildId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int GSI_BUILD_ID_FIELD_NUMBER = 62; + private volatile java.lang.Object gsiBuildId_; + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public boolean hasGsiBuildId() { + return ((bitField0_ & 0x00400000) == 0x00400000); + } + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public java.lang.String getGsiBuildId() { + java.lang.Object ref = gsiBuildId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + gsiBuildId_ = s; + } + return s; + } + } + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public com.google.protobuf.ByteString + getGsiBuildIdBytes() { + java.lang.Object ref = gsiBuildId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + gsiBuildId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int SCHEDULE_CONFIG_FIELD_NUMBER = 63; + private android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage scheduleConfig_; + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public boolean hasScheduleConfig() { + return ((bitField0_ & 0x00800000) == 0x00800000); + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage getScheduleConfig() { + return scheduleConfig_ == null ? android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.getDefaultInstance() : scheduleConfig_; + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessageOrBuilder getScheduleConfigOrBuilder() { + return scheduleConfig_ == null ? android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.getDefaultInstance() : scheduleConfig_; + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -1411,6 +1701,18 @@ public final class TestSuiteResultMessageProto { if (((bitField0_ & 0x00100000) == 0x00100000)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 51, infraLogPath_); } + for (int i = 0; i < repackedImagePath_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 52, repackedImagePath_.getRaw(i)); + } + if (((bitField0_ & 0x00200000) == 0x00200000)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 61, vendorBuildId_); + } + if (((bitField0_ & 0x00400000) == 0x00400000)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 62, gsiBuildId_); + } + if (((bitField0_ & 0x00800000) == 0x00800000)) { + output.writeMessage(63, getScheduleConfig()); + } unknownFields.writeTo(output); } @@ -1490,6 +1792,24 @@ public final class TestSuiteResultMessageProto { if (((bitField0_ & 0x00100000) == 0x00100000)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(51, infraLogPath_); } + { + int dataSize = 0; + for (int i = 0; i < repackedImagePath_.size(); i++) { + dataSize += computeStringSizeNoTag(repackedImagePath_.getRaw(i)); + } + size += dataSize; + size += 2 * getRepackedImagePathList().size(); + } + if (((bitField0_ & 0x00200000) == 0x00200000)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(61, vendorBuildId_); + } + if (((bitField0_ & 0x00400000) == 0x00400000)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(62, gsiBuildId_); + } + if (((bitField0_ & 0x00800000) == 0x00800000)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(63, getScheduleConfig()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -1612,6 +1932,23 @@ public final class TestSuiteResultMessageProto { result = result && getInfraLogPath() .equals(other.getInfraLogPath()); } + result = result && getRepackedImagePathList() + .equals(other.getRepackedImagePathList()); + result = result && (hasVendorBuildId() == other.hasVendorBuildId()); + if (hasVendorBuildId()) { + result = result && getVendorBuildId() + .equals(other.getVendorBuildId()); + } + result = result && (hasGsiBuildId() == other.hasGsiBuildId()); + if (hasGsiBuildId()) { + result = result && getGsiBuildId() + .equals(other.getGsiBuildId()); + } + result = result && (hasScheduleConfig() == other.hasScheduleConfig()); + if (hasScheduleConfig()) { + result = result && getScheduleConfig() + .equals(other.getScheduleConfig()); + } result = result && unknownFields.equals(other.unknownFields); return result; } @@ -1710,6 +2047,22 @@ public final class TestSuiteResultMessageProto { hash = (37 * hash) + INFRA_LOG_PATH_FIELD_NUMBER; hash = (53 * hash) + getInfraLogPath().hashCode(); } + if (getRepackedImagePathCount() > 0) { + hash = (37 * hash) + REPACKED_IMAGE_PATH_FIELD_NUMBER; + hash = (53 * hash) + getRepackedImagePathList().hashCode(); + } + if (hasVendorBuildId()) { + hash = (37 * hash) + VENDOR_BUILD_ID_FIELD_NUMBER; + hash = (53 * hash) + getVendorBuildId().hashCode(); + } + if (hasGsiBuildId()) { + hash = (37 * hash) + GSI_BUILD_ID_FIELD_NUMBER; + hash = (53 * hash) + getGsiBuildId().hashCode(); + } + if (hasScheduleConfig()) { + hash = (37 * hash) + SCHEDULE_CONFIG_FIELD_NUMBER; + hash = (53 * hash) + getScheduleConfig().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1828,6 +2181,7 @@ public final class TestSuiteResultMessageProto { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getScheduleConfigFieldBuilder(); } } public Builder clear() { @@ -1874,6 +2228,18 @@ public final class TestSuiteResultMessageProto { bitField0_ = (bitField0_ & ~0x00080000); infraLogPath_ = ""; bitField0_ = (bitField0_ & ~0x00100000); + repackedImagePath_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00200000); + vendorBuildId_ = ""; + bitField0_ = (bitField0_ & ~0x00400000); + gsiBuildId_ = ""; + bitField0_ = (bitField0_ & ~0x00800000); + if (scheduleConfigBuilder_ == null) { + scheduleConfig_ = null; + } else { + scheduleConfigBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x01000000); return this; } @@ -1982,6 +2348,27 @@ public final class TestSuiteResultMessageProto { to_bitField0_ |= 0x00100000; } result.infraLogPath_ = infraLogPath_; + if (((bitField0_ & 0x00200000) == 0x00200000)) { + repackedImagePath_ = repackedImagePath_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00200000); + } + result.repackedImagePath_ = repackedImagePath_; + if (((from_bitField0_ & 0x00400000) == 0x00400000)) { + to_bitField0_ |= 0x00200000; + } + result.vendorBuildId_ = vendorBuildId_; + if (((from_bitField0_ & 0x00800000) == 0x00800000)) { + to_bitField0_ |= 0x00400000; + } + result.gsiBuildId_ = gsiBuildId_; + if (((from_bitField0_ & 0x01000000) == 0x01000000)) { + to_bitField0_ |= 0x00800000; + } + if (scheduleConfigBuilder_ == null) { + result.scheduleConfig_ = scheduleConfig_; + } else { + result.scheduleConfig_ = scheduleConfigBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2113,6 +2500,29 @@ public final class TestSuiteResultMessageProto { infraLogPath_ = other.infraLogPath_; onChanged(); } + if (!other.repackedImagePath_.isEmpty()) { + if (repackedImagePath_.isEmpty()) { + repackedImagePath_ = other.repackedImagePath_; + bitField0_ = (bitField0_ & ~0x00200000); + } else { + ensureRepackedImagePathIsMutable(); + repackedImagePath_.addAll(other.repackedImagePath_); + } + onChanged(); + } + if (other.hasVendorBuildId()) { + bitField0_ |= 0x00400000; + vendorBuildId_ = other.vendorBuildId_; + onChanged(); + } + if (other.hasGsiBuildId()) { + bitField0_ |= 0x00800000; + gsiBuildId_ = other.gsiBuildId_; + onChanged(); + } + if (other.hasScheduleConfig()) { + mergeScheduleConfig(other.getScheduleConfig()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -3569,6 +3979,429 @@ public final class TestSuiteResultMessageProto { onChanged(); return this; } + + private com.google.protobuf.LazyStringList repackedImagePath_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private void ensureRepackedImagePathIsMutable() { + if (!((bitField0_ & 0x00200000) == 0x00200000)) { + repackedImagePath_ = new com.google.protobuf.LazyStringArrayList(repackedImagePath_); + bitField0_ |= 0x00200000; + } + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public com.google.protobuf.ProtocolStringList + getRepackedImagePathList() { + return repackedImagePath_.getUnmodifiableView(); + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public int getRepackedImagePathCount() { + return repackedImagePath_.size(); + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public java.lang.String getRepackedImagePath(int index) { + return repackedImagePath_.get(index); + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public com.google.protobuf.ByteString + getRepackedImagePathBytes(int index) { + return repackedImagePath_.getByteString(index); + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public Builder setRepackedImagePath( + int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureRepackedImagePathIsMutable(); + repackedImagePath_.set(index, value); + onChanged(); + return this; + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public Builder addRepackedImagePath( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureRepackedImagePathIsMutable(); + repackedImagePath_.add(value); + onChanged(); + return this; + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public Builder addAllRepackedImagePath( + java.lang.Iterable<java.lang.String> values) { + ensureRepackedImagePathIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, repackedImagePath_); + onChanged(); + return this; + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public Builder clearRepackedImagePath() { + repackedImagePath_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00200000); + onChanged(); + return this; + } + /** + * <pre> + * GCS path to the repacked device[+GSI] image set. + * </pre> + * + * <code>repeated string repacked_image_path = 52;</code> + */ + public Builder addRepackedImagePathBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + ensureRepackedImagePathIsMutable(); + repackedImagePath_.add(value); + onChanged(); + return this; + } + + private java.lang.Object vendorBuildId_ = ""; + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public boolean hasVendorBuildId() { + return ((bitField0_ & 0x00400000) == 0x00400000); + } + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public java.lang.String getVendorBuildId() { + java.lang.Object ref = vendorBuildId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + vendorBuildId_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public com.google.protobuf.ByteString + getVendorBuildIdBytes() { + java.lang.Object ref = vendorBuildId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + vendorBuildId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public Builder setVendorBuildId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00400000; + vendorBuildId_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public Builder clearVendorBuildId() { + bitField0_ = (bitField0_ & ~0x00400000); + vendorBuildId_ = getDefaultInstance().getVendorBuildId(); + onChanged(); + return this; + } + /** + * <pre> + * Fetch info used to fetch and flash certain builds for retry_prompt command. + * </pre> + * + * <code>optional string vendor_build_id = 61;</code> + */ + public Builder setVendorBuildIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00400000; + vendorBuildId_ = value; + onChanged(); + return this; + } + + private java.lang.Object gsiBuildId_ = ""; + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public boolean hasGsiBuildId() { + return ((bitField0_ & 0x00800000) == 0x00800000); + } + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public java.lang.String getGsiBuildId() { + java.lang.Object ref = gsiBuildId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + gsiBuildId_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public com.google.protobuf.ByteString + getGsiBuildIdBytes() { + java.lang.Object ref = gsiBuildId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + gsiBuildId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public Builder setGsiBuildId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00800000; + gsiBuildId_ = value; + onChanged(); + return this; + } + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public Builder clearGsiBuildId() { + bitField0_ = (bitField0_ & ~0x00800000); + gsiBuildId_ = getDefaultInstance().getGsiBuildId(); + onChanged(); + return this; + } + /** + * <code>optional string gsi_build_id = 62;</code> + */ + public Builder setGsiBuildIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00800000; + gsiBuildId_ = value; + onChanged(); + return this; + } + + private android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage scheduleConfig_ = null; + private com.google.protobuf.SingleFieldBuilderV3< + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage, android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.Builder, android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessageOrBuilder> scheduleConfigBuilder_; + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public boolean hasScheduleConfig() { + return ((bitField0_ & 0x01000000) == 0x01000000); + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage getScheduleConfig() { + if (scheduleConfigBuilder_ == null) { + return scheduleConfig_ == null ? android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.getDefaultInstance() : scheduleConfig_; + } else { + return scheduleConfigBuilder_.getMessage(); + } + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public Builder setScheduleConfig(android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage value) { + if (scheduleConfigBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + scheduleConfig_ = value; + onChanged(); + } else { + scheduleConfigBuilder_.setMessage(value); + } + bitField0_ |= 0x01000000; + return this; + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public Builder setScheduleConfig( + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.Builder builderForValue) { + if (scheduleConfigBuilder_ == null) { + scheduleConfig_ = builderForValue.build(); + onChanged(); + } else { + scheduleConfigBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x01000000; + return this; + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public Builder mergeScheduleConfig(android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage value) { + if (scheduleConfigBuilder_ == null) { + if (((bitField0_ & 0x01000000) == 0x01000000) && + scheduleConfig_ != null && + scheduleConfig_ != android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.getDefaultInstance()) { + scheduleConfig_ = + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.newBuilder(scheduleConfig_).mergeFrom(value).buildPartial(); + } else { + scheduleConfig_ = value; + } + onChanged(); + } else { + scheduleConfigBuilder_.mergeFrom(value); + } + bitField0_ |= 0x01000000; + return this; + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public Builder clearScheduleConfig() { + if (scheduleConfigBuilder_ == null) { + scheduleConfig_ = null; + onChanged(); + } else { + scheduleConfigBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x01000000); + return this; + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.Builder getScheduleConfigBuilder() { + bitField0_ |= 0x01000000; + onChanged(); + return getScheduleConfigFieldBuilder().getBuilder(); + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + public android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessageOrBuilder getScheduleConfigOrBuilder() { + if (scheduleConfigBuilder_ != null) { + return scheduleConfigBuilder_.getMessageOrBuilder(); + } else { + return scheduleConfig_ == null ? + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.getDefaultInstance() : scheduleConfig_; + } + } + /** + * <code>optional .android.test.lab.ScheduleConfigMessage schedule_config = 63;</code> + */ + private com.google.protobuf.SingleFieldBuilderV3< + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage, android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.Builder, android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessageOrBuilder> + getScheduleConfigFieldBuilder() { + if (scheduleConfigBuilder_ == null) { + scheduleConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage, android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessage.Builder, android.test.lab.TestScheduleConfigMessageOuterClass.ScheduleConfigMessageOrBuilder>( + getScheduleConfig(), + getParentForChildren(), + isClean()); + scheduleConfig_ = null; + } + return scheduleConfigBuilder_; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); @@ -3632,22 +4465,27 @@ public final class TestSuiteResultMessageProto { descriptor; static { java.lang.String[] descriptorData = { - "\n\"proto/TestSuiteResultMessage.proto\022\013an" + - "droid.vts\"\204\004\n\026TestSuiteResultMessage\022\024\n\014" + - "access_token\030\001 \001(\t\022\023\n\013result_path\030\002 \001(\t\022" + - "\032\n\014boot_success\030\003 \001(\010:\004true\022\016\n\006branch\030\013 " + - "\002(\t\022\016\n\006target\030\014 \002(\t\022\020\n\010build_id\030\r \002(\t\022\022\n" + - "\nsuite_plan\030\025 \001(\t\022\025\n\rsuite_version\030\026 \001(\t" + - "\022\032\n\022suite_build_number\030\027 \001(\t\022\022\n\nstart_ti" + - "me\030\030 \001(\003\022\020\n\010end_time\030\031 \001(\003\022\021\n\thost_name\030" + - "\032 \001(\t\022\022\n\nsuite_name\030\033 \001(\t\022 \n\030build_syste" + - "m_fingerprint\030\037 \001(\t\022 \n\030build_vendor_fing", - "erprint\030 \001(\t\022\024\n\ttest_type\030! \001(\005:\0010\022\036\n\026p" + - "assed_test_case_count\030) \001(\005\022\036\n\026failed_te" + - "st_case_count\030* \001(\005\022\024\n\014modules_done\030+ \001(" + - "\005\022\025\n\rmodules_total\030, \001(\005\022\026\n\016infra_log_pa" + - "th\0303 \001(\tB6\n\025com.android.vts.protoB\033TestS" + - "uiteResultMessageProtoP\000" + "\n0vti/dashboard/proto/TestSuiteResultMes" + + "sage.proto\022\013android.vts\0326vti/test_servin" + + "g/proto/TestScheduleConfigMessage.proto\"" + + "\222\005\n\026TestSuiteResultMessage\022\024\n\014access_tok" + + "en\030\001 \001(\t\022\023\n\013result_path\030\002 \001(\t\022\032\n\014boot_su" + + "ccess\030\003 \001(\010:\004true\022\016\n\006branch\030\013 \002(\t\022\016\n\006tar" + + "get\030\014 \002(\t\022\020\n\010build_id\030\r \002(\t\022\022\n\nsuite_pla" + + "n\030\025 \001(\t\022\025\n\rsuite_version\030\026 \001(\t\022\032\n\022suite_" + + "build_number\030\027 \001(\t\022\022\n\nstart_time\030\030 \001(\003\022\020" + + "\n\010end_time\030\031 \001(\003\022\021\n\thost_name\030\032 \001(\t\022\022\n\ns", + "uite_name\030\033 \001(\t\022 \n\030build_system_fingerpr" + + "int\030\037 \001(\t\022 \n\030build_vendor_fingerprint\030 " + + "\001(\t\022\024\n\ttest_type\030! \001(\005:\0010\022\036\n\026passed_test" + + "_case_count\030) \001(\005\022\036\n\026failed_test_case_co" + + "unt\030* \001(\005\022\024\n\014modules_done\030+ \001(\005\022\025\n\rmodul" + + "es_total\030, \001(\005\022\026\n\016infra_log_path\0303 \001(\t\022\033" + + "\n\023repacked_image_path\0304 \003(\t\022\027\n\017vendor_bu" + + "ild_id\030= \001(\t\022\024\n\014gsi_build_id\030> \001(\t\022@\n\017sc" + + "hedule_config\030? \001(\0132\'.android.test.lab.S" + + "cheduleConfigMessageB6\n\025com.android.vts.", + "protoB\033TestSuiteResultMessageProtoP\000" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -3660,13 +4498,15 @@ public final class TestSuiteResultMessageProto { com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { + android.test.lab.TestScheduleConfigMessageOuterClass.getDescriptor(), }, assigner); internal_static_android_vts_TestSuiteResultMessage_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_android_vts_TestSuiteResultMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_android_vts_TestSuiteResultMessage_descriptor, - new java.lang.String[] { "AccessToken", "ResultPath", "BootSuccess", "Branch", "Target", "BuildId", "SuitePlan", "SuiteVersion", "SuiteBuildNumber", "StartTime", "EndTime", "HostName", "SuiteName", "BuildSystemFingerprint", "BuildVendorFingerprint", "TestType", "PassedTestCaseCount", "FailedTestCaseCount", "ModulesDone", "ModulesTotal", "InfraLogPath", }); + new java.lang.String[] { "AccessToken", "ResultPath", "BootSuccess", "Branch", "Target", "BuildId", "SuitePlan", "SuiteVersion", "SuiteBuildNumber", "StartTime", "EndTime", "HostName", "SuiteName", "BuildSystemFingerprint", "BuildVendorFingerprint", "TestType", "PassedTestCaseCount", "FailedTestCaseCount", "ModulesDone", "ModulesTotal", "InfraLogPath", "RepackedImagePath", "VendorBuildId", "GsiBuildId", "ScheduleConfig", }); + android.test.lab.TestScheduleConfigMessageOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) |