OCM-7614 | fix: test auto id:11111,11112 and update id:21111,21112

openshift · Apr 25, 2024 · e714f0c · e714f0c
1 parent 4b3b5be
commit e714f0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/images/Dockerfile.e2e b/images/Dockerfile.e2e
@@ -5,7 +5,7 @@ COPY . .
 RUN go install ./cmd/rosa
 RUN go test -c -o /go/bin/rosatest ./tests/e2e
 RUN rosa verify openshift-client
-RUN rosatest --ginkgo.label-filter "e2e-commit"
+RUN rosatest --ginkgo.no-color --ginkgo.label-filter "e2e-commit"
 
 FROM registry.ci.openshift.org/ci/cli-ocm:latest as ocmcli
 

diff --git a/tests/e2e/e2e_pre_check_test.go b/tests/e2e/e2e_pre_check_test.go
@@ -17,6 +17,6 @@ var _ = Describe("PreCheck", func() {
 
 		focus, err := rosacli.GetCommitFoucs()
 		Expect(err).ToNot(HaveOccurred())
-		fmt.Printf("[%s] Focus: %v\n", author, focus)
+		fmt.Printf("The user %s updates: %s\n", author, focus)
 	})
 })
diff --git a/tests/utils/exec/rosacli/pr_check.go b/tests/utils/exec/rosacli/pr_check.go
@@ -9,7 +9,7 @@ import (
 )
 
 func GetCommitAuthor() (string, error) {
-	command := "git log -n 1 --pretty=format:%an"
+	command := "git log -n 1 --no-merges --pretty=format:%an"
 	runner := NewRunner()
 
 	output, err := runner.RunCMD(strings.Split(command, " "))
@@ -21,7 +21,7 @@ func GetCommitAuthor() (string, error) {
 }
 
 func GetCommitFoucs() (string, error) {
-	command := "git log -n 1 --pretty=format:%s"
+	command := "git log -n 1 --no-merges --pretty=format:%s"
 	runner := NewRunner()
 
 	output, err := runner.RunCMD(strings.Split(command, " "))