Bug #9682

Upstream our changes in puppet-jenkins

Added by bertagaz 2015-07-04 10:57:39 . Updated 2015-07-16 03:07:01 .

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

100%

Feature Branch:
puppet-jenkins:features/9618-stronger_plugin_verification
Type of work:
Sysadmin
Blueprint:

Starter:
0
Affected tool:
Deliverable for:
266

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 definition Resolved

100
Feature #9684: Upstream our changes to the puppet-archive module Resolved

100

History

#1 Updated by bertagaz 2015-07-04 10:58:15

  • blocks #8668 added

#2 Updated by bertagaz 2015-07-04 10:59:52

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

#3 Updated by bertagaz 2015-07-04 11:08:02

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

#4 Updated by bertagaz 2015-07-04 11:10:07

#5 Updated by bertagaz 2015-07-04 11:13:09

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

#6 Updated by intrigeri 2015-07-07 05:35:15

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

#7 Updated by intrigeri 2015-07-07 06:37:09

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

#8 Updated by bertagaz 2015-07-08 03:24:48

  • 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 2015-07-08 03:48:02

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

That’s https://github.com/jenkinsci/puppet-jenkins/pull/336

Finger crossed.

#10 Updated by bertagaz 2015-07-13 08:22:12

  • 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 2015-07-16 03:07:01

> Pull request has been merged upstream,

Oooooh yeah :)