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.

Sign up for GitHub

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

Jump to bottom

Use jnr-posix-api plugin #287

Merged
merged 6 commits into from
Apr 8, 2022
Merged

Use jnr-posix-api plugin #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aaddbfc
Add posix plugin
sarah-witt Apr 8, 2022
3cc9fce
Fix test
sarah-witt Apr 8, 2022
0f044d7
Update versions tested in jenkinsfile
sarah-witt Apr 8, 2022
0e9fdd0
Add recentLTS
sarah-witt Apr 8, 2022
093ee77
Update LTS
sarah-witt Apr 8, 2022
7158aeb
Revert update
sarah-witt Apr 8, 2022
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
12 changes: 6 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
def recentLTS = "2.164.1"
def commonVersion = "2.164.3"
def comonVersion = "2.303.3"
def recentLTS = "2.303.3"
def configurations = [
[ platform: "linux", jdk: "8", jenkins: null ],
// windows
[ platform: "windows", jdk: "8", jenkins: recentLTS ],
[ platform: "windows", jdk: "8", jenkins: comonVersion ],
// java 11
[ platform: "linux", jdk: "11", jenkins: recentLTS ],
[ platform: "linux", jdk: "11", jenkins: comonVersion ],
// windows
[ platform: "windows", jdk: "8", jenkins: commonVersion ],
[ platform: "windows", jdk: "8", jenkins: recentLTS ],
// java 11
[ platform: "linux", jdk: "11", jenkins: commonVersion ],
[ platform: "linux", jdk: "11", jenkins: recentLTS ],
]

buildPlugin(configurations: configurations)
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A Jenkins plugin for automatically forwarding metrics, events, and service check

### Installation

_This plugin requires [Jenkins 2.164.1][2]._
_This plugin requires [Jenkins 2.303.3][2]._

_For older versions of Jenkins (i.e 1.632+), you can find the 1.2.0 version of the plugin [here](https://updates.jenkins.io/download/plugins/datadog/)._

Expand Down Expand Up @@ -365,7 +365,7 @@ Checkout the [contributing guidelines][11] before you submit an issue or a pull
Checkout the [development document][12] for tips on spinning up a quick development environment locally.

[1]: https://plugins.jenkins.io/datadog
[2]: http://updates.jenkins-ci.org/download/war/1.632/jenkins.war
[2]: http://updates.jenkins-ci.org/download/war/2.303.3/jenkins.war
[3]: https://wiki.jenkins-ci.org/display/JENKINS/Plugins#Plugins-Howtoinstallplugins
[4]: https://app.datadoghq.com/account/settings#api
[5]: https://github.com/jenkinsci/docker
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<properties>
<java.level>8</java.level>
<jenkins.version>2.164.1</jenkins.version>
<jenkins.version>2.303.3</jenkins.version>
<hpi.compatibleSinceVersion>1.0.0</hpi.compatibleSinceVersion>
<dd-trace-java.version>0.71.0</dd-trace-java.version>
</properties>
Expand Down Expand Up @@ -75,6 +75,11 @@

<dependencies>

<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jnr-posix-api</artifactId>
<version>3.1.7-1</version>
</dependency>
<dependency>
<groupId>com.datadoghq</groupId>
<artifactId>java-dogstatsd-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogBuildListenerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void testTraces() throws Exception {
assertEquals("success", meta.get(CITags.STATUS));
assertNotNull(meta.get(CITags.NODE_NAME));
assertNotNull(meta.get(CITags.NODE_LABELS));
assertNull(meta.get(CITags._DD_HOSTNAME));
drodriguezhdez marked this conversation as resolved.
Show resolved Hide resolved
assertEquals("none", meta.get(CITags._DD_HOSTNAME));
assertEquals("success", meta.get(CITags.JENKINS_RESULT));
assertEquals("jenkins-buildIntegrationSuccess-1", meta.get(CITags.JENKINS_TAG));
assertNotNull(meta.get(CITags._DD_CI_STAGES));
Expand Down