Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Conversation

zreichert
Copy link
Contributor

No description provided.

@puppetlabs-jenkins
Copy link
Contributor

Can one of the admins verify this patch?

@johnduarte
Copy link
Contributor

I believe the spec tests need to be updated as well.

@johnduarte
Copy link
Contributor

spec test diff

diff --git a/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb b/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb
index b3fb0c3..13c6d73 100644
--- a/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb
+++ b/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb
@@ -47,10 +47,10 @@ describe ClassPEClientToolsMixedWithPatterns do
       let(:platform) { Beaker::Platform.new('windows-2012r2-x86_64') }
       it 'installs' do
         hosts.each do |host|
-          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(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/windows", "pe-client-tools_#{opts[:pe_client_tools_version]}-x86_64.msi", "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 }
                                                                   )

@zreichert zreichert force-pushed the maint/master/QA-2603_update_install_pe_client_tools_on_MSI_path branch from 877a545 to 48c4c0b Compare August 11, 2016 21:14
@zreichert
Copy link
Contributor Author

@johnduarte Thanks! PR is updated.

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/51/

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/52/

@johnduarte
Copy link
Contributor

👍

@johnduarte
Copy link
Contributor

ping @kevpl or @tvpartytonight when you get a chance to look at this.

@tvpartytonight
Copy link
Contributor

LGTM: I'll release this next week so we don't have to worry about broken builds over the weekend.

@tvpartytonight tvpartytonight merged commit 919dcf3 into puppetlabs:master Aug 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants