You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: README.md
+11-15
Original file line number
Diff line number
Diff line change
@@ -13,7 +13,7 @@ The [_roadmap_](https://trello.com/b/tOQL6crl/pretested-integration-plugin) is a
13
13
Current development efforts are also maintained Kanban-style on the Trello board.
14
14
15
15
16
-
The plugin is maintained in the scope of [Joint Open Source Roadmap Alliance (JOSRA)](http://www.josra.org/) by [Praqma](http://www.praqma.net). We happily accept pull request - see section about contributing below.
16
+
The plugin is maintained in the scope of [Joint Open Source Roadmap Alliance (JOSRA)](https://www.josra.org/) by [Praqma](httpss://www.praqma.com). We happily accept pull requests - see section about contributing below.
17
17
18
18
# Introduction
19
19
The Jenkins Pretested Integration Plugin offers a branchy approach to pretested integration (also known as pretested commits), which upholds the invariant; that for a specific branch, known as the _integration branch_, all commits have been verified.
@@ -22,28 +22,24 @@ The plugin delivers an API that makes it possible to easily provide pretested in
22
22
23
23
The plugin is currently shipped with support for only Git.
24
24
25
-
The plugin is designed to automate the **[CoDE:U Git Flow](http://www.praqma.com/resources/papers/git-flow)**, but is not bound to a specific SCM work flow.
25
+
The plugin is designed to automate the **[CoDE:U Git Flow](https://www.praqma.com/stories/git-phlow/)**, but is not bound to a specific SCM work flow.
26
26
27
27
28
28
# References
29
29
30
30
## Plugin repositories
31
31
32
32
*[Jenkins CI on Github](https://github.com/jenkinsci/pretested-integration-plugin) (used as final archive for released version)
33
-
*[Praqma's on github](https://github.com/Praqma/pretested-integration-plugin)(used to release from and accept pull requests)
33
+
*[Praqma's on github](https://github.com/Praqma/pretested-integration-plugin) (used to release from and accept pull requests)
34
34
*[Migration guide 2.X -> 3.X](https://wiki.jenkins.io/display/JENKINS/Pretested+Integration+Plugin) (Migration guide from wiki)
35
35
36
36
37
37
## Automated builds
38
38
39
-
***Praqma's build server** (used for daily development builds)
@@ -57,26 +53,26 @@ The user oriented documentation is found on the Jenkins community plugin wiki pa
57
53
58
54
Issues are tracked in the Jenkins JIRA issue tracker:
59
55
60
-
*[Pretested Integration Plugin - open issues filter](https://issues.jenkins-ci.org/secure/IssueNavigator.jspa?mode=hide&reset=true&jqlQuery=project+%3D+JENKINS+AND+status+in+%28Open%2C+%22In+Progress%22%2C+Reopened%29+AND+component+%3D+%27pretested-integration-plugin%27)
56
+
*[Pretested Integration Plugin - open issues filter](https://issues.jenkins-ci.org/secure/IssueNavigator.jspa?mode=hide&reset=true&jqlQuery=project+%3D+JENKINS+AND+status+in+%28Open%2C+%22In+Progress%22%2C+Reopened%29+AND+component+%3D+%27pretested-integration-plugin%27)
61
57
62
58
63
59
# The Pretested Integration Plugin workflows
64
60
65
61
The Jenkins community have an [article about designing pretested commits](https://wiki.jenkins-ci.org/display/JENKINS/Designing+pre-tested+commit). The original work on this plugin was inspired from the [personal branch version of the branchy approach](https://wiki.jenkins-ci.org/display/JENKINS/Designing+pre-tested+commit#Designingpre-testedcommit-%22BranchySCM%22approach).
66
62
67
-
The plugin is designed to automate the **[CoDe:U Git Flow](http://www.praqma.com/resources/papers/git-flow)**, but is not bound to a specific SCM work flow as long as you uses branches.
63
+
The plugin is designed to automate the **[CoDe:U Git Flow](https://www.praqma.com/stories/git-phlow/)**, but is not bound to a specific SCM work flow as long as you uses branches.
68
64
69
65
The recommended workflow are described in our user documentation on the [Pretested Integration Plugin wiki page](https://wiki.jenkins-ci.org/display/JENKINS/Pretested+Integration+Plugin)
70
66
71
67
Concepts:
72
68
73
-
* The **ready branch** the developer branch with changes, that should be integrated. It is called ready, because of our recommended naming conventions in the [CoDe:U Git Flow](http://www.praqma.com/resources/papers/git-flow).
69
+
* The **ready branch** the developer branch with changes, that should be integrated. It is called ready, because of our recommended naming conventions in the [CoDe:U Git Flow](https://www.praqma.com/stories/git-phlow/).
74
70
***Ready** branches are specified by configuring the SCM plugin (not the prestested integration plugin) to pic up changes on those specific branches. For the Git plugin, it is the `Branch Specifier`.
75
71
* The **integration branch** is the target branch for integration. This is where changes from the ready-branches comes in.
76
72
77
73
Merge strategies:
78
74
79
-
**Accumulated** and **Squashed**. These are explained, together with more background information, and a discussion on the different merge strategies in [JOSRA](http://www.josra.org) as a blog post: " [Pretested Integration Plugin](http://www.josra.org/blog/2014/06/23/Pretested%2Bintegration%2Bplugin.html)".
75
+
**Accumulated** and **Squashed**. These are explained, together with more background information, and a discussion on the different merge strategies in [JOSRA](https://www.josra.org) as a blog post: " [Pretested Integration Plugin](https://www.josra.org/blog/Pretested+integration+plugin.html)".
80
76
81
77
# Architecture
82
78
@@ -192,12 +188,12 @@ To define a new SCM interface, create a public class which extends "org.jenkinsc
192
188
193
189
## Acknowledgement
194
190
195
-
Code contributions were initially made by Computer Science students at University of Copenhagen [DIKU](http://www.diku.dk) as part of a study project.
191
+
Code contributions were initially made by Computer Science students at University of Copenhagen [DIKU](https://www.diku.dk) as part of a study project.
0 commit comments