projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add regex search for '-' in juju controller name
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_stage_3.groovy
diff --git
a/jenkins/ci-pipelines/ci_stage_3.groovy
b/jenkins/ci-pipelines/ci_stage_3.groovy
index
52aa3b2
..
d7b3765
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_3.groovy
@@
-180,7
+180,8
@@
node("${params.NODE}") {
sh """
export OSM_USE_LOCAL_DEVOPS=true
sh """
export OSM_USE_LOCAL_DEVOPS=true
- jenkins/host/start_build system --build-container ${container_name} \
+ export PATH=$PATH:/snap/bin
+ installers/full_install_osm.sh -y -s ${container_name} --nolxd --nodocker --nojuju --nohostports \
${commit_id} \
${repo_distro} \
${repo_base_url} \
${commit_id} \
${repo_distro} \
${repo_base_url} \
@@
-235,15
+236,17
@@
node("${params.NODE}") {
finally {
sh "docker stop ${http_server_name}"
finally {
sh "docker stop ${http_server_name}"
- if (error) {
- if ( !params.SAVE_CONTAINER_ON_FAIL ) {
- sh "lxc delete ${container_name} --force"
+ if ( params.DO_INSTALL ) {
+ if (error) {
+ if ( !params.SAVE_CONTAINER_ON_FAIL ) {
+ sh "lxc delete ${container_name} --force"
+ }
+ throw error
}
}
- throw error
- }
- else {
- if ( !params.SAVE_CONTAINER_ON_PASS ) {
- sh "lxc delete ${container_name} --force"
+ else {
+ if ( !params.SAVE_CONTAINER_ON_PASS ) {
+ sh "lxc delete ${container_name} --force"
+ }
}
}
}
}
}
}