diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3d0b5c4f30..73886f3f7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,8 +16,6 @@ Please refer to the steps described on our website: [How to contribute to OAI](h * This decision was made for the license reasons. * The Continuous Integration will reject your merge request. - All merge requests SHALL have `develop` branch as target branch. - - All merge requests SHALL have source branch names that SHALL not contain the `/` character. - * We are using a `docker` registry scheme and the image names are based on the source branch name. ## Coding Styles ## diff --git a/ci-scripts/Jenkinsfile-GitLab-Container b/ci-scripts/Jenkinsfile-GitLab-Container index 93b3d38d75..2f94a3e318 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Container +++ b/ci-scripts/Jenkinsfile-GitLab-Container @@ -589,6 +589,7 @@ def triggerCN5GSlaveJob (jobName, gitlabStatusName) { if ("MERGE".equals(env.gitlabActionType)) { shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit shortenShaOne = shortenShaOne.trim() + branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim() fullRanTag = 'porcepix.sboai.cs.eurecom.fr/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne } else { shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT