[jenkins]updated version of OAI Jenkins pipeline #2062
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ssanadhya
suggested changes
Jul 24, 2020
ci-scripts/JenkinsFile-GitLab
Outdated
| myShCmd('git status --ignored', new_host_flag, new_host_user, new_host) | ||
| sh "mkdir -p archives" | ||
| myShCmd('mkdir -p archives', new_host_flag, new_host_user, new_host) | ||
| // sh "git clone https://github.com/magma/magma.git ." |
ci-scripts/JenkinsFile-GitLab
Outdated
| // sh "git clone https://github.com/119Vik/magma-1.git ." | ||
| checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '${sha1}']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'vik_github', refspec: '+refs/pull/*:refs/remotes/origin/pr/*', url: 'https://github.com/magma/magma.git']]] | ||
| GIT_COMMIT = sh returnStdout: true, script: 'git log -1 --pretty="%H"' | ||
| // echo "Git URL is ${GIT_URL}" |
ci-scripts/JenkinsFile-GitLab
Outdated
| if ("MERGE".equals(env.gitlabActionType)) { | ||
| myShCmd('docker exec -it ci-cn-clang-formatter /bin/bash -c "cd /home && ./ci-scripts/checkCodingFormattingRules.sh --src-branch ' + env.ghprbSourceBranch +' --target-branch ' + env.ghprbTargetBranch + '"', new_host_flag, new_host_user, new_host) | ||
| } else { | ||
| // if ("MERGE".equals(env.gitlabActionType)) { |
Contributor
Author
|
ReRunOAITests |
Contributor
Author
|
ReRunOAITests |
rdefosse
reviewed
Aug 3, 2020
ci-scripts/JenkinsFile-GitLab
Outdated
| myShCmd('git status --ignored', new_host_flag, new_host_user, new_host) | ||
| sh "mkdir -p archives" | ||
| myShCmd('mkdir -p archives', new_host_flag, new_host_user, new_host) | ||
| checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '${sha1}']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'vik_github', refspec: '+refs/pull/*:refs/remotes/origin/pr/*', url: "https://{{GIT_URL}}.git"]]] |
Contributor
There was a problem hiding this comment.
2 things about this line.
- Now that we have a public repository, do we still need to provide credentials? I don't think so.
- I am not sure that you are handling the pull request correctly: my meaning is that we shall test the potential merge of the contributor's branch with the target branch. Not just the contributor's branch.
- I understand that the policy is to force the contributor to resync its branch against the latest version of
master. - But then you need a check to ensure it
- That is what I was doing in the section you removed.
- I understand that the policy is to force the contributor to resync its branch against the latest version of
Contributor
Author
There was a problem hiding this comment.
Both make sense for me - let me update my PR.
tmdzk
approved these changes
Aug 4, 2020
ssanadhya
suggested changes
Aug 5, 2020
ci-scripts/JenkinsFile-GitLab
Outdated
| myShCmdWithLog('cd lte/gateway && vagrant ssh magma_test -c "cd magma/lte/gateway/python/ && make"', 'archives/magma_vagrant_test_make1.log', new_host_flag, new_host_user, new_host) | ||
| myShCmdWithLog('cd lte/gateway && vagrant ssh magma_test -c "cd magma/lte/gateway/python/integ_tests/ && make"', 'archives/magma_vagrant_test_make2.log', new_host_flag, new_host_user, new_host) | ||
| } | ||
| // } |
Contributor
Author
There was a problem hiding this comment.
thanks, good catch. fixed.
Signed-off-by: Vitalii <vitalij.kostenko@gmail.com>
Signed-off-by: Vitalii <vitalij.kostenko@gmail.com>
Signed-off-by: Vitalii <vitalij.kostenko@gmail.com>
Contributor
Author
|
ReRunOAITests |
3 similar comments
Contributor
Author
|
ReRunOAITests |
Contributor
Author
|
ReRunOAITests |
Contributor
Author
|
ReRunOAITests |
ssanadhya
approved these changes
Aug 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Vitalii vitalij.kostenko@gmail.com
Summary
Updated OAI Jenkinsfile according to switching to GitHub and using private credentials