Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
bfd8101 Fix for proper parameter parsing in pkg.purge
d0ddb56 Fix condition - include empty string in the condition
646cd72 Remove extra_tgt parameter
522d9f9 Move salt formulas test to xenial jenkins node
d085e51 Rewrite ceph pipelines for adding and removing nodes
a5594de Add ask_confirmation parameter for ceph-upgrade pipeline
Change-Id: I851cea3ba86c6a1c929d6344fe047c0b5590168a
diff --git a/test-salt-formulas-env.groovy b/test-salt-formulas-env.groovy
index 47cd110..42966e9 100644
--- a/test-salt-formulas-env.groovy
+++ b/test-salt-formulas-env.groovy
@@ -137,7 +137,7 @@
}
ruby.ensureRubyEnv()
if (!fileExists("Gemfile")) {
- sh("curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'")
+ sh("curl -s 'https://gerrit.mcp.mirantis.com/projects/salt-formulas%2Fsalt-formulas-scripts/branches/master/files/Gemfile/content' | base64 -d > ./Gemfile")
ruby.installKitchen()
} else {
common.infoMsg("Override Gemfile found in the kitchen directory, using it.")
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index 09a7f6c..a071058 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -185,7 +185,7 @@
def kitchenEnvs = []
ruby.ensureRubyEnv()
if (!fileExists("Gemfile")) {
- sh("curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'")
+ sh("curl -s 'https://gerrit.mcp.mirantis.com/projects/salt-formulas%2Fsalt-formulas-scripts/branches/master/files/Gemfile/content' | base64 -d > ./Gemfile")
ruby.installKitchen()
} else {
common.infoMsg("Override Gemfile found in the kitchen directory, using it.")