Lock dev-cluster in OMEC postmerge job
Change-Id: Iab950d83608fd4ccdf5f919e0606e12fc1a494f0
diff --git a/jjb/pipeline/omec-postmerge.groovy b/jjb/pipeline/omec-postmerge.groovy
index a03b469..656cdf3 100644
--- a/jjb/pipeline/omec-postmerge.groovy
+++ b/jjb/pipeline/omec-postmerge.groovy
@@ -22,10 +22,6 @@
label "${params.buildNode}"
}
- options {
- timeout(time: 2, unit: 'HOURS')
- }
-
stages {
stage('Build and Publish') {
steps {
@@ -45,7 +41,7 @@
}
}
- stage('Deploy OMEC') {
+ stage ("Prepare OMEC deployment"){
steps {
script {
hssdb_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hssdb/tags/' | jq '.results[] | select(.name | contains("${c3poBranchName}")).name' | head -1 | tr -d \\\""""
@@ -79,20 +75,32 @@
echo "Using spgwc image: ${spgwc_image}"
echo "Using spgwu image: ${spgwu_image}"
}
-
- build job: "omec_deploy_dev", parameters: [
- string(name: 'hssdbImage', value: "${hssdb_image.trim()}"),
- string(name: 'hssImage', value: "${hss_image.trim()}"),
- string(name: 'mmeImage', value: "${mme_image.trim()}"),
- string(name: 'spgwcImage', value: "${spgwc_image.trim()}"),
- string(name: 'spgwuImage', value: "${spgwu_image.trim()}"),
- ]
}
}
- stage ("Run NG40 Tests"){
- steps {
- build job: "omec_ng40-test_dev"
+ stage ("Deploy and Test"){
+ options {
+ lock(resource: 'aether-dev-cluster')
+ }
+
+ stages {
+ stage ("Deploy OMEC"){
+ steps {
+ build job: "omec_deploy_dev", parameters: [
+ string(name: 'hssdbImage', value: "${hssdb_image.trim()}"),
+ string(name: 'hssImage', value: "${hss_image.trim()}"),
+ string(name: 'mmeImage', value: "${mme_image.trim()}"),
+ string(name: 'spgwcImage', value: "${spgwc_image.trim()}"),
+ string(name: 'spgwuImage', value: "${spgwu_image.trim()}"),
+ ]
+ }
+ }
+
+ stage ("Run NG40 Tests"){
+ steps {
+ build job: "omec_ng40-test_dev"
+ }
+ }
}
}
}