Skip to content

Commit

Permalink
Merge branch 'master' into 2019_2_1_port_51098
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryce Larson authored Sep 25, 2019
2 parents 434e9e6 + e2b86bf commit ba7c969
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .ci/kitchen-amazon2-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-amazon2-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-centos6-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-centos7-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-centos7-py2-tcp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-centos7-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-centos7-py3-tcp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-debian8-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-debian8-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-debian9-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-debian9-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-fedora29-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-fedora29-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-ubuntu1604-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-ubuntu1604-py2-tcp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-ubuntu1604-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-ubuntu1604-py3-tcp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-ubuntu1804-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-ubuntu1804-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-windows2016-py2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down
2 changes: 1 addition & 1 deletion .ci/kitchen-windows2016-py3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
"GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
"CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
'RBENV_VERSION=2.4.2',
'RBENV_VERSION=2.6.3',
"TEST_SUITE=${python_version}",
"TEST_PLATFORM=${distro_name}-${distro_version}",
"TEST_TRANSPORT=${test_transport}",
Expand Down

0 comments on commit ba7c969

Please sign in to comment.