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

(PE-11531) Fix Debian ensure => version #95

Merged

Conversation

highb
Copy link
Contributor

@highb highb commented Mar 25, 2016

Prior to this commit I assumed that I could ensure the package
version on Debian based platforms using the regular X.Y.Z version.
This commit fixes what is ensured on Debian platforms to
X.Y.Z-1codename, which is what apt expects.

Prior to this commit I assumed that I could ensure the package
version on Debian based platforms using the regular X.Y.Z version.
This commit fixes what is ensured on Debian platforms to
`X.Y.Z-1codename`, which is what apt expects.
@highb
Copy link
Contributor Author

highb commented Mar 25, 2016

Tested out on debian 6/ubuntu 1004 agent upgrades:

setup/agent_upgrade.rb passed in 650.99 seconds
      Test Suite: pre_suite @ 2016-03-25 10:40:01 -0700

      - Host Configuration Summary -


              - Test Case Summary for suite 'pre_suite' -
       Total Suite Time: 1214.91 seconds
      Average Test Time: 607.45 seconds
              Attempted: 2
                 Passed: 2
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 2

      - Specific Test Case Status -

Failed Tests Cases:
Errored Tests Cases:
Skipped Tests Cases:
Pending Tests Cases:

No tests to run for suite 'tests'
No tests to run for suite 'post_suite'
Cleanup: cleaning up after successful run
Warning: ssh connection to centos7-64-1 has been terminated
Warning: ssh connection to debian-6-agent has been terminated
Warning: ssh connection to ubuntu-1004-agent has been terminated

@MikaelSmith
Copy link
Contributor

👍

@@ -80,6 +80,12 @@
ensure => "${package_version}-1.el${::operatingsystemmajrelease}",
* => $_package_options,
}
} elsif ($::osfamily == 'Debian') and ($package_version != 'present') {
# Workaround PUP-5802/PUP-5025
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh actually, is there a ticket for debian platforms that is similar to this ticket?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not. I'll clean that up in a maint commit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, can you look for or file a ticket and update the comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikaelSmith Created https://tickets.puppetlabs.com/browse/PUP-6097 as a clearer ticket for the general {{ensure => version}} woes.

@MikaelSmith MikaelSmith merged commit 534feaa into puppetlabs:master Mar 25, 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.

None yet

2 participants