workflows: fix benchmark tests (#4252)

* adds 1.21 to cluster list.
fluent · Oct 28, 2021 · 231ef4b · 231ef4b
1 parent b05f5dd
commit 231ef4b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/benchmark-run-master.yaml b/.github/workflows/benchmark-run-master.yaml
@@ -6,13 +6,13 @@ on:
       - completed
 jobs:
   run-benchmark-gcp:
-    name: run-benchmark on GCP - k8s ${{ matrix.k8s-release }}
+    name: run benchmark tests on GCP - k8s ${{ matrix.k8s-release }}
     if: github.event.workflow_run.conclusion == 'success'
     strategy:
       max-parallel: 3
       fail-fast: false
       matrix:
-        k8s-release: [ '1.19' ] #, '1.20' ] #, 1.19/stable, 1.18/stable ]
+        k8s-release: [ '1.21' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -89,9 +89,20 @@ jobs:
         run: terraform output -no-color -raw gcp-project-id
         working-directory: ci/terraform/gcp/
 
+      - name: Get the bigquery dataset id from terraform output
+        id: get-gcp-bigquery-dataset-id
+        run: terraform output -no-color -raw gcp-bigquery-dataset-id
+        working-directory: ci/terraform/gcp/
+
+      - name: Get the bigquery table id from terraform output
+        id: get-gcp-bigquery-table-id
+        run: terraform output -no-color -raw gcp-bigquery-table-id
+        working-directory: ci/terraform/gcp/
+
       - uses: google-github-actions/setup-gcloud@master
         with:
           service_account_key: ${{ secrets.GCP_SA_KEY }}
+          export_default_credentials: true
 
       - uses: google-github-actions/get-gke-credentials@main
         with:
@@ -101,7 +112,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.15' # The Go version to download (if necessary) and use.
+          go-version: '1.16' # The Go version to download (if necessary) and use.
 
       - uses: azure/setup-helm@v1
         id: install
@@ -111,6 +122,10 @@ jobs:
 
       - run: make benchmark
         env:
+          GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
+          GCP_BQ_DATASET_ID: ${{ steps.get-gcp-bigquery-dataset-id.outputs.stdout }}
+          GCP_BQ_TABLE_ID: ${{ steps.get-gcp-bigquery-table-id.outputs.stdout }}
+          GCP_PROJECT_ID: fluent-bit-ci
           IMAGE_REPOSITORY: fluentbitdev/fluent-bit
           IMAGE_TAG: x86_64-master
           GRAFANA_USERNAME: ${{ secrets.GRAFANA_USERNAME }}

diff --git a/.github/workflows/integration-run-master.yaml b/.github/workflows/integration-run-master.yaml
@@ -62,13 +62,13 @@ jobs:
         working-directory: ci/
 
   run-integration-gcp:
-    name: run-integration on GCP - k8s ${{ matrix.k8s-release }}
+    name: run integration tests on GCP - k8s ${{ matrix.k8s-release }}
     needs: publish-docker-images
     strategy:
       max-parallel: 3
       fail-fast: false
       matrix:
-        k8s-release: [ '1.19' ]#, '1.20' ] #, 1.19/stable, 1.18/stable ]
+        k8s-release: [ '1.21' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2