jenkinsci
/
configuration-as-code-plugin
mirror of https://github.com/jenkinsci/configuration-as-code-plugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable CD (#1840)

This commit is contained in:
Tim Jacomb 2022-01-27 10:43:48 +00:00 committed by GitHub
parent 44b59a0fc7
commit e8cfa3473c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 144 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/dependabot.yml vendored
View File

@ -5,7 +5,7 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 10
ignore:
- dependency-name: org.jenkins-ci.main:jenkins-core
versions:
- ">= 0"
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly

2
.github/release-drafter.yml vendored
View File

@ -1,3 +1 @@
_extends: .github
name-template: v$NEXT_MINOR_VERSION 🌈
tag-template: configuration-as-code-$NEXT_MINOR_VERSION

59
.github/workflows/cd.yaml vendored Normal file
View File

@ -0,0 +1,59 @@
# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
name: cd
on:
workflow_dispatch:
check_run:
types:
- completed
jobs:
validate:
runs-on: ubuntu-latest
outputs:
should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }}
steps:
- name: Verify CI status
uses: jenkins-infra/verify-ci-status-action@v1.2.0
id: verify-ci-status
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
output_result: true
- name: Release Drafter
uses: release-drafter/release-drafter@v5
if: steps.verify-ci-status.outputs.result == 'success'
with:
name: next
tag: next
version: next
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Check interesting categories
uses: jenkins-infra/interesting-category-action@v1.0.0
id: interesting-categories
if: steps.verify-ci-status.outputs.result == 'success'
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
release:
runs-on: ubuntu-latest
needs: [validate]
if: needs.validate.outputs.should_release == 'true'
steps:
- name: Check out
uses: actions/checkout@v2.4.0
with:
fetch-depth: 0
- name: Set up JDK 8
uses: actions/setup-java@v2.5.0
with:
distribution: temurin
java-version: 8
- name: Release
uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

4
.mvn/extensions.xml
View File

@ -1,7 +1,7 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 https://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.2</version>
<version>1.3</version>
</extension>
</extensions>

1
.mvn/maven.config
View File

@ -1,2 +1,3 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
-Dchangelist.format=%d.v%s

67
integrations/pom.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>parent</artifactId>
<groupId>io.jenkins.configuration-as-code</groupId>
<version>${revision}${changelist}</version>
<version>${changelist}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -13,7 +13,8 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip> <!-- no need to be deployed during release, this is a test-only module -->
<jackson.version>2.12.4</jackson.version>
<jackson.version>2.13.1</jackson.version>
<enforcer.skip>true</enforcer.skip> <!-- I give up, too much effort to maintain enforcer here, should probably try clear out all enforcer only deps and see if it works -->
<netty.version>4.1.72.Final</netty.version>
<jenkins.version>2.319.1</jenkins.version>
<junixsocket.version>2.4.0</junixsocket.version>
@ -73,6 +74,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
@ -409,7 +415,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.9.2</version>
<version>4.9.3</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
@ -418,7 +424,12 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -437,7 +448,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>slack</artifactId>
<version>2.48</version>
<version>602.v0da_f7458945d</version>
<scope>test</scope>
</dependency>
@ -458,6 +469,18 @@
<artifactId>custom-tools-plugin</artifactId>
<version>0.8</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.4.7</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>gitlab-plugin</artifactId>
@ -491,14 +514,14 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.14.2</version>
<version>1.14.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
<version>0.50.42</version>
<version>0.62.2</version>
<scope>test</scope>
</dependency>
@ -552,16 +575,36 @@
<artifactId>gson</artifactId>
<version>2.8.8</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
</dependency>
<dependency>
<groupId>com.atlassian.plugins</groupId>
<artifactId>atlassian-plugins-core</artifactId>
<version>4.0.0-m029</version>
</dependency>
<dependency>
<groupId>io.atlassian.fugue</groupId>
<artifactId>fugue</artifactId>
<version>4.7.2</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>3.14.9</version>
<version>4.9.2</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
<version>1.21</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
@ -661,7 +704,7 @@
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.9.0</version>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@ -686,7 +729,7 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.6</version>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@ -772,7 +815,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
<version>20211205</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>

6
integrations/src/test/resources/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListExpected.yml
View File

@ -9,9 +9,3 @@ jdk:
mavenGlobalConfig:
globalSettingsProvider: "standard"
settingsProvider: "standard"
msTestInstallation:
installations:
- defaultArgs: "/category:SmokeTests"
home: "C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\IDE\\MSTest.exe"
name: "MSTest test"
omitNoIsolation: true

11
plugin/pom.xml
View File

@ -1,16 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>parent</artifactId>
<version>${revision}${changelist}</version>
<relativePath>..</relativePath>
<version>${changelist}</version>
</parent>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<version>${revision}${changelist}</version>
<version>${changelist}</version>
<packaging>hpi</packaging>
<name>Configuration as Code Plugin</name>
@ -49,7 +48,7 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.249.x</artifactId>
<artifactId>bom-2.289.x</artifactId>
<version>${plugin-bom.version}</version>
<scope>import</scope>
<type>pom</type>
@ -65,7 +64,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
<version>20211205</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>

22
pom.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.29</version>
<version>4.33</version>
<relativePath />
</parent>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>parent</artifactId>
<version>${revision}${changelist}</version>
<version>${changelist}</version>
<packaging>pom</packaging>
<modules>
@ -19,13 +19,13 @@
</modules>
<properties>
<revision>1.55.2</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.249.1</jenkins.version>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/configuration-as-code-plugin</gitHubRepo>
<jenkins.version>2.289.3</jenkins.version>
<java.level>8</java.level>
<tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
<useBeta>true</useBeta>
<plugin-bom.version>950.v396cb834de1e</plugin-bom.version>
<plugin-bom.version>1117.v62a_f6a_01de98</plugin-bom.version>
</properties>
<name>Configuration as Code Parent</name>
@ -35,14 +35,14 @@
<licenses>
<license>
<name>MIT License</name>
<url>http://opensource.org/licenses/MIT</url>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
<scm>
<connection>scm:git:git://github.com/jenkinsci/configuration-as-code-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/configuration-as-code-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/configuration-as-code-plugin</url>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>

9
test-harness/pom.xml
View File

@ -1,10 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>parent</artifactId>
<groupId>io.jenkins.configuration-as-code</groupId>
<version>${revision}${changelist}</version>
<relativePath>..</relativePath>
<version>${changelist}</version>
</parent>
<artifactId>test-harness</artifactId>
@ -19,7 +18,7 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.249.x</artifactId>
<artifactId>bom-2.289.x</artifactId>
<version>${plugin-bom.version}</version>
<scope>import</scope>
<type>pom</type>
@ -59,7 +58,7 @@
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
<version>0.50.42</version>
<version>0.62.2</version>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>

4
test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java
View File

@ -3,8 +3,8 @@ package io.jenkins.plugins.casc.misc;
import com.vladsch.flexmark.ast.FencedCodeBlock;
import com.vladsch.flexmark.ast.util.TextCollectingVisitor;
import com.vladsch.flexmark.parser.Parser;
import com.vladsch.flexmark.profiles.pegdown.Extensions;
import com.vladsch.flexmark.profiles.pegdown.PegdownOptionsAdapter;
import com.vladsch.flexmark.profile.pegdown.Extensions;
import com.vladsch.flexmark.profile.pegdown.PegdownOptionsAdapter;
import com.vladsch.flexmark.util.ast.Node;
import com.vladsch.flexmark.util.data.DataHolder;
import com.vladsch.flexmark.util.data.MutableDataSet;

2
test-harness/src/test/resources/io/jenkins/plugins/casc/core/MavenConfiguratorTest.yml
View File

@ -1,5 +1,5 @@
tool:
maven:
mavenGlobalConfig:
settingsProvider:
filePath:
path: /usr/share/maven-settings.xml