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

add configuration-as-code plugin to Bill of Material #78

Merged
merged 7 commits into from
Sep 18, 2019
Merged

add configuration-as-code plugin to Bill of Material #78

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19a2a44
add configuration-as-code plugin to Bill of Material
jetersen Aug 27, 2019
4ed68ce
copy-pasta'd too hard
jetersen Aug 28, 2019
180d23d
bump jcasc to v1.30
jetersen Sep 8, 2019
e74cf6c
Merge branch 'master' into feat/addJCasC
jetersen Sep 12, 2019
6e805fe
add intellij items to gitignore
jetersen Sep 12, 2019
13bae09
test out git client 3.0.0-beta11
jetersen Sep 13, 2019
415436f
Merge branch 'master' into feat/addJCasC
jetersen Sep 16, 2019
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
target
.idea/
*.iml
16 changes: 14 additions & 2 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<artifactId>bom</artifactId>
<packaging>pom</packaging>
<properties>
<configuration-as-code-plugin.version>1.30</configuration-as-code-plugin.version>
<git-plugin.version>3.12.1</git-plugin.version>
<scm-api-plugin.version>2.6.3</scm-api-plugin.version>
<structs-plugin.version>1.20</structs-plugin.version>
Expand All @@ -20,6 +21,17 @@
<dependencyManagement>
<dependencies>
<!-- Plugins (sorted): -->
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<version>${configuration-as-code-plugin.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<version>${configuration-as-code-plugin.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-api</artifactId>
Expand Down Expand Up @@ -148,7 +160,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
<version>2.8.4</version>
<version>3.0.0-beta11</version>
jglick marked this conversation as resolved.
Show resolved Hide resolved
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -219,7 +231,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-slaves</artifactId>
<version>1.30.1</version>
<version>1.30.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
11 changes: 11 additions & 0 deletions sample-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
Expand Down
22 changes: 22 additions & 0 deletions sample-plugin/src/test/java/io/jenkins/tools/bom/sample/ConfigurationAsCodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package io.jenkins.tools.bom.sample;

import io.jenkins.plugins.casc.misc.ConfiguredWithCode;
import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
import jenkins.model.Jenkins;
import org.junit.ClassRule;
import org.junit.Test;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;

public class ConfigurationAsCodeTest {

@ClassRule
@ConfiguredWithCode("configuration-as-code.yml")
public static JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule();

@Test
public void smokes() {
assertThat(Jenkins.get().getSystemMessage(), is("Hello World"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit more interesting to configure some object defined in this plugin, but good enough for now I guess.

Copy link
Member Author

@jetersen jetersen Aug 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is nothing really interesting to configure in JCasC 😆
Though we could use it to smoke test all other plugins 😆

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, currently this plugin does not define any global settings, but it could. Whether that would make test coverage any more meaningful for BOM updates is another question.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

91d7c3e hmm
@MarkEWaite 😅

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wanna state BOM and PCT is pretty awesome! Kudos 😍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I remove the test?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is fine.

}
}
2 changes: 2 additions & 0 deletions sample-plugin/src/test/resources/io/jenkins/tools/bom/sample/configuration-as-code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jenkins:
systemMessage: "Hello World"