Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
a9c2344 Fix URL for gradle jcenter
21e1bdc Add check for pg ready before generate mapping when adding ceph node
e5d4121 Remove not needed command for dropping ceph mon node
2dd5bfd Enforce linux repo update before calling package update
687d4d4 Add ability to remove ceph node from cluster if offline
Change-Id: Ifbd72454094711727f76e3b18ff0b8f43f189f5e
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.")