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

Get rid of job-to-bc branch and make master branch as source of truth #18

Closed
wants to merge 91 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
76b429f
lets allow jobs to be syncd to new BCs if the job name matches a conf…
jstrachan Mar 6, 2017
11a5094
handle creating a new BC if BuildConfigProjectProperty is null
rawlingsj Mar 6, 2017
6eebf7f
lets handle creating new BCs better; updating the UUID if its not pre…
jstrachan Mar 7, 2017
cf95945
add test dependencies for running the github org plugin
rawlingsj Mar 7, 2017
6fdd329
lets handle ItemGroup to find nested WorkflowJobs inside multi-branch…
jstrachan Mar 7, 2017
6526c60
if this is a multi branch workflow project then by default we only lo…
rawlingsj Mar 7, 2017
18eb819
lets use safe names for the generated BuildConfig names
jstrachan Mar 8, 2017
e01ad76
avoid the need for workflow dependencies other than in "test" scope
rawlingsj Mar 8, 2017
241102e
fixes creating BuildConfigs from multibranch jobs and ensuring that t…
jstrachan Mar 8, 2017
e6ec3e1
Merge remote-tracking branch 'origin/job-to-bc' into job-to-bc
jstrachan Mar 8, 2017
3d37648
lets try avoid the github organisation prefix and the master branch s…
jstrachan Mar 10, 2017
7c62b7d
refactor to use a constants class for annotations; fixed up name vers…
jstrachan Mar 10, 2017
6086e89
lets support using a folder for each namespace so that BuildConfigs c…
jstrachan Mar 10, 2017
86a5e99
address findbug issues
rawlingsj Mar 13, 2017
0c5a8c8
lets add support for ${FOO} environment variable expressions for the …
jstrachan Mar 24, 2017
e1131fb
fixes https://github.com/openshift/jenkins-sync-plugin/issues/131 to …
jstrachan Apr 12, 2017
4725822
lets annotate the Build with pending input JSON so consoles can do th…
jstrachan Apr 21, 2017
c5380fd
added a Build annotation for the namespace jenkins is running inside
jstrachan Apr 24, 2017
62c6870
have the sync plugin work with multi branch pipeline builds
rawlingsj Apr 30, 2017
fb8c09c
attempt to avoid needed to use SCMBinder directly
jstrachan Jun 8, 2017
3f9c085
lets remove a pattern from the github org plugin on BC removal
jstrachan Jun 8, 2017
b8f84ec
fix up handling of embedded pipelines in a job
jstrachan Jun 9, 2017
a1292d0
lets allow the groovy sandbox to be disabled for embedded pipelines
jstrachan Jun 9, 2017
c5f87d9
lets only allow groovy sandbox to be disabled on embedded pipelines i…
jstrachan Jun 9, 2017
da0fcd9
lets upgrade the kubernetes client to match the kubernetes plugin
jstrachan Jun 9, 2017
28789a6
updated to the latest openshift client release
jstrachan Jul 4, 2017
68608b6
fixes so that jenkins-sync-plugin can work on kubernetes 1.7
jstrachan Jul 4, 2017
28c5143
upgrade the openshift client
jstrachan Jul 4, 2017
41a596d
field filters don't work on the new API Group REST API
jstrachan Jul 18, 2017
129b1fd
support syncing ConfigMap's with config.xml files <-> Jenkins Jobs
jstrachan Jul 18, 2017
b5dbbae
fixed up some findbugs warnings
jstrachan Jul 18, 2017
1465ce9
fixes some findbugs issues
jstrachan Jul 18, 2017
98d8724
fixes to work with ConfigMap and folder jobs
jstrachan Jul 18, 2017
b7e6523
handle more kinds of item in ConfigMap sync
jstrachan Jul 19, 2017
4b5885a
fix findbugs issue
jstrachan Jul 19, 2017
a011f88
fix issue with the new API Groups REST API and fields
jstrachan Jul 19, 2017
2aeedee
upgrade the kube client
jstrachan Jul 19, 2017
24d1371
remove jobs which are associated with deleted BuildConfigs
jstrachan Jul 19, 2017
0ea8ba9
upgraded kube client
jstrachan Jul 21, 2017
51be4f8
lets add more annotations and labels to Build resources on k8s
jstrachan Jul 24, 2017
f9ad55a
lets use the correct namespace on kubernetes
jstrachan Jul 26, 2017
cd9cab4
lets lazy create the build status config for kubernetes
jstrachan Jul 26, 2017
3894ba5
lets only update the Build.Status.Config if on k8s and have a BC name
jstrachan Jul 27, 2017
a1bf792
avoid possible NPE
jstrachan Aug 1, 2017
2acdd04
lets remove deleted BCs from the ConfigMap org jobs if present
jstrachan Aug 8, 2017
23b3f8d
lets handle the new XML format for the github org plugin
jstrachan Aug 9, 2017
6eabc65
lets upgrade to recent jenkins 2 and associated dependencies
jstrachan Aug 9, 2017
a4314b8
add some debugging if the sync plugin triggers a build due to the run…
jstrachan Aug 10, 2017
3705729
avoid NPE
jstrachan Aug 10, 2017
58670ea
try disable unnecessary pipeline builds
jstrachan Aug 10, 2017
ff75204
fix bug removing all the BCs if we try to remove a deleted pattern
jstrachan Aug 10, 2017
db03e02
avoid unnecessary rebuilds on a rescan cause
jstrachan Aug 10, 2017
c1f170b
first spike at a system test framework
jstrachan Aug 11, 2017
ab11999
first spike at a system test framework
jstrachan Aug 11, 2017
c7019fa
add more logging of causes when triggering jenkins/openshift pipelines
jstrachan Aug 14, 2017
acef9fd
lets try filter out a few more unnecessary builds
jstrachan Aug 14, 2017
1eeaed5
lets try filter out a few more unnecessary builds
jstrachan Aug 14, 2017
89d5f8d
try to fix https://github.com/openshiftio/openshift.io/issues/565
jstrachan Aug 15, 2017
81aea23
lets add some diagnostics for BranchEventCause
jstrachan Aug 15, 2017
147b87e
lets not filter out BranchEventCause push events
jstrachan Aug 15, 2017
1b1c421
try filter out more unnecessary build events
jstrachan Aug 16, 2017
0cd244b
fix issue if the plugin is disabled
jstrachan Sep 5, 2017
9d2d1f5
fix another NPE if the plugin is disabled
jstrachan Sep 5, 2017
489a3e9
trigger jenkins jobs on subsequent commits to a pull request openshif…
rawlingsj Sep 15, 2017
da97228
add null checks for openshift client as plugin maybe disabled
rawlingsj Sep 16, 2017
d56605a
avoid losing annotations on a Build when using kubernetes
jstrachan Sep 21, 2017
39ef7e8
protect against NPE is plugin is disabled
rawlingsj Sep 26, 2017
562dc9a
fix extra builds being triggered on a github org scan
rawlingsj Oct 4, 2017
e99ffd2
upgrade kubernetes-client
rawlingsj Dec 15, 2017
52acd5f
Merge pull request #9 from fabric8io/upgrade-kube-client
rawlingsj Dec 18, 2017
0c8b86f
- enabled INFO log level
hrishin Dec 15, 2017
9d408a8
Merge pull request #8 from hrishin/watch-fix
rupalibehera Dec 20, 2017
49b1e2e
updated pom.xml
hrishin Jan 11, 2018
ca7ae78
Fixed for jenkins build log URL in OpenShift Console
hrishin Feb 13, 2018
1bc8dcf
Increased build sync polling time
hrishin Feb 16, 2018
d194d85
retry on exising job load collsion after jenkins restart
gabemontero Feb 28, 2017
07ef670
client upgrade; process pipeline strategy env vars
gabemontero Feb 28, 2017
c723f43
[maven-release-plugin] prepare release openshift-sync-0.1.8
gabemontero Mar 1, 2017
b11050e
[maven-release-plugin] prepare for next development iteration
gabemontero Mar 1, 2017
2e161e7
support syncing multiple namespaces
bparees Jan 31, 2017
e3e7705
[maven-release-plugin] prepare release openshift-sync-0.1.9
bparees Mar 1, 2017
95c99d4
[maven-release-plugin] prepare for next development iteration
bparees Mar 1, 2017
434527e
change default param value for build instantiate env vars to empty st…
gabemontero Mar 2, 2017
d578950
[maven-release-plugin] prepare release openshift-sync-0.1.10
gabemontero Mar 2, 2017
9d67c1b
[maven-release-plugin] prepare for next development iteration
gabemontero Mar 2, 2017
771485c
Fix typo
danmcp Mar 2, 2017
151050c
Update pom property openshift-client.version to 2.5.9
Aug 3, 2017
9aa24e1
Update pom property openshift-client.version to 2.6.1
Aug 7, 2017
d086c2e
Update pom property openshift-client.version to 2.6.2
Sep 4, 2017
9656b77
Update pom property openshift-client.version to 3.0.0
Oct 10, 2017
dc2abf5
Update pom property openshift-client.version to 3.0.3
Nov 3, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,20 @@ buildNumber.properties

*.iml

# Eclipse
.classpath
.project
.settings/

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

#Eclipse
.classpath
.project
.settings/

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
Expand Down
1 change: 0 additions & 1 deletion .lgtm

This file was deleted.

4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
language: java
jdk:
- openjdk7
script: mvn verify
19 changes: 16 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# openshift-jenkins-sync-plugin

This Jenkins plugin keeps OpenShift BuildConfig and Build objects in sync With Jenkins Jobs and Builds.
This Jenkins plugin keeps OpenShift BuildConfig and Build objects in sync with Jenkins Jobs and Builds.

The synchronization works like this

Expand All @@ -9,12 +9,25 @@ The synchronization works like this
* creating a new OpenShift Build for a BuildConfig associated with a Jenkins Job results in the Jenkins Job being triggered
* changes in a Jenkins Build Run thats associated with a Jenkins Job gets replicated to an OpenShift Build object (which is created if necessary if the build was triggered via Jenkins)

Configuration
------------------------
Jenkins Build Log URL:
* This plugin adds an annotation to the OpenShift build configuration containing the Jenkins build log URL.
By default, the Jenkins base URL for the build log is determined via the OpenShift route of the Jenkins service. To override and configure this base URL, you can set the environment variable `JENKINS_ROOT_URL`.
This environment variable will get precedence than Jenkins service to determine base URL.
For fabric8/OpenShift.io tenant's Jenkins deployment, the log base URL is configured through [DeploymentConfig environment variable](https://github.com/fabric8-services/fabric8-tenant-jenkins/blob/master/apps/jenkins/src/main/fabric8/openshift-deployment.yml#L39)

Development Instructions
------------------------

* Build and run the unit tests
Execute `mvn clean install`

* Install the plugin into a locally-running Jenkins
Execute `mvn hpi:run`
Navigate in brower to `http://localhost:8080/jenkins`
Navigate in brower to `http://localhost:8080/jenkins`

synchronization Polling Frequencies
-----------------------------------

Build Sync: Default 5 seconds [BuildSyncRunListener](https://github.com/fabric8io/jenkins-sync-plugin/blob/master/src/main/java/io/fabric8/jenkins/openshiftsync/BuildSyncRunListener.java#L73)
32 changes: 0 additions & 32 deletions circle.yml

This file was deleted.

Loading