Upmerge 1.38.x (#26494)

* Bump version to v1.38.0-pre1 (#26208)

* Bump version to v1.38.0-pre1

* Regenerate projects

* [Backport][v1.38.x] Add EventEngine's port.h to the podspec (#26222)

Backport of #26220 to v1.38.x. This is the only backport, since the EventEngine code was introduced after v1.37 was cut.

This file is needed for the Objective-C cocoapod build.

* fix xds resolver to add XdsClient to channel args even on errors (#26282) (#26288)

Co-authored-by: Mark D. Roth <roth@google.com>

* Backport config update timeout change to v1.38.x (#26276)

* Enable Traffic Director time tracer (#26111)

* Just update the timeout (#26223)

* Increase xds job timeouts (#26187)

* Revert grpc_xds_k8s job timeouts back to 120 mins (#26219)

* Revert grpc_xds_k8s_python timeout to 120mins (#26221)

Seems to have been inadvertently increased in #26187

Co-authored-by: Eric Gribkoff <ericgribkoff@google.com>
Co-authored-by: Yash Tibrewal <yashkt@google.com>

* Bump v1.38.x to v1.38.0  (#26317)

* Bump version to v1.38.0

* Regenerate projects

* Provide custom sponge configs to exclude manual runs from testgrid (#26283) (#26313)

* Provide custom sponge configs

* Correct the script

* Allow test scripts to produce artifacts through Docker

* Overcome the direcotry clone in our docker script

* Expose TESTGRID_EXCLUDE and GIT_ORIGIN_URL through docker run

* Make sanity tests happy

* Revert "Provide custom sponge configs to exclude manual runs from testgrid (#26283) (#26313)" (#26324)

This reverts commit 54dc182082.

* better way of building protoc aarch64 artifacts (#26423)

* Backport #26430 and #26435 to v1.38.x (#26436)

* workaround #26279 at the expense of binary compatibility

* correctly tag aarch64 wheels as manylinux_2_24

* remove unnecessary comments left by #26430

* Backport #22964 into v1.38.x (#26448)

* upgrade dotnet SDK 3 for C# build

* add C# global.json

* install dotnet SDK 3 on macos

* upgrade C# docker images to debian buster

* regenerate dockerfiles

* Backport fixes from #26465 to v1.38.x (#26466)

* switch remaining tests to C# buster image

* remove C#'s global.json (which requires dotnet SDK 3+)

* dotnet SDK3 currently breaks C# package build

* regenerate dockerfiles

Co-authored-by: Yash Tibrewal <yashkt@google.com>
Co-authored-by: AJ Heller <hork@google.com>
Co-authored-by: donnadionne <donnadionne@google.com>
Co-authored-by: Mark D. Roth <roth@google.com>
Co-authored-by: Lidi Zheng <lidiz@google.com>
Co-authored-by: Eric Gribkoff <ericgribkoff@google.com>
Co-authored-by: Jan Tattermusch <jtattermusch@users.noreply.github.com>
pull/26499/head
apolcyn 4 years ago committed by GitHub
parent 62bfefae17
commit f9d8524458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

Diff Content Not Available