Skip to content

Commit

Permalink
Update Jenkins repository key URLs. (#808)
Browse files Browse the repository at this point in the history
* Update Jenkins repository key URLs.

The repository signing keys for the Jenkins apt and rpm repositories
have been rotated and the new signing keys are available at a separate
URL from the previous ones.

As of 2023-06-19 the previous keys are no longer available and the URLs
used prior to this patch 404 so I do not think there is an advantage to
making this change conditional.

Background on the Jenkins repository change is here: https://www.jenkins.io/blog/2023/03/27/repository-signing-keys-changing/

* Add changelog entry.

---------

Co-authored-by: Dan Webb <[email protected]>
  • Loading branch information
nuclearsandwich and damacus authored Oct 3, 2023
1 parent a4ff23a commit 68c133a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the jenkins cookbook.

## Unreleased

Update Jenkins apt/rpm repository key urls.

## 9.5.18 - *2023-09-28*

## 9.5.17 - *2023-09-28*
Expand Down
8 changes: 4 additions & 4 deletions attributes/master.rb
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,13 @@
master['repository_name'], master['repository'], master['repository_key'] =
case [node['platform_family'], node['jenkins']['master']['channel']]
when %w(debian stable)
['jenkins-ci-stable', 'https://pkg.jenkins.io/debian-stable', 'https://pkg.jenkins.io/debian-stable/jenkins.io.key']
['jenkins-ci-stable', 'https://pkg.jenkins.io/debian-stable', 'https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key']
when %w(rhel stable), %w(amazon stable)
['jenkins-ci-stable', 'https://pkg.jenkins.io/redhat-stable', 'https://pkg.jenkins.io/redhat-stable/jenkins.io.key']
['jenkins-ci-stable', 'https://pkg.jenkins.io/redhat-stable', 'https://pkg.jenkins.io/redhat-stable/jenkins.io-2023.key']
when %w(debian current)
['jenkins-ci-current', 'https://pkg.jenkins.io/debian', 'https://pkg.jenkins.io/debian/jenkins.io.key']
['jenkins-ci-current', 'https://pkg.jenkins.io/debian', 'https://pkg.jenkins.io/debian/jenkins.io-2023.key']
when %w(rhel current), %w(amazon current)
['jenkins-ci-current', 'https://pkg.jenkins.io/redhat', 'https://pkg.jenkins.io/redhat/jenkins.io.key']
['jenkins-ci-current', 'https://pkg.jenkins.io/redhat', 'https://pkg.jenkins.io/redhat/jenkins.io-2023.key']
end

#
Expand Down

0 comments on commit 68c133a

Please sign in to comment.