Skip to content
Snippets Groups Projects
Commit 950ea2d8 authored by Emanuele Aina's avatar Emanuele Aina
Browse files

Jenkinsfile: Merge runTestsJobs() into submitTests()


The only caller of runTestsJobs() is submitTests() and having them split
out doesn't bring any benefit.

Signed-off-by: Emanuele Aina's avatarEmanuele Aina <emanuele.aina@collabora.com>
parent 0535303a
No related branches found
No related tags found
No related merge requests found
......@@ -185,7 +185,16 @@ def pushOstreeRepo(architecture, type, board) {
rm -rf ${repo}""")
}
def runTestsJobs(image_name, profile_name, version) {
def submitTests(architecture, type, board, ostree = false) {
def image_name = imageName(architecture, type, board, ostree)
def version = env.PIPELINE_VERSION
def name = osname
if(ostree){
name = "${osname}_ostree"
}
def profile_name = "${name}-${type}-${architecture}-${board}"
dir ("apertis-tests") {
git(url: test_repo_url,
poll: false,
......@@ -207,18 +216,6 @@ def runTestsJobs(image_name, profile_name, version) {
}
}
def submitTests(architecture, type, board, ostree = false) {
def image_name = imageName(architecture, type, board, ostree)
def name = osname
if(ostree){
name = "${osname}_ostree"
}
def profile_name = "${name}-${type}-${architecture}-${board}"
runTestsJobs (image_name, profile_name, env.PIPELINE_VERSION)
}
def buildOStree(architecture, type, board, debosarguments = "", repo = "repo") {
def image_name = imageName(architecture, type, board, true)
def branch = "${osname}/${release}/${architecture}-${board}/${type}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment