switch back to bojand/ghz image (#333)

* switch back to bojand/ghz image

* put dart grpc on hold

.github/workflows/build.yml

@@ -240,42 +240,6 @@ jobs:
         GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
 
 
-  dart_grpc_bench:
-    runs-on: ubuntu-latest
-    needs:
-    - set-image-name
-    - changed
-    if: fromJSON(needs.changed.outputs.base) || contains(needs.changed.outputs.files, 'dart_grpc_bench/')
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Build dart_grpc_bench
-      run: ./build.sh dart_grpc_bench
-      env:
-        GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
-
-    - name: Benchmark dart_grpc_bench
-      run: ./bench.sh dart_grpc_bench
-      env:
-        GRPC_BENCHMARK_DURATION: 30s
-        GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
-
-    - if: github.ref == 'refs/heads/master'
-      name: Log in to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - if: github.ref == 'refs/heads/master'
-      name: If on master push image to GHCR
-      run: docker push $GRPC_IMAGE_NAME:dart_grpc_bench-complex_proto
-      env:
-        GRPC_IMAGE_NAME: ${{ needs.set-image-name.outputs.name }}
-
-
   dotnet_grpc_bench:
     runs-on: ubuntu-latest
     needs:

analyze.sh

@@ -22,4 +22,5 @@ $(git log -1 --pretty="%h %cD %cn %s")
 - GRPC_CLIENT_QPS=${GRPC_CLIENT_QPS}
 - GRPC_CLIENT_CPUS=${GRPC_CLIENT_CPUS}
 - GRPC_REQUEST_SCENARIO=${GRPC_REQUEST_SCENARIO}
+- GRPC_GHZ_TAG=${GRPC_GHZ_TAG}
 EOF

bench.sh

@@ -17,6 +17,7 @@ export GRPC_CLIENT_QPS=$(( GRPC_CLIENT_QPS / GRPC_CLIENT_CONCURRENCY ))
 export GRPC_CLIENT_CPUS=${GRPC_CLIENT_CPUS:-"1"}
 export GRPC_REQUEST_SCENARIO=${GRPC_REQUEST_SCENARIO:-"complex_proto"}
 export GRPC_IMAGE_NAME="${GRPC_IMAGE_NAME:-grpc_bench}"
+export GRPC_GHZ_TAG="${GRPC_GHZ_TAG:-0.114.0}"
 
 # Let containers know how many CPUs they will be running on
 # Additionally export other vars for further analysis script.
@@ -75,9 +76,11 @@ for benchmark in ${BENCHMARKS_TO_RUN}; do
     	docker run --name ghz --rm --network=host -v "${PWD}/proto:/proto:ro" \
     	    -v "${PWD}/payload:/payload:ro" \
     		--cpus $GRPC_CLIENT_CPUS \
-    	  obvionaoe/ghz:v0.103.0 \
+        ghcr.io/bojand/ghz:"${GRPC_GHZ_TAG}" \
     		--proto=/proto/helloworld/helloworld.proto \
     		--call=helloworld.Greeter.SayHello \
+            --disable-template-functions \
+            --disable-template-data \
             --insecure \
             --concurrency="${GRPC_CLIENT_CONCURRENCY}" \
             --connections="${GRPC_CLIENT_CONNECTIONS}" \
@@ -101,9 +104,11 @@ for benchmark in ${BENCHMARKS_TO_RUN}; do
 	docker run --name ghz --rm --network=host -v "${PWD}/proto:/proto:ro" \
 	    -v "${PWD}/payload:/payload:ro" \
 		--cpus $GRPC_CLIENT_CPUS \
-    obvionaoe/ghz:v0.103.0 \
+    ghcr.io/bojand/ghz:"${GRPC_GHZ_TAG}" \
 		--proto=/proto/helloworld/helloworld.proto \
 		--call=helloworld.Greeter.SayHello \
+        --disable-template-functions \
+        --disable-template-data \
         --insecure \
         --concurrency="${GRPC_CLIENT_CONCURRENCY}" \
         --connections="${GRPC_CLIENT_CONNECTIONS}" \