projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing snap promotion
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_stage_2.groovy
diff --git
a/jenkins/ci-pipelines/ci_stage_2.groovy
b/jenkins/ci-pipelines/ci_stage_2.groovy
index
73842e3
..
e3e86c5
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_2.groovy
@@
-131,9
+131,6
@@
def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
'installers/charm/bundles/osm',
'installers/charm/bundles/osm-ha',
'installers/charm/grafana',
'installers/charm/bundles/osm',
'installers/charm/bundles/osm-ha',
'installers/charm/grafana',
- 'installers/charm/juju-simplestreams-operator',
- 'installers/charm/kafka-exporter',
- 'installers/charm/mariadb-k8s',
'installers/charm/mongodb-exporter',
'installers/charm/mysqld-exporter',
'installers/charm/osm-lcm',
'installers/charm/mongodb-exporter',
'installers/charm/mysqld-exporter',
'installers/charm/osm-lcm',
@@
-167,7
+164,7
@@
def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
try {
dir("${directory}") {
try {
try {
dir("${directory}") {
try {
- sh "charmcraft pack --for
ce --for
mat json --verbosity brief 1> pack.json 2> pack-stderr.log"
+ sh "charmcraft pack --format json --verbosity brief 1> pack.json 2> pack-stderr.log"
} catch (Exception e) {
sh "cat pack-stderr.log"
throw e
} catch (Exception e) {
sh "cat pack-stderr.log"
throw e