(QA-2603) update MSI path for "install_pe_client_tools_on" (#21)

puppetlabs · Aug 12, 2016 · 919dcf3 · 919dcf3
1 parent b40f583
commit 919dcf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/beaker-pe/pe-client-tools/install_helper.rb b/lib/beaker-pe/pe-client-tools/install_helper.rb
@@ -30,9 +30,9 @@ def install_pe_client_tools_on(hosts, opts = {})
               package_name = product.dup
               package_name << "_#{opts[:pe_client_tools_version]}-1#{host['platform'].codename}_#{arch}.deb" if opts[:pe_client_tools_version]
             when /windows/
-              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}/#{opts[:puppet_collection]}/x#{arch}"
+              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}"
               package_name = product.dup
-              package_name << "-#{opts[:pe_client_tools_version]}.1-x#{arch}_VANAGON.msi" if opts[:pe_client_tools_version]
+              package_name << "-#{opts[:pe_client_tools_version]}-x#{arch}.msi" if opts[:pe_client_tools_version]
             when /osx/
               release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
               package_base = product.dup

diff --git a/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb b/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb
@@ -50,7 +50,7 @@ class ClassPEClientToolsMixedWithPatterns
           allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/deb/xenial/PC1", "pe-client-tools_#{opts[:pe_client_tools_version]}-1xenial_x86_64.deb", "tmp/repo_configs")
           allow(host). to receive(:external_copy_base)
           expect(subject).to receive(:generic_install_msi_on).with( host,
-                                                                   "http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/windows/PC1/xx86_64/pe-client-tools-#{opts[:pe_client_tools_version]}.1-xx86_64_VANAGON.msi",
+                                                                   "http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/windows/pe-client-tools-#{opts[:pe_client_tools_version]}-xx86_64.msi",
                                                                    {},
                                                                    { :debug => true }
                                                                   )