Remove support for csharp(core) and ruby for PSM tests. (#29694)

tools/run_tests/performance/loadtest_examples.sh

@@ -82,7 +82,6 @@ scenarios=(
 
 psm_scenarios=(
     "cpp_protobuf_async_unary_5000rpcs_1KB_psm"
-    "csharp_protobuf_async_unary_5000rpcs_1KB_psm"
     "go_protobuf_async_unary_5000rpcs_1KB_psm"
     "java_protobuf_async_unary_5000rpcs_1KB_psm"
     "node_to_node_protobuf_async_unary_5000rpcs_1KB_psm"
@@ -90,7 +89,6 @@ psm_scenarios=(
     "php7_protobuf_c_extension_to_cpp_protobuf_async_unary_5000rpcs_1KB_psm"
     "python_protobuf_async_unary_5000rpcs_1KB_psm"
     "python_asyncio_protobuf_async_unary_5000rpcs_1KB_psm"
-    "ruby_protobuf_async_unary_5000rpcs_1KB_psm"
 )
 
 # Basic examples are intended to be runnable _as is_, so substitution keys

tools/run_tests/performance/scenario_config.py

@@ -625,20 +625,6 @@ class CSharpLanguage(Language):
         return 100
 
     def scenarios(self):
-        yield _ping_pong_scenario(
-            'csharp_protobuf_async_unary_5000rpcs_1KB_psm',
-            rpc_type='UNARY',
-            client_type='ASYNC_CLIENT',
-            server_type='ASYNC_SERVER',
-            req_size=1024,
-            resp_size=1024,
-            outstanding=5000,
-            channels=1,
-            num_clients=1,
-            secure=False,
-            async_server_threads=1,
-            categories=[PSM])
-
         yield _ping_pong_scenario('csharp_generic_async_streaming_ping_pong',
                                   rpc_type='STREAMING',
                                   client_type='ASYNC_CLIENT',
@@ -1139,19 +1125,6 @@ class RubyLanguage(Language):
         return 300
 
     def scenarios(self):
-        yield _ping_pong_scenario('ruby_protobuf_async_unary_5000rpcs_1KB_psm',
-                                  rpc_type='UNARY',
-                                  client_type='ASYNC_CLIENT',
-                                  server_type='ASYNC_SERVER',
-                                  req_size=1024,
-                                  resp_size=1024,
-                                  outstanding=5000,
-                                  channels=1,
-                                  num_clients=1,
-                                  secure=False,
-                                  async_server_threads=1,
-                                  categories=[PSM])
-
         yield _ping_pong_scenario('ruby_protobuf_sync_streaming_ping_pong',
                                   rpc_type='STREAMING',
                                   client_type='SYNC_CLIENT',

tools/run_tests/performance/templates/loadtest_template_psm_proxied_basic_all_languages.yaml

@@ -14,46 +14,6 @@ metadata:
   name: psm_proxied_all_languages
 spec:
   clients:
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc.git
-    language: csharp
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
-    - image: ${psm_image_prefix}/sidecar:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: sidecar
   - build:
       args:
       - build
@@ -391,70 +351,12 @@ spec:
         tcpSocket:
           port: 10000
       name: sidecar
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc
-    language: ruby
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" ruby \
-            src/ruby/qps/worker.rb --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
-    - image: ${psm_image_prefix}/sidecar:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: sidecar
   driver:
     language: cxx
     run: []
   results:
     bigQueryTable: ${big_query_table}
   servers:
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc.git
-    language: csharp
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      name: main
   - build:
       args:
       - build
@@ -586,23 +488,5 @@ spec:
       command:
       - bash
       name: main
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc
-    language: ruby
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" ruby \
-            src/ruby/qps/worker.rb --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      name: main
   timeoutSeconds: ${timeout_seconds}
   ttlSeconds: 86400

tools/run_tests/performance/templates/loadtest_template_psm_proxied_prebuilt_all_languages.yaml

@@ -14,40 +14,6 @@ metadata:
   name: psm_proxied_prebuilt_all_languages
 spec:
   clients:
-  - language: csharp
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            /execute/qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      image: ${prebuilt_image_prefix}/csharp:${prebuilt_image_tag}
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
-    - image: ${psm_image_prefix}/sidecar:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: sidecar
   - language: cxx
     pool: ${client_pool}
     run:
@@ -317,40 +283,6 @@ spec:
         tcpSocket:
           port: 10000
       name: sidecar
-  - language: ruby
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" \
-            /execute/src/ruby/qps/worker.rb \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      image: ${prebuilt_image_prefix}/ruby:${prebuilt_image_tag}
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
-    - image: ${psm_image_prefix}/sidecar:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: sidecar
   driver:
     language: cxx
     pool: ${driver_pool}
@@ -360,19 +292,6 @@ spec:
   results:
     bigQueryTable: ${big_query_table}
   servers:
-  - language: csharp
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            /execute/qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      image: ${prebuilt_image_prefix}/csharp:${prebuilt_image_tag}
-      name: main
   - language: cxx
     pool: ${server_pool}
     run:
@@ -450,18 +369,5 @@ spec:
         timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" \
             /execute/benchmark_worker \
             --driver_port="${DRIVER_PORT}"
-  - language: ruby
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" \
-            /execute/src/ruby/qps/worker.rb \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      image: ${prebuilt_image_prefix}/ruby:${prebuilt_image_tag}
-      name: main
   timeoutSeconds: ${timeout_seconds}
   ttlSeconds: 86400

tools/run_tests/performance/templates/loadtest_template_psm_proxyless_basic_all_languages.yaml

@@ -14,42 +14,6 @@ metadata:
   name: psm_proxyless_all_languages
 spec:
   clients:
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc.git
-    language: csharp
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      env:
-      - name: GRPC_XDS_BOOTSTRAP
-        value: /bootstrap/bootstrap.json
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
   - build:
       args:
       - build
@@ -352,66 +316,12 @@ spec:
         tcpSocket:
           port: 10000
       name: xds-server
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc
-    language: ruby
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" ruby \
-            src/ruby/qps/worker.rb --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      env:
-      - name: GRPC_XDS_BOOTSTRAP
-        value: /bootstrap/bootstrap.json
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
   driver:
     language: cxx
     run: []
   results:
     bigQueryTable: ${big_query_table}
   servers:
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc.git
-    language: csharp
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      name: main
   - build:
       args:
       - build
@@ -543,23 +453,5 @@ spec:
       command:
       - bash
       name: main
-  - build:
-      command:
-      - bash
-      - /build_scripts/build_qps_worker.sh
-    clone:
-      gitRef: master
-      repo: https://github.com/grpc/grpc
-    language: ruby
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" ruby \
-            src/ruby/qps/worker.rb --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      name: main
   timeoutSeconds: ${timeout_seconds}
   ttlSeconds: 86400

tools/run_tests/performance/templates/loadtest_template_psm_proxyless_prebuilt_all_languages.yaml

@@ -14,36 +14,6 @@ metadata:
   name: psm_proxyless_prebuilt_all_languages
 spec:
   clients:
-  - language: csharp
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            /execute/qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      env:
-      - name: GRPC_XDS_BOOTSTRAP
-        value: /bootstrap/bootstrap.json
-      image: ${prebuilt_image_prefix}/csharp:${prebuilt_image_tag}
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
   - language: cxx
     pool: ${client_pool}
     run:
@@ -281,36 +251,6 @@ spec:
         tcpSocket:
           port: 10000
       name: xds-server
-  - language: ruby
-    pool: ${client_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" \
-            /execute/src/ruby/qps/worker.rb \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      env:
-      - name: GRPC_XDS_BOOTSTRAP
-        value: /bootstrap/bootstrap.json
-      image: ${prebuilt_image_prefix}/ruby:${prebuilt_image_tag}
-      name: main
-    - args:
-      - -default-config-path
-      - containers/runtime/xds-server/config/default_config.json
-      - -path-to-bootstrap
-      - containers/runtime/xds-server/bootstrap.json
-      command:
-      - main
-      image: ${psm_image_prefix}/xds-server:${psm_image_tag}
-      livenessProbe:
-        initialDelaySeconds: 30
-        periodSeconds: 5
-        tcpSocket:
-          port: 10000
-      name: xds-server
   driver:
     language: cxx
     pool: ${driver_pool}
@@ -320,19 +260,6 @@ spec:
   results:
     bigQueryTable: ${big_query_table}
   servers:
-  - language: csharp
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" dotnet exec \
-            /execute/qps_worker/Grpc.IntegrationTesting.QpsWorker.dll \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      image: ${prebuilt_image_prefix}/csharp:${prebuilt_image_tag}
-      name: main
   - language: cxx
     pool: ${server_pool}
     run:
@@ -410,18 +337,5 @@ spec:
         timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" \
             /execute/benchmark_worker \
             --driver_port="${DRIVER_PORT}"
-  - language: ruby
-    pool: ${server_pool}
-    run:
-    - args:
-      - -c
-      - |
-        timeout --kill-after="${KILL_AFTER}" "${POD_TIMEOUT}" \
-            /execute/src/ruby/qps/worker.rb \
-            --driver_port="${DRIVER_PORT}"
-      command:
-      - bash
-      image: ${prebuilt_image_prefix}/ruby:${prebuilt_image_tag}
-      name: main
   timeoutSeconds: ${timeout_seconds}
   ttlSeconds: 86400