yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10608 from id/0505-ci-fix-artifact-name 

ci: fix artifact name in scheduled packages workflow
This commit is contained in:
Ivan Dyachkov 2023-05-05 08:38:32 +02:00 committed by GitHub
parent a8f2ef30e6 b94b33f722
commit afb613ffd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_packages_cron.yaml vendored
View File

@ -32,7 +32,7 @@ jobs:
zip -ryq source.zip source/* source/.[^.]* zip -ryq source.zip source/* source/.[^.]*
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: source-${{ matrix.profile[1] }} name: source-${{ matrix.profile[0] }}
path: source.zip path: source.zip
linux: linux:

8
.github/workflows/performance_test.yaml vendored
View File

@ -52,7 +52,7 @@ jobs:
env: env:
TF_VAR_bench_id: ${{ needs.prepare.outputs.BENCH_ID }} TF_VAR_bench_id: ${{ needs.prepare.outputs.BENCH_ID }}
TF_VAR_package_file: ${{ needs.prepare.outputs.PACKAGE_FILE }} 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_VAR_grafana_api_key: ${{ secrets.TF_EMQX_PERF_TEST_GRAFANA_API_KEY }}
TF_AWS_REGION: eu-north-1 TF_AWS_REGION: eu-north-1
@ -85,15 +85,17 @@ jobs:
run: | run: |
terraform apply -auto-approve terraform apply -auto-approve
- name: Wait for test results - name: Wait for test results
timeout-minutes: 30
working-directory: ./tf-emqx-performance-test working-directory: ./tf-emqx-performance-test
id: test-results id: test-results
run: | 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 until aws s3api head-object --bucket tf-emqx-performance-test --key "$TF_VAR_bench_id/DONE" > /dev/null 2>&1
do do
echo 'waiting' printf '.'
sleep 10 sleep 10
done 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/metrics.json" ./
aws s3 cp "s3://tf-emqx-performance-test/$TF_VAR_bench_id/stats.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 echo MESSAGES_DELIVERED=$(cat metrics.json | jq '[.[]."messages.delivered"] | add') >> $GITHUB_OUTPUT