projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add osmclient sidecar
[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
d7b3765
..
2c8af42
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_3.groovy
@@
-181,7
+181,7
@@
node("${params.NODE}") {
sh """
export OSM_USE_LOCAL_DEVOPS=true
export PATH=$PATH:/snap/bin
sh """
export OSM_USE_LOCAL_DEVOPS=true
export PATH=$PATH:/snap/bin
- installers/full_install_osm.sh -y -s ${container_name} --nolxd --nodocker --nojuju --nohostports \
+ installers/full_install_osm.sh -y -s ${container_name} --nolxd --nodocker --nojuju --nohostports
--nohostclient
\
${commit_id} \
${repo_distro} \
${repo_base_url} \
${commit_id} \
${repo_distro} \
${repo_base_url} \
@@
-235,17
+235,20
@@
node("${params.NODE}") {
}
finally {
sh "docker stop ${http_server_name}"
}
finally {
sh "docker stop ${http_server_name}"
+ sh "docker rm ${http_server_name}"
if ( params.DO_INSTALL ) {
if (error) {
if ( !params.SAVE_CONTAINER_ON_FAIL ) {
if ( params.DO_INSTALL ) {
if (error) {
if ( !params.SAVE_CONTAINER_ON_FAIL ) {
- sh "lxc delete ${container_name} --force"
+ sh "docker stack rm ${container_name}"
+ sh "export PATH=$PATH:/snap/bin; juju destroy-controller ${container_name}"
}
throw error
}
else {
if ( !params.SAVE_CONTAINER_ON_PASS ) {
}
throw error
}
else {
if ( !params.SAVE_CONTAINER_ON_PASS ) {
- sh "lxc delete ${container_name} --force"
+ sh "docker stack rm ${container_name}"
+ sh "export PATH=$PATH:/snap/bin; juju destroy-controller ${container_name}"
}
}
}
}
}
}