Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
8647e07
fixing PSQLException error
Jul 13, 2015
0e833f7
Merge pull request #24 from davidk01/psql-retry
nebkor Aug 12, 2015
cd2074f
Revert "Merge pull request #24 from davidk01/psql-retry"
Sep 1, 2015
ecf55e2
Add a prefix option that allows jobs to be put in different folders
akarnani Oct 8, 2015
b9fdea3
Adds support for templating job names.
akarnani Oct 9, 2015
aec6b44
Add a default value of /
Oct 15, 2015
e0a1c33
Change to use our internal jenkins-client and the idea of prefix
Oct 16, 2015
a568ecd
Merge pull request #1 in EXT/stashbot from feature/kniktas_moreprefix…
Oct 16, 2015
1fa3737
Add SSH Creds. Uses Jenkins Creds plugin.
Oct 16, 2015
a437ba5
Merge pull request #2 in EXT/stashbot from feature/kniktas_sshcreds t…
Oct 19, 2015
23341c7
Remove the fetch. Jenkins GIT seems to grab all the commits anyways
Oct 21, 2015
addeb6a
Merge pull request #3 in EXT/stashbot from feature/kniktas_verifyprno…
Oct 22, 2015
ae71981
Might need this
Oct 30, 2015
8e3e3ae
Updating for compatibility with stash 3.10.0+
terabyte Jun 16, 2015
c1bcfd4
Updating plugin sdk and tomcat
terabyte Jul 16, 2015
79c3984
Updating for stash 3.11 compat
terabyte Oct 2, 2015
2e9558a
Another stash 3.11 fix I missed the first time
terabyte Oct 6, 2015
a5fd078
Documenting possible known bug
terabyte Oct 6, 2015
d5582e3
Documentation update
terabyte Oct 6, 2015
805d2a0
Fix simple order of operations logic bug
newren Oct 23, 2015
e1dbe1a
Update due to Stash renaming: getVetos -> getVetoes
newren Oct 23, 2015
b495a02
Another stash 3.11 fix for RepositoryService.getCloneLinks()
terabyte Nov 5, 2015
385e9e3
Merge pull request #4 in EXT/stashbot from elijah-stashbot-for-3.11-u…
Nov 11, 2015
f89170c
Add custom jenkins-client build
Nov 11, 2015
3be20ef
Merge pull request #5 in EXT/stashbot from feature/mergejenkinsclient…
Nov 11, 2015
6000477
Add a new column for the default timeout
Nov 12, 2015
12df87f
Fix a bug in the prefix logic (the default needs to be '/')
Nov 12, 2015
152e994
Add repo-level build timeout setting
Nov 12, 2015
90f8115
Remove the display of default value
Nov 12, 2015
0b73b4e
Hook up the timeout value from the repo settings into the builds
Nov 12, 2015
1b9b782
After much difficulty, actually add a failure curl to a timeout
Nov 12, 2015
651a995
Added the ability for error messages in repo config
Nov 12, 2015
dd4b541
Remove unnecessary methods from the ActiveObject for Jenkins
Nov 12, 2015
245ef63
Gave the Jenkins config page the same kind of error display as repo-l…
Nov 13, 2015
000b19f
Merge pull request #6 in EXT/stashbot from feature/kn_timeouts to pal…
Nov 17, 2015
6a2665d
Add an object for Global Command Settings and add a column for prebuild
Nov 17, 2015
28fc9f7
Whitespace fix from eclipse
Nov 19, 2015
65cd427
Inject the global prebuild into the jenkins jobs xml templates
Nov 17, 2015
e28c313
Merge pull request #7 in EXT/stashbot from feature/kn_globalpreamble …
Nov 21, 2015
4f7c350
Revert "Another stash 3.11 fix for RepositoryService.getCloneLinks()"
Nov 25, 2015
5517573
Merge pull request #10 in EXT/stashbot from feature/kn_fixcloneurl to…
Nov 25, 2015
bc1b966
Do some shifting around and grouping of repo-level options
Nov 18, 2015
769ce8a
Expose the tests + artifacts all the time and hide everything else
Nov 18, 2015
8b9e7df
Spacing and a few text fixes
Nov 18, 2015
6f22a0c
Fix up all the whitespace and indenting
Nov 19, 2015
5475aff
Rewrite documentation with some examples
Nov 20, 2015
71d59ae
Allow for validation + notifications
Nov 20, 2015
466d4cf
Set some decent defaults for regexes and commands to run
Nov 23, 2015
eb99047
Add a beginner's dialog box 'What is stashbot?'
Nov 25, 2015
964e544
Merge pull request #8 in EXT/stashbot from feature/kniktas_repo-ui-fi…
Nov 26, 2015
745cc37
Fix formatting on this chunk of code.
Dec 2, 2015
f94a1b8
Add Jenkins build result expiry options
Dec 2, 2015
0a9c040
Merge pull request #11 in EXT/stashbot from feature/kniktas_buildexpi…
Dec 3, 2015
ca6a35d
Stashbot Admin UI Settings Changes
Dec 7, 2015
d96c652
Merge pull request #12 in EXT/stashbot from feature/kniktas_adminui t…
Dec 10, 2015
41fbc16
Automatically recreate missing jobs in Jenkins
Dec 17, 2015
d2c3147
Merge pull request #13 in EXT/stashbot from feature/auto-recreate-job…
Dec 17, 2015
1e6e9da
ITOOLS-16732 Change Submit button ID since it fixes the double click …
Jan 4, 2016
699ee6a
Merge pull request #14 in EXT/stashbot from feature/kniktas_fixsavebu…
Jan 5, 2016
c23478b
Add label for all Jenkins builds at Global Level
Jan 22, 2016
5b33121
Add the global labels to the actual job configs
Jan 22, 2016
7579dac
Merge pull request #16 in EXT/stashbot from feature/kniktas_globallab…
Jan 26, 2016
02372bf
Delete all old jobs from Jenkins.
Dec 18, 2015
4d88184
Merge pull request #15 in EXT/stashbot from feature/clean-jobs to pal…
Jan 28, 2016
aa55586
Add dry_run flag to clean-jobs endpoint
Feb 8, 2016
1c6d1a5
Merge pull request #17 in EXT/stashbot from feature/clean-jobs-dry-ru…
Feb 9, 2016
c3b5502
Add a dry run option for the UI
Mar 1, 2016
a35a764
Merge pull request #18 in EXT/stashbot from feature/kniktas_dryrun_lo…
Mar 3, 2016
a980bd6
Add an ending log message
Mar 3, 2016
08fcae4
Add "unused job" deletion
Mar 3, 2016
1d8a348
Fix i8n property label. Bad copy/paste
Mar 3, 2016
f22b068
Include "unbuilt jobs" in the start message.
Mar 3, 2016
e6cc756
Merge pull request #19 in EXT/stashbot from feature/kniktas_unbuiltjo…
Mar 3, 2016
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
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ To work with Jenkins, you MUST install the following jenkins plugins first.
1. [Jenkins GIT plugin](https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin)
2. [Post build task](https://wiki.jenkins-ci.org/display/JENKINS/Post+build+task)
3. [Mailer Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Mailer) (optional, if you want email notifications)
4. In order to have PR verify builds, your jenkins nodes must be able to create a merge commit, meaning your jenkins users should have a ~/.gitconfig file with a user/email set. The commits are thrown away so the value doesn't matter.

If either of these are missing, things won't work.
If any of these are missing, things won't work.

# USER GUIDE

Expand All @@ -22,7 +23,7 @@ requests are created.
## INITIAL CONFIG

After installing stashbot, you will need to do the following as a system
administrator:
administrator in stash:

* Create a jenkins server configuration (one for each jenkins server you connect to) by clicking on "Stashbot Jenkins Admin" under the administration page
* You will need to give stashbot a username/password to access jenkins which has permission to create jobs
Expand Down Expand Up @@ -169,6 +170,8 @@ Not every released version will necessarily be put on the Atlassian Marketplace,

## KNOWN BUGS

* Calls to user(null) in RepositoryCloneLinksRequest.Builder() may be broken in Stash 3.11+
* Removed them for SSH but haven't tested if they need to be removed for HTTP URLs also yet...
* JenkinsManager.updateAllJobs() and createMissingJobs() are untested.

## PLANNED FEATURES
Expand Down
4 changes: 2 additions & 2 deletions bin/install-plugin-sdk-linux.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Version 4.2.20
DOWNLOAD_URL="https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz/version/42230"
# Version 5.0.13
DOWNLOAD_URL="https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz/version/42260"
# To find new URLs, see: https://marketplace.atlassian.com/plugins/atlassian-plugin-sdk-tgz/versions

INSTALL_BIN=`pwd`/.sdk.tar.gz
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4e796a2623b09ade8aeb83b8687ed0c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f5d68197a3c910db6738dcf6ff2c48f84e6da157
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.offbytwo.jenkins</groupId>
<artifactId>jenkins-client</artifactId>
<version>0.3.0.p1</version>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.3.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.3.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.3.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.hudson</groupId>
<artifactId>xstream</artifactId>
<version>1.4.7-jenkins-1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>17.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d016f9109a907f19105ef34f4f5b2929
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1ec73efa618ade099c6d865595adc2917adfd8e2
13 changes: 13 additions & 0 deletions libs/com/offbytwo/jenkins/jenkins-client/maven-metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.offbytwo.jenkins</groupId>
<artifactId>jenkins-client</artifactId>
<versioning>
<latest>0.3.0.p1</latest>
<release>0.3.0.p1</release>
<versions>
<version>0.3.0.p1</version>
</versions>
<lastUpdated>20151016050210</lastUpdated>
</versioning>
</metadata>
15 changes: 11 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
<name>stashbot</name>
<description>Stashbot is a plugin for Atlassian Stash that makes continuous integration via jenkins easy and self-servicable for end-users.</description>
<packaging>atlassian-plugin</packaging>
<repositories>
<repository>
<name>stashbot-internal</name>
<id>stashbot-internal</id>
<url>file://${project.basedir}/libs</url>
</repository>
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -127,7 +134,7 @@
<dependency>
<groupId>com.offbytwo.jenkins</groupId>
<artifactId>jenkins-client</artifactId>
<version>0.1.5</version>
<version>0.3.0.p1</version>
<!-- excluding guava because jenkins-client uses 13 but stash needs a different version -->
<exclusions>
<exclusion>
Expand Down Expand Up @@ -212,9 +219,9 @@
</plugins>
</build>
<properties>
<stash.version>3.6.0</stash.version>
<stash.data.version>3.6.0</stash.data.version>
<stash.containerId>tomcat7x</stash.containerId>
<stash.version>3.11.4</stash.version>
<stash.data.version>3.11.4</stash.data.version>
<stash.containerId>tomcat8x</stash.containerId>
<!--
WARNING: manually sync this with the version in stash - variable in the
pom has the same name but isn't imported for some reason.
Expand Down
Loading