diff --git a/Jenkinsfile b/Jenkinsfile index 180a6ec..0f7c579 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -181,16 +181,12 @@ PY stage('Run quality gate') { steps { - container('go-tester') { + container('publisher') { sh ''' set -eu - apt-get update >/dev/null - apt-get install -y --no-install-recommends python3 >/dev/null - set +e - python3 -m testing.pegasus_gate report - gate_rc=$? - set -e - printf '%s\n' "${gate_rc}" > build/quality-gate.rc + apt-get update + apt-get install -y --no-install-recommends nodejs npm + python -m testing.pegasus_gate report ''' } } @@ -212,7 +208,9 @@ PY container('publisher') { sh ''' set -eu - test "$(cat build/quality-gate.rc 2>/dev/null || echo 1)" -eq 0 + apt-get update + apt-get install -y --no-install-recommends nodejs npm + python -m testing.pegasus_gate enforce ''' } } diff --git a/scripts/publish_test_metrics.py b/scripts/publish_test_metrics.py index 7673f0c..6c99e5c 100755 --- a/scripts/publish_test_metrics.py +++ b/scripts/publish_test_metrics.py @@ -299,8 +299,8 @@ def main() -> int: f'platform_quality_gate_runs_total{{suite="{suite}",status="ok"}} {ok_count:.0f}', f'platform_quality_gate_runs_total{{suite="{suite}",status="failed"}} {failed_count:.0f}', "# TYPE pegasus_test_suite_result gauge", - f'pegasus_test_suite_result{{suite="backend",status="{backend_suite_result}"}} 1', - f'pegasus_test_suite_result{{suite="frontend",status="{frontend_suite_result}"}} 1', + f'pegasus_test_suite_result{{test_suite="backend",status="{backend_suite_result}"}} 1', + f'pegasus_test_suite_result{{test_suite="frontend",status="{frontend_suite_result}"}} 1', "# TYPE pegasus_quality_gate_tests_total gauge", f'pegasus_quality_gate_tests_total{{suite="{suite}",result="passed"}} {passed}', f'pegasus_quality_gate_tests_total{{suite="{suite}",result="failed"}} {totals["failures"]}',