Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
318fc89 Add correct doc link to radosgw class import issue
8b7008f Add check for rgw.yml classes import order
8efa75a Match update repo pattern at end of line
20d6367 Reorder jenkins upgrade steps
5f335e3 [ceph] Do not restart Ceph services in packages are not updated
9a7295a Optimise the backup node choosing method
7a47b7f Fix logic for ceph offline node remove
Change-Id: I3bcbdbf202fdc93139c5b68e91adf284412d33d7
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.")