Fixed help.

Signed-off-by: bwplotka <[email protected]>
prometheus · Dec 19, 2024 · 4fec7c1 · 4fec7c1
1 parent 468dcb6
commit 4fec7c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/prombench/manifests/cluster-infra/7a_commentmonitor_configmap_noparse.yaml b/prombench/manifests/cluster-infra/7a_commentmonitor_configmap_noparse.yaml
@@ -47,8 +47,8 @@ data:
           {{- with $version }}
           
           **Custom benchmark version:**
-          {{- if hasPrefix $version "@" }} [**`{{ trimPrefix $version "@" }}` commit**](https://github.com/prometheus/test-infra/tree/{{ trimPrefix $version "@" }}/prombench/{{ $directory }})
-          {{- else }} [**`{{ $version }}` branch**](https://github.com/prometheus/test-infra/tree/{{ $version }}/prombench/{{ $directory }}){{ end }}
+          {{- if hasPrefix $version "@" }} [**`{{ trimPrefix $version "@" }}` commit**](https://github.com/prometheus/test-infra/tree/{{ trimPrefix $version "@" }}/prombench/{{ or $directory "manifests/prombench" }})
+          {{- else }} [**`{{ $version }}` branch**](https://github.com/prometheus/test-infra/tree/{{ $version }}/prombench/{{ or $directory "manifests/prombench" }}){{ end }}
           {{- end }}
           
           After successful deployment ([check status here](https://github.com/prometheus/prometheus/actions/workflows/prombench.yml)), the benchmarking results can be viewed at:
@@ -77,12 +77,12 @@ data:
           **Compared versions:** [**`PR-{{ index . "PR_NUMBER" }}`**](http://{{ index . "DOMAIN_NAME" }}/{{ index . "PR_NUMBER" }}/prometheus-pr) and [**`{{ index . "RELEASE" }}`**](http://{{ index . "DOMAIN_NAME" }}/{{ index . "PR_NUMBER" }}/prometheus-release)
 
           {{- $version := index . "BENCHMARK_VERSION" }}
-          {{- $directory := index . "BENCHMARK_DIRECTORY" | print "manifests/prombench" }}
+          {{- $directory := index . "BENCHMARK_DIRECTORY" }}
           {{- with $version }}
           
           **Custom benchmark version:**
-          {{- if hasPrefix $version "@" }} [**`{{ trimPrefix $version "@" }}` commit**](https://github.com/prometheus/test-infra/tree/{{ trimPrefix $version "@" }}/prombench/{{ $directory }})
-          {{- else }} [**`{{ $version }}` branch**](https://github.com/prometheus/test-infra/tree/{{ $version }}/prombench/{{ $directory }}){{ end }}
+          {{- if hasPrefix $version "@" }} [**`{{ trimPrefix $version "@" }}` commit**](https://github.com/prometheus/test-infra/tree/{{ trimPrefix $version "@" }}/prombench/{{ or $directory "manifests/prombench" }})
+          {{- else }} [**`{{ $version }}` branch**](https://github.com/prometheus/test-infra/tree/{{ $version }}/prombench/{{ or $directory "manifests/prombench" }}){{ end }}
           {{- end }}
 
           After the successful deployment ([check status here](https://github.com/prometheus/prometheus/actions/workflows/prombench.yml)), the benchmarking results can be viewed at:

diff --git a/tools/comment-monitor/internal/command_test.go b/tools/comment-monitor/internal/command_test.go
@@ -284,6 +284,10 @@ func TestGenerateSuccessComment_ProdCommentMonitorConfig(t *testing.T) {
 			comment:                  "/prombench v3.0.0 --bench.version=branch1",
 			expectSuccessCommentFile: "testdata/expectedcomment.start-version.md",
 		},
+		{
+			comment:                  "/prombench v3.0.0 --bench.version=branch1 --bench.directory=lol",
+			expectSuccessCommentFile: "testdata/expectedcomment.start-version-dir.md",
+		},
 		{
 			comment:                  "/prombench restart v3.0.0",
 			expectSuccessCommentFile: "testdata/expectedcomment.restart-no-flags.md",
@@ -317,7 +321,7 @@ func TestGenerateSuccessComment_ProdCommentMonitorConfig(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if diff := cmp.Diff(got, string(expected)); diff != "" {
+			if diff := cmp.Diff(string(expected), got); diff != "" {
 				t.Fatal(diff)
 			}
 		})