From 2406c4a89682df15b8a372fc4ba1f50d4f7631fd Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 5 May 2023 07:50:45 +0200 Subject: [PATCH 1/2] ci: fix artifact name in scheduled packages workflow --- .github/workflows/build_packages_cron.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml index 0eb08cb4d..a90187221 100644 --- a/.github/workflows/build_packages_cron.yaml +++ b/.github/workflows/build_packages_cron.yaml @@ -32,7 +32,7 @@ jobs: zip -ryq source.zip source/* source/.[^.]* - uses: actions/upload-artifact@v3 with: - name: source-${{ matrix.profile[1] }} + name: source-${{ matrix.profile[0] }} path: source.zip linux: From b94b33f722eb69a11c6a13344d006d3bc81d0076 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 5 May 2023 08:04:20 +0200 Subject: [PATCH 2/2] ci(perf test): update tf variable name and set job timeout --- .github/workflows/performance_test.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/performance_test.yaml b/.github/workflows/performance_test.yaml index 2433f3621..00ba15ed0 100644 --- a/.github/workflows/performance_test.yaml +++ b/.github/workflows/performance_test.yaml @@ -52,7 +52,7 @@ jobs: env: TF_VAR_bench_id: ${{ needs.prepare.outputs.BENCH_ID }} TF_VAR_package_file: ${{ needs.prepare.outputs.PACKAGE_FILE }} - TF_VAR_test_duration_seconds: 300 + TF_VAR_test_duration: 300 TF_VAR_grafana_api_key: ${{ secrets.TF_EMQX_PERF_TEST_GRAFANA_API_KEY }} TF_AWS_REGION: eu-north-1 @@ -85,15 +85,17 @@ jobs: run: | terraform apply -auto-approve - name: Wait for test results + timeout-minutes: 30 working-directory: ./tf-emqx-performance-test id: test-results run: | - sleep $TF_VAR_test_duration_seconds + sleep $TF_VAR_test_duration until aws s3api head-object --bucket tf-emqx-performance-test --key "$TF_VAR_bench_id/DONE" > /dev/null 2>&1 do - echo 'waiting' + printf '.' sleep 10 done + echo aws s3 cp "s3://tf-emqx-performance-test/$TF_VAR_bench_id/metrics.json" ./ aws s3 cp "s3://tf-emqx-performance-test/$TF_VAR_bench_id/stats.json" ./ echo MESSAGES_DELIVERED=$(cat metrics.json | jq '[.[]."messages.delivered"] | add') >> $GITHUB_OUTPUT