From 9b51d612768461be356738874137958b46c9d467 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Tue, 12 Jun 2018 14:44:27 +0200 Subject: [PATCH] Location of scripts was incorrect Signed-off-by: Raphael Defosseux --- ci-scripts/Jenkinsfile-gitlab | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index 6f062194cd..510d594eb5 100644 --- a/ci-scripts/Jenkinsfile-gitlab +++ b/ci-scripts/Jenkinsfile-gitlab @@ -21,8 +21,8 @@ pipeline { if ("MERGE".equals(env.gitlabActionType)) { // GitLab-Jenkins pugin integration is lacking to perform the merge by itself // Doing it manually --> it may have merge conflicts - sh "./scripts/doGitLabMerge.sh ${env.gitlabSourceBranch} ${env.gitlabMergeRequestLastCommit} ${env.gitlabTargetBranch} ${GIT_COMMIT}" - sh "./scripts/checkCodingFormattingRules.sh ${env.gitlabSourceBranch} ${env.gitlabTargetBranch}" + sh "./ci-scripts/doGitLabMerge.sh ${env.gitlabSourceBranch} ${env.gitlabMergeRequestLastCommit} ${env.gitlabTargetBranch} ${GIT_COMMIT}" + sh "./ci-scripts/checkCodingFormattingRules.sh ${env.gitlabSourceBranch} ${env.gitlabTargetBranch}" def res=readFile('./oai_rules_result.txt').trim(); if ("0".equals(res)) { addGitLabMRComment comment: "All Changed files in Merge Request follow OAI Formatting Rules" @@ -32,7 +32,7 @@ pipeline { } else { echo "Git Branch is ${GIT_BRANCH}" echo "Git Commit is ${GIT_COMMIT}" - sh "./scripts/checkCodingFormattingRules.sh" + sh "./ci-scripts/checkCodingFormattingRules.sh" } } }