Project

General

Profile

Bug #9682

Feature #6196: Build all active branches

Feature #6090: Automated builds

Upstream our changes in puppet-jenkins

Added by bertagaz about 4 years ago. Updated about 4 years ago.

Status:
Resolved
Priority:
Normal
Assignee:
-
Category:
Continuous Integration
Target version:
Start date:
07/04/2015
Due date:
% Done:

100%

Feature Branch:
puppet-jenkins:features/9618-stronger_plugin_verification
Type of work:
Sysadmin
Blueprint:
Starter:
No
Affected tool:

Description

We currently use the puppet-jenkins module with two set of patches:

  • feature/stronger_plugin_verification that implement plugins hash verification with the puppet-archive module
  • features/better_service_definition which fixed the Jenkins service handling in Debian

We must not maintain a delta with upstream and push our changes, but meanwhile the puppet-jenkins and puppet-archive upstreams have changed a lot, so we should:

  • reset our puppet-archive module to the last 0.8.0 that have user parameter support
  • reset our puppet-jenkins module on the last upstream
  • rebase our feature branches on the updated puppet-jenkins module
  • send pull request

Subtasks

Feature #9683: Check if we still need to patch the Jenkins puppet service definitionResolved

Feature #9684: Upstream our changes to the puppet-archive moduleResolved

History

#2 Updated by bertagaz about 4 years ago

Creating the ticket (#6956) that has been lost while testing the redmine bug.

#3 Updated by bertagaz about 4 years ago

  • Blocked by Feature #9619: Upstream our changes to the puppet-archive module. added

#4 Updated by bertagaz about 4 years ago

  • Parent task set to #6196

#5 Updated by bertagaz about 4 years ago

  • Blocked by Feature #9618: Check if we still need to patch the Jenkins puppet service definition added

#6 Updated by intrigeri about 4 years ago

  • Blocked by deleted (Feature #9618: Check if we still need to patch the Jenkins puppet service definition)

#7 Updated by intrigeri about 4 years ago

  • Blocked by deleted (Feature #9619: Upstream our changes to the puppet-archive module.)

#8 Updated by bertagaz about 4 years ago

  • Feature Branch set to puppet-jenkins:features/9618-stronger_plugin_verification

Now that the feature branch in our puppet-jenkins module has been updated to latest upstream, we need to send a pull request for it. Hopefully the branch will be in a good shape enough to be merged as is.

#9 Updated by bertagaz about 4 years ago

  • Feature Branch changed from puppet-jenkins:features/9618-stronger_plugin_verification to puppet-jenkins:features/9618-stronger_plugin_verification

#10 Updated by bertagaz about 4 years ago

  • Status changed from In Progress to Resolved
  • Assignee deleted (bertagaz)

Pull request has been merged upstream, so I've reset our own puppet-jenkins repo to its head and applied. Yay, thought I'd never close this one!

#11 Updated by intrigeri about 4 years ago

Pull request has been merged upstream,

Oooooh yeah :)

Also available in: Atom PDF