Merge remote-tracking branch 'origin/ci-fix-jenkinsfile' into integration_2026_w06 (!3895)
CI: Ensure OAI-FLEXRIC-RAN-Integration-Test pipeline always uses latest commit for non-MR builds Related MR -> mosaic5g/flexric!77 For push events, we have: sh "git fetch" sh "git checkout -f ${commitID}" We need to do a reset hard so that the run is executed on synchronized develop branch. In the pipeline, we see: 17:38:34 + git checkout -f develop 17:38:34 Previous HEAD position was9cb79027e4Merge branch 'integration_2026_w05' into 'develop' 17:38:34 Switched to branch 'develop' 17:38:34 Your branch is behind 'origin/develop' by 526 commits, and can be fast-forwarded. 17:38:34 (use "git pull" to update your local branch) After implementing the fix: Below are the runs for pipeline triggered by a merge request event: https://jenkins-oai.eurecom.fr/job/OAI-FLEXRIC/229/ https://jenkins-oai.eurecom.fr/job/OAI-FLEXRIC-RAN-Integration-Test/3788/ In the OAI-FLEXRIC-RAN-Integration-Test pipeline, which is executed by Build with Parameters from OAI-FLEXRIC We see the pipeline took the latest develop: 11:26:02 + git reset --hard origin/develop 11:26:02 HEAD is now at9cb79027e4Merge branch 'integration_2026_w05' into 'develop'
This commit is contained in:
Vendored
+1
@@ -115,6 +115,7 @@ pipeline {
|
||||
} else {
|
||||
sh "git fetch"
|
||||
sh "git checkout -f ${commitID}"
|
||||
sh "git reset --hard origin/${commitID}"
|
||||
}
|
||||
} else {
|
||||
echo "\u274C Some parameters are missing"
|
||||
|
||||
Reference in New Issue
Block a user