From 950ea2d8a6faca0d6a6a61883da761d1ab3e1374 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Thu, 22 Nov 2018 00:10:52 +0100
Subject: [PATCH] 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 <emanuele.aina@collabora.com>
---
Jenkinsfile | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6d19d1f7..5dc7003e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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}"
--
GitLab