From e9c83075e0e0ecb7584dc8e78ab1affc7bfa52dc Mon Sep 17 00:00:00 2001 From: Ross Fairbanks Date: Fri, 29 Nov 2024 18:16:02 +0100 Subject: [PATCH 1/2] fix: Benchmark duration param name Signed-off-by: Ross Fairbanks --- scripts/project-trigger.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/project-trigger.sh b/scripts/project-trigger.sh index 7c7950f..598d2d8 100755 --- a/scripts/project-trigger.sh +++ b/scripts/project-trigger.sh @@ -70,7 +70,7 @@ jq -c '.projects[]' "$json_file" | while read -r project; do -H "Authorization: Bearer $gh_token" \ -H "X-GitHub-Api-Version: 2022-11-28" \ "https://api.github.com/repos/$workflow_organization_name/$workflow_project_name/actions/workflows/$workflow_dispatcher_file_name/dispatches" \ - -d "{\"ref\":\"${git_ref}\",\"inputs\":{\"cncf_project\":\"${proj_name}\",\"benchmark_job_url\":\"${proj_benchmark_manifest_url}\",\"benchmark_job_duration_mins\":\"${proj_benchmark_duration}\",\"config\":\"${config}\",\"version\":\"${latest_proj_version}\"}}") + -d "{\"ref\":\"${git_ref}\",\"inputs\":{\"cncf_project\":\"${proj_name}\",\"benchmark_job_url\":\"${proj_benchmark_manifest_url}\",\"benchmark_job_duration_mins\":\"${proj_benchmark_duration_mins}\",\"config\":\"${config}\",\"version\":\"${latest_proj_version}\"}}") status_code=$? if [ $status_code -ne 0 ]; then From a4688d4bae37f1c7e7aa7859768c33dd3b5b5a51 Mon Sep 17 00:00:00 2001 From: Ross Fairbanks Date: Tue, 3 Dec 2024 16:58:06 +0100 Subject: [PATCH 2/2] fix: Revert ns change and add wait Signed-off-by: Ross Fairbanks --- .github/workflows/benchmark-pipeline.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark-pipeline.yaml b/.github/workflows/benchmark-pipeline.yaml index 5143f33..c55a688 100644 --- a/.github/workflows/benchmark-pipeline.yaml +++ b/.github/workflows/benchmark-pipeline.yaml @@ -80,12 +80,12 @@ jobs: run: | kubectl apply -f manifest.yaml - sleep 10 + sleep 20 kubectl wait pod \ --all \ --for=condition=Ready \ - --namespace=falco # TODO: Revert to "benchmark" this after merging https://github.com/falcosecurity/cncf-green-review-testing/pull/22 + --namespace=benchmark benchmark-job: runs-on: ubuntu-24.04 @@ -100,6 +100,8 @@ jobs: - name: Run the benchmark job run: | kubectl apply -f ${{ inputs.benchmark_job_url }} + + sleep 20 kubectl wait pod \ --all \