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

(MAINT) Use puppet.com URLs instead of puppetlabs.com #78

Merged
merged 2 commits into from
Dec 10, 2018
Merged

(MAINT) Use puppet.com URLs instead of puppetlabs.com #78

merged 2 commits into from
Dec 10, 2018

Conversation

raphink
Copy link
Contributor

@raphink raphink commented Oct 23, 2018

This is particularly important because apt.puppetlabs.com and
yum.puppetlabs.com don't support IPv6 resolution.

This is particularly important because apt.puppetlabs.com and
yum.puppetlabs.com don't support IPv6 resolution.
@mchllweeks
Copy link

@raphink Please prepend your commit message with either (Maint) or a Beaker Ticket to follow our contributing standards.

Please also note that we are getting the following test failures:

04:46:32 Failures:
04:46:32
04:46:32 1) ClassMixedWithDSLInstallUtils#install_puppet_agent_pe_promoted_repo_on when setting different agent versions sets correct file paths when agent version is set to latest
04:46:32 Failure/Error: fetch_http_file( release_path, download_file, copy_dir_local)
04:46:32
04:46:32 #ClassMixedWithDSLInstallUtils:0x000000069a9218 received :fetch_http_file with unexpected arguments
04:46:32 expected: (/pm.puppetlabs.com/puppet-agent/./latest/repos/, /puppet-agent-el-6/, //el$/)
04:46:32 got: ("http://pm.puppet.com/puppet-agent/3.0/latest/repos", "puppet-agent-el-6-x4.tar.gz", "tmp/repo_configs/el")
04:46:32 Diff:
04:46:32 @@ -1,4 +1,4 @@
04:46:32 -[/pm.puppetlabs.com/puppet-agent/./latest/repos/,
04:46:32 - /puppet-agent-el-6
/,
04:46:32 - //el$/]
04:46:32 +["http://pm.puppet.com/puppet-agent/3.0/latest/repos",
04:46:32 + "puppet-agent-el-6-x4.tar.gz",
04:46:32 + "tmp/repo_configs/el"]
04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1311:in block in install_puppet_agent_pe_promoted_repo_on' 04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/shared/host_manager.rb:130:in run_block_on'
04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/dsl/patterns.rb:37:in block_on' 04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1290:in install_puppet_agent_pe_promoted_repo_on'
04:46:32 # ./spec/beaker-puppet/install_utils/foss_utils_spec.rb:1370:in block (4 levels) in <top (required)>' 04:46:32 04:46:32 2) ClassMixedWithDSLInstallUtils#install_puppet_agent_pe_promoted_repo_on when setting different agent versions sets correct file paths for agent version < 5.5.4 04:46:32 Failure/Error: fetch_http_file( release_path, download_file, copy_dir_local) 04:46:32 04:46:32 #<ClassMixedWithDSLInstallUtils:0x00000005bfcac0> received :fetch_http_file with unexpected arguments 04:46:32 expected: (/pm\.puppetlabs\.com\/puppet-agent\/.*\/5.3.3\/repos/, /puppet-agent-el-6*/, /\/el$/) 04:46:32 got: ("http://pm.puppet.com/puppet-agent/3.0/5.3.3/repos", "puppet-agent-el-6-x4.tar.gz", "tmp/repo_configs/el") 04:46:32 Diff: 04:46:32 @@ -1,4 +1,4 @@ 04:46:32 -[/pm\.puppetlabs\.com\/puppet-agent\/.*\/5.3.3\/repos/, 04:46:32 - /puppet-agent-el-6*/, 04:46:32 - /\/el$/] 04:46:32 +["http://pm.puppet.com/puppet-agent/3.0/5.3.3/repos", 04:46:32 + "puppet-agent-el-6-x4.tar.gz", 04:46:32 + "tmp/repo_configs/el"] 04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1311:in block in install_puppet_agent_pe_promoted_repo_on'
04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/shared/host_manager.rb:130:in run_block_on' 04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/dsl/patterns.rb:37:in block_on'
04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1290:in install_puppet_agent_pe_promoted_repo_on' 04:46:32 # ./spec/beaker-puppet/install_utils/foss_utils_spec.rb:1381:in block (4 levels) in <top (required)>'
04:46:32
04:46:32 3) ClassMixedWithDSLInstallUtils#install_puppet_agent_pe_promoted_repo_on when setting different agent versions sets correct file paths for agent version >= 5.5.4
04:46:32 Failure/Error: fetch_http_file( release_path, download_file, copy_dir_local)
04:46:32
04:46:32 #ClassMixedWithDSLInstallUtils:0x000000045f1b90 received :fetch_http_file with unexpected arguments
04:46:32 expected: (/pm.puppetlabs.com/puppet-agent/./5.5.4/repos/, /puppet-agent-el-6/, //el$/)
04:46:32 got: ("http://pm.puppet.com/puppet-agent/3.0/5.5.4/repos", "puppet-agent-el-6-x4.tar.gz", "tmp/repo_configs/el")
04:46:32 Diff:
04:46:32 @@ -1,4 +1,4 @@
04:46:32 -[/pm.puppetlabs.com/puppet-agent/./5.5.4/repos/,
04:46:32 - /puppet-agent-el-6
/,
04:46:32 - //el$/]
04:46:32 +["http://pm.puppet.com/puppet-agent/3.0/5.5.4/repos",
04:46:32 + "puppet-agent-el-6-x4.tar.gz",
04:46:32 + "tmp/repo_configs/el"]
04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1311:in block in install_puppet_agent_pe_promoted_repo_on' 04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/shared/host_manager.rb:130:in run_block_on'
04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/dsl/patterns.rb:37:in block_on' 04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1290:in install_puppet_agent_pe_promoted_repo_on'
04:46:32 # ./spec/beaker-puppet/install_utils/foss_utils_spec.rb:1392:in block (4 levels) in <top (required)>' 04:46:32 04:46:32 4) ClassMixedWithDSLInstallUtils#install_puppet_agent_pe_promoted_repo_on when setting different agent versions sets correct file paths for agent version > 5.99 04:46:32 Failure/Error: fetch_http_file( release_path, download_file, copy_dir_local) 04:46:32 04:46:32 #<ClassMixedWithDSLInstallUtils:0x000000042431d8> received :fetch_http_file with unexpected arguments 04:46:32 expected: (/pm\.puppetlabs\.com\/puppet-agent\/.*\/6.0\/repos/, /puppet-agent-el-6*/, /\/el$/) 04:46:32 got: ("http://pm.puppet.com/puppet-agent/3.0/6.0/repos", "puppet-agent-el-6-x4.tar.gz", "tmp/repo_configs/el") 04:46:32 Diff: 04:46:32 @@ -1,4 +1,4 @@ 04:46:32 -[/pm\.puppetlabs\.com\/puppet-agent\/.*\/6.0\/repos/, 04:46:32 - /puppet-agent-el-6*/, 04:46:32 - /\/el$/] 04:46:32 +["http://pm.puppet.com/puppet-agent/3.0/6.0/repos", 04:46:32 + "puppet-agent-el-6-x4.tar.gz", 04:46:32 + "tmp/repo_configs/el"] 04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1311:in block in install_puppet_agent_pe_promoted_repo_on'
04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/shared/host_manager.rb:130:in run_block_on' 04:46:32 # ./.bundle/gems/gems/beaker-4.0.0/lib/beaker/dsl/patterns.rb:37:in block_on'
04:46:32 # ./lib/beaker-puppet/install_utils/foss_utils.rb:1290:in install_puppet_agent_pe_promoted_repo_on' 04:46:32 # ./spec/beaker-puppet/install_utils/foss_utils_spec.rb:1403:in block (4 levels) in <top (required)>'
04:46:32
04:46:32 Finished in 2.81 seconds (files took 1.11 seconds to load)

@mchllweeks
Copy link

@melissa Would you mind looking at these url changes? I just want to make sure they don't break any of our internal tests by changing them.

@melissa melissa self-assigned this Oct 29, 2018
@melissa
Copy link
Contributor

melissa commented Oct 30, 2018

There are a few other places where we reference puppetlabs.com in this repo. Would it be worth it to change these as well?

$ git grep puppetlabs\.com lib setup tasks
lib/beaker-puppet/helpers/puppet_helpers.rb:        # @example Stub puppetlabs.com on the master to 127.0.0.1 with an alias example.com
lib/beaker-puppet/helpers/puppet_helpers.rb:        #   stub_hosts_on(master, {'puppetlabs.com' => '127.0.0.1'}, {'puppetlabs.com' => ['example.com']})
lib/beaker-puppet/helpers/puppet_helpers.rb:        # @example Stub forgeapi.puppetlabs.com on the master to 127.0.0.1 with an alias forgeapi.example.com
lib/beaker-puppet/helpers/puppet_helpers.rb:        #   with_host_stubbed_on(master, {'forgeapi.puppetlabs.com' => '127.0.0.1'}, {'forgeapi.puppetlabs.com' => ['forgeapi.example.com']}) do
lib/beaker-puppet/helpers/puppet_helpers.rb:        # @example Stub puppetlabs.com on the default host to 127.0.0.1
lib/beaker-puppet/helpers/puppet_helpers.rb:        #   stub_hosts('puppetlabs.com' => '127.0.0.1')
lib/beaker-puppet/helpers/puppet_helpers.rb:        # forge api v1 canonical source is forge.puppetlabs.com
lib/beaker-puppet/helpers/puppet_helpers.rb:        # forge api v3 canonical source is forgeapi.puppetlabs.com
lib/beaker-puppet/helpers/puppet_helpers.rb:          primary_forge_name = 'forge.puppetlabs.com'
lib/beaker-puppet/helpers/puppet_helpers.rb:            stub_hosts_on(host, {primary_forge_name => @forge_ip}, {primary_forge_name => ['forge.puppet.com','forgeapi.puppetlabs.com','forgeapi.puppet.com']})
lib/beaker-puppet/helpers/puppet_helpers.rb:        # forge api v1 canonical source is forge.puppetlabs.com
lib/beaker-puppet/helpers/puppet_helpers.rb:        # forge api v3 canonical source is forgeapi.puppetlabs.com
lib/beaker-puppet/helpers/puppet_helpers.rb:          primary_forge_name = 'forge.puppetlabs.com'
lib/beaker-puppet/helpers/puppet_helpers.rb:          with_host_stubbed_on( host, {primary_forge_name => @forge_ip}, {primary_forge_name => ['forge.puppet.com','forgeapi.puppetlabs.com','forgeapi.puppet.com']}, &block )
lib/beaker-puppet/install_utils/foss_utils.rb:        # @note This will attempt to add a repository for apt.puppetlabs.com on
lib/beaker-puppet/install_utils/foss_utils.rb:        #       Debian, Ubuntu, or Cumulus machines, or yum.puppetlabs.com on EL or Fedora
lib/beaker-puppet/install_utils/foss_utils.rb:        # @note This will attempt to add a repository for apt.puppetlabs.com on
lib/beaker-puppet/install_utils/foss_utils.rb:        #       Debian, Ubuntu, or Cumulus machines, or yum.puppetlabs.com on EL or Fedora
lib/beaker-puppet/install_utils/foss_utils.rb:        #                             Example: https://downloads.puppetlabs.com/mac/10.11/PC1/x86_64
lib/beaker-puppet/install_utils/foss_utils.rb:                on host, "wget -O /tmp/puppet-gpg-key http://yum.puppetlabs.com/RPM-GPG-KEY-puppet"
lib/beaker-puppet/install_utils/foss_utils.rb:              publishers = ['puppetlabs.com', 'com.puppetlabs']
lib/beaker-puppet/install_utils/windows_utils.rb:        #                   See https://docs.puppetlabs.com/guides/install_puppet/install_windows.html#msi-properties
lib/beaker-puppet/install_utils/windows_utils.rb:        #   See https://docs.puppetlabs.com/guides/install_puppet/install_windows.html#msi-properties
lib/beaker-puppet/install_utils/windows_utils.rb:        #                   See https://docs.puppetlabs.com/guides/install_puppet/install_windows.html#msi-properties

@melissa
Copy link
Contributor

melissa commented Oct 30, 2018

This looks like it doesn't break internal testing from what I can tell, though I'm not sure how to test pm.puppet.com.

cc/ @shrug does someone from RE have the bandwidth to take a look at this?

@melissa
Copy link
Contributor

melissa commented Nov 1, 2018

@raphink we're getting ready to cut a beaker-puppet release soon. It would be good to include this change, but we don't want to wait too long. At the very least, we need to update these failing tests before we can merge this.

@raphink
Copy link
Contributor Author

raphink commented Nov 2, 2018

Thanks @melissa. My issue turned out to be a DNS resolver that didn't accept TCP connections, so the current beaker actually works for me. That said, I'm guessing it might still be good to replace these URLs eventually.

@kevpl
Copy link
Contributor

kevpl commented Nov 5, 2018

@raphink it looks like at least some of these test failures are related to your changes (from spec testing):

04:47:06   4) ClassMixedWithDSLInstallUtils#install_puppet_agent_pe_promoted_repo_on when setting different agent versions sets correct file paths for agent version > 5.99
04:47:06      Failure/Error: fetch_http_file( release_path, download_file, copy_dir_local)
04:47:06 
04:47:06        #<ClassMixedWithDSLInstallUtils:0x00000001b29890> received :fetch_http_file with unexpected arguments
04:47:06          expected: (/pm\.puppetlabs\.com\/puppet-agent\/.*\/6.0\/repos/, /puppet-agent-el-6*/, /\/el$/)
04:47:06               got: ("http://pm.puppet.com/puppet-agent/3.0/6.0/repos", "puppet-agent-el-6-x4.tar.gz", "tmp/repo_configs/el")

@melissa or @shrug, are there any sync issues between this PR & RE releases that we should be aware of for timing of the cut & release of the next beaker-puppet containing it?

@melissa
Copy link
Contributor

melissa commented Nov 5, 2018

I don't believe there are any sync issues with this. The hosts should cleanly map between pupppetlabs.com and puppet.com, but it would be good to get confirmation from RE on that.

@shrug
Copy link

shrug commented Nov 5, 2018

No blocker from RE, this should be fine

@shrug
Copy link

shrug commented Nov 5, 2018

I am a little confused by the assertion that the {yum,apt,downloads}.puppetlabs.com addresses are not resolvable via ipv6, they should be, they are just CNAMEs:

;; ANSWER SECTION:
yum.puppetlabs.com.	600	IN	CNAME	yum.puppet.com.
yum.puppet.com.		229	IN	CNAME	d1ge15oq8tiwk1.cloudfront.net.
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:5800:3:d41c:9440:93a1
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:6200:3:d41c:9440:93a1
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:ee00:3:d41c:9440:93a1
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:7a00:3:d41c:9440:93a1
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:6e00:3:d41c:9440:93a1
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:c400:3:d41c:9440:93a1
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:8800:3:d41c:9440:93a1
d1ge15oq8tiwk1.cloudfront.net. 60 IN	AAAA	2600:9000:203a:200:3:d41c:9440:93a1

@melissa
Copy link
Contributor

melissa commented Nov 5, 2018

@raphink posted an update for days ago

My issue turned out to be a DNS resolver that didn't accept TCP connections

So the puppetlabs.com addresses should be resolvable

@ekohl
Copy link
Contributor

ekohl commented Nov 28, 2018

I can confirm yum.puppetlabs.com works over IPv6 since my IPv6-only server can use it just fine. I did have an issue for some time a while back, but that's been resolved by now.

@kevpl
Copy link
Contributor

kevpl commented Nov 30, 2018

There are some spec testing failures here that are simply matching against the old puppetlabs URLs & should be updated with the new puppet.com ones.

I've made a small commit for this since we originally made those tests & submitted it against this branch as https://github.com/raphink/beaker-puppet/pull/1. Once you take that into this branch and added either (MAINT) or a ticket reference at the beginning of your git commit message, we can push this through the automation for release.

@raphink
Copy link
Contributor Author

raphink commented Dec 4, 2018

Merged on my side

@kevpl
Copy link
Contributor

kevpl commented Dec 5, 2018

cool, now we just need the git commit message to have the right reference (either (MAINT) or a ticket reference (ie (BKR-1234))) and then we can get this through our testing. You can do this with an interactive rebase where you edit your commit.

@sbeaulie sbeaulie changed the title Use puppet.com URLs instead of puppetlabs.com (MAINT) update spec tests to use puppet.com Dec 10, 2018
@sbeaulie sbeaulie merged commit e0a0ba4 into puppetlabs:master Dec 10, 2018
@sbeaulie sbeaulie changed the title (MAINT) update spec tests to use puppet.com (MAINT) Use puppet.com URLs instead of puppetlabs.com Dec 10, 2018
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.

7 participants