update jenkinsfile for lockable resource3

This commit is contained in:
hardy
2021-12-08 09:04:55 +01:00
parent bc6a4b92dc
commit 08affe9712
2 changed files with 6 additions and 2 deletions
+5 -1
View File
@@ -37,6 +37,7 @@ def testStageName = params.pipelineTestStageName
// Name of the phone/server resource
def ciSmartPhonesResource1 = params.SmartPhonesResource1
def ciSmartPhonesResource2 = params.SmartPhonesResource2
def ciSmartPhonesResource3 = params.SmartPhonesResource3
// Global Parameters. Normally they should be populated when the master job
// triggers the slave job with parameters
@@ -55,7 +56,7 @@ pipeline {
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock(extra: [[resource: ciSmartPhonesResource2]], resource: ciSmartPhonesResource1)
lock(extra: [[resource: ciSmartPhonesResource2]], resource: ciSmartPhonesResource1,resource: ciSmartPhonesResource3)
}
stages {
stage("Build Init") {
@@ -87,6 +88,9 @@ pipeline {
if (params.SmartPhonesResource2 == null) {
allParametersPresent = false
}
if (params.SmartPhonesResource3 == null) {
allParametersPresent = false
}
// 1st eNB parameters
if (params.eNB_IPAddress == null) {
allParametersPresent = false
+1 -1
View File
@@ -513,7 +513,7 @@ class Dashboard:
project = gl.projects.get(project_id)
editable_mr = project.mergerequests.get(int(singlemr))
mr_notes = editable_mr.notes.list()
mr_note = editable_mr.notes.create({'body': '<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/'+singlemr+'/index.html">Test Results for you MR are updated (End to End LTE/NSA/SA/2x2/OAIUE)</a>'})
mr_note = editable_mr.notes.create({'body': '<a href="https://oaitestdashboard.s3.eu-west-1.amazonaws.com/'+singlemr+'/index.html">Test Results for your MR are updated (End to End LTE/NSA/SA/2x2/OAIUE)</a>'})
editable_mr.save()