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

(MODULES-4521) Update suse GPG file location #218

Conversation

johnduarte
Copy link
Contributor

This commit updates the file location for the GPG keys used on
the SLES. The key files have moved from RPM-GPG-KEY-puppetlabs
to GPG-KEY-puppetlabs previously. This commit simply brings this
location current for the SLES platform so that the keys can be
properly found.

@@ -16,9 +16,9 @@
}
'11', '12': {
# Import the GPG key
$legacy_keyname = 'RPM-GPG-KEY-puppetlabs'
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you also update legacy_gpg_path and gpg_path to re-add the RPM- prefix? I did that for RedHat to avoid creating multiple files on machines that already have the key present.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated. Thanks for the catch @MikaelSmith sorry I missed it.

This commit updates the file location for the GPG keys used on
the SLES. The key files have moved from `RPM-GPG-KEY-puppetlabs`
to `GPG-KEY-puppetlabs` previously. This commit simply brings this
location current for the SLES platform so that the keys can be
properly found.
@johnduarte johnduarte force-pushed the issue/master/modules-4521-update-suse-key-ref branch from f277a0a to 34249c1 Compare March 14, 2017 17:10
@jcoconnor
Copy link
Contributor

@MikaelSmith Does this address PE-19899 as well then ?

@johnduarte
Copy link
Contributor Author

Yes @jcoconnor this addresses PE-19899

@jcoconnor
Copy link
Contributor

👍 It looks consistent with the work in #216

@MikaelSmith MikaelSmith merged commit 92e0c49 into puppetlabs:master Mar 14, 2017
@puppetcla
Copy link

CLA signed by all contributors.

@johnduarte
Copy link
Contributor Author

FYI: frankenbuild test passes

Running the following:

r10k_puppet_agent_fork=johnduarte r10k_puppet_agent_ref=issue/master/modules-4521-update-suse-key-ref ./frankenbuilder 2017.2 --install --vmpooler --upgrade-from 2016.5.1 --agent-upgrade --agent=sles-12-x86_64 --preserve_hosts=always --upgrade

Yields:

      Test Suite: pre_suite @ 2017-03-14 10:37:19 -0700
      - Host Configuration Summary -


              - Test Case Summary for suite 'pre_suite' -
       Total Suite Time: 1406.30 seconds
      Average Test Time: 468.77 seconds
              Attempted: 3
                 Passed: 3
                 Failed: 0
                Errored: 0
                Skipped: 0
                Pending: 0
                  Total: 3

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

4 participants