From 56d545c2e2dd7cfa8a47bb3a12152fe694a3dc35 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 18 Aug 2020 10:53:38 +0200 Subject: [PATCH] ci: pass REBASE=1 while running commitlint job By passing REBASE=1 to the commitlint make target, the current checked out PR will be rebased on top of the parent branch. This should result in a linear history that commitlint can parse correctly. Signed-off-by: Niels de Vos --- commitlint.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commitlint.groovy b/commitlint.groovy index cd84bb519..4fb2fabf7 100644 --- a/commitlint.groovy +++ b/commitlint.groovy @@ -41,7 +41,7 @@ node('cico-workspace') { if (params.ghprbTargetBranch != null) { git_since = "origin/${ghprbTargetBranch}" } - sh "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${CICO_NODE} 'cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-test CONTAINER_CMD=podman TARGET=commitlint GIT_SINCE=${git_since}'" + sh "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@${CICO_NODE} 'cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-test CONTAINER_CMD=podman TARGET=commitlint GIT_SINCE=${git_since} REBASE=1'" } }