jenkinsci · jglick · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016
@@ -0,0 +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">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.0-beta-3</version>
+  </extension>
+</extensions>
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
@@ -0,0 +1,8 @@
+FROM jenkinsci/jenkins:2.121.1
+
+ADD JENKINS_HOME /usr/share/jenkins/ref/
+
+# https://github.com/docker/docker/issues/6119 workaround:
+USER root
+RUN chown -R jenkins.jenkins /usr/share/jenkins/ref
+USER jenkins
@@ -0,0 +1 @@
+plugins
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson>
+  <disabledAdministrativeMonitors>
+    <string>jenkins.security.s2m.MasterKillSwitchWarning</string>
+  </disabledAdministrativeMonitors>
+  <version>1.0</version>
+  <numExecutors>1</numExecutors>
+  <mode>NORMAL</mode>
+  <useSecurity>true</useSecurity>
+  <authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/>
+  <securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
+    <disableSignup>false</disableSignup>
+    <enableCaptcha>false</enableCaptcha>
+  </securityRealm>
+  <disableRememberMe>false</disableRememberMe>
+  <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
+  <workspaceDir>${JENKINS_HOME}/workspace/${ITEM_FULLNAME}</workspaceDir>
+  <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
+  <markupFormatter class="hudson.markup.EscapedMarkupFormatter"/>
+  <jdks/>
+  <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
+  <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
+  <clouds/>
+  <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
+  <views>
+    <hudson.model.AllView>
+      <owner class="hudson" reference="../../.."/>
+      <name>All</name>
+      <filterExecutors>false</filterExecutors>
+      <filterQueue>false</filterQueue>
+      <properties class="hudson.model.View$PropertyList"/>
+    </hudson.model.AllView>
+  </views>
+  <primaryView>All</primaryView>
+  <slaveAgentPort>50000</slaveAgentPort>
+  <label></label>
+  <crumbIssuer class="hudson.security.csrf.DefaultCrumbIssuer">
+    <excludeClientIPFromCrumb>false</excludeClientIPFromCrumb>
+  </crumbIssuer>
+  <nodeProperties/>
+  <globalNodeProperties/>
+</hudson>
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials@2.1.10">
+  <domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash">
+    <entry>
+      <com.cloudbees.plugins.credentials.domains.Domain>
+        <specifications/>
+      </com.cloudbees.plugins.credentials.domains.Domain>
+      <java.util.concurrent.CopyOnWriteArrayList>
+        <org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl plugin="plain-credentials@1.3">
+          <scope>GLOBAL</scope>
+          <id>token</id>
+          <description></description>
+          <secret>Z9Ijvs1aPbFgmZ4SrVScn0fEdhM/KmrtvujXjtr1ij0=</secret>
+        </org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl>
+      </java.util.concurrent.CopyOnWriteArrayList>
+    </entry>
+  </domainCredentialsMap>
+</com.cloudbees.plugins.credentials.SystemCredentialsProvider>
@@ -0,0 +1 @@
+2.32
@@ -0,0 +1 @@
+2.32
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jenkins.model.JenkinsLocationConfiguration>
+  <adminAddress>address not configured yet &lt;nobody@nowhere&gt;</adminAddress>
+  <jenkinsUrl>http://localhost:8080/</jenkinsUrl>
+</jenkins.model.JenkinsLocationConfiguration>
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<jenkins.plugins.logstash.LogstashInstallation_-Descriptor plugin="logstash@1.2.1-SNAPSHOT">
+  <type>ELASTICSEARCH</type>
+  <host>http://elk</host>
+  <port>9200</port>
+  <username></username>
+  <password></password>
+  <key>/logstash/logs</key>
+</jenkins.plugins.logstash.LogstashInstallation_-Descriptor>
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.10-SNAPSHOT">
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.23">
+    <script>parallel local: {
+  node(&apos;master&apos;) {
+    sh &apos;for x in 0 1 2 3 4 5 6 7 8 9; do echo $x; sleep 1; done&apos;
+  }
+}, remote: {
+  node(&apos;remote&apos;) {
+    withCredentials([string(credentialsId: &apos;token&apos;, variable: &apos;TOKEN&apos;)]) {
+      sh &apos;echo receiving $TOKEN&apos;
+      sh &apos;for x in 0 1 2 3 4 5 6 7 8 9; do echo $x; sleep 1; done&apos;
+    }
+  }
+}</script>
+    <sandbox>true</sandbox>
+  </definition>
+  <triggers/>
+</flow-definition>
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<slave>
+  <name>remote</name>
+  <description></description>
+  <remoteFS>/home/jenkins</remoteFS>
+  <numExecutors>1</numExecutors>
+  <mode>NORMAL</mode>
+  <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
+  <launcher class="hudson.slaves.JNLPLauncher"/>
+  <label></label>
+  <nodeProperties/>
+</slave>
@@ -0,0 +1 @@
+6816dcc6d8d1cf2a87c53827f07fdf47f8775873dfe478a81922809ce22a9917670ea81dc7d5a20930b0998f54d347f3b1bd50ad6d61861b28fb02d50f728eb7b6e914b8ef5dd032feb02f0f618aba6f9d75fae4b797c946172f051b931a216b6abc0edbd9d8c75044f4b57b9477da33859f96902ee26051c77b8d50c03fd68c
@@ -0,0 +1,9 @@
+plugins:
+	if [ \! -d ../target/test-classes/test-dependencies -o ../pom.xml -nt ../target/test-classes/test-dependencies/index ]; then mvn -f .. -DskipTests clean package; fi
+	rm -rf JENKINS_HOME/plugins
+	mkdir JENKINS_HOME/plugins
+	cp -v ../target/test-classes/test-dependencies/*.hpi ../target/*.hpi JENKINS_HOME/plugins
+
+run: plugins
+	docker-compose rm -fv
+	docker-compose up --build --force-recreate jenkins elk
@@ -0,0 +1,13 @@
+To run this demo:
+
+1. `make run`
+1. when that is started enough, `docker-compose up -d agent`
+1. go to http://localhost:8080/job/sample/
+1. **Build Now**
+1. inspect **Console Output**
+1. see console annotations in `Running on`__`Jenkins`__`in /var/jenkins_home/workspace/sample`
+1. **hide**/**show** blocks
+1. configure http://localhost:5601/ with `logstash*` and `@timestamp`
+1. inspect **External log (Kibana)**
+1. compare `sender` fields to `docker ps` container IDs
+1. verify that passwords are masked
@@ -0,0 +1,25 @@
+version: '2'
+services:
+  elk:
+    image: sebp/elk:es240_l240_k460
+    ports:
+    - "127.0.0.1:5000:5000"
+    - "127.0.0.1:5044:5044"
+    - "127.0.0.1:5601:5601"
+    - "127.0.0.1:9200:9200"
+# TODO preconfigure view via logstash* & @timestamp
+  jenkins:
+    build: .
+    ports:
+     - "127.0.0.1:8080:8080"
+    expose:
+     - "50000"
+    links:
+     - elk
+  agent:
+    image: cloudbees/jnlp-slave-with-java-build-tools
+    links:
+     - elk
+     - jenkins
+# TODO there is no -noreconnect yet this does not work when first started; you need to relaunch it; work around with wait-for-it: https://docs.docker.com/compose/startup-order/
+    command: -url http://jenkins:8080/ b4178553de10d5551ff6d19cc1f0665d0ee6fff211bc0b57ec7c4c5617e23bb8 remote
@@ -3,19 +3,22 @@
   <modelVersion>4.0.0</modelVersion>
 
   <properties>
+    <revision>2.0.0</revision>
+    <changelist>-SNAPSHOT</changelist>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <skipIntegrationTests>true</skipIntegrationTests>
-    <jenkins-test-harness.version>2.23</jenkins-test-harness.version>
-    <java.level>7</java.level>
-    <jenkins.version>2.7.4</jenkins.version>
+    <java.level>8</java.level>
+    <jenkins.version>2.121.1</jenkins.version>
+    <useBeta>true</useBeta>
   </properties>
 
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.15</version>
+    <version>3.14</version>
+    <relativePath/>
   </parent>
-
+  
   <repositories>
     <repository>
       <id>repo.jenkins-ci.org</id>
@@ -34,7 +37,7 @@
     <connection>scm:git:git://github.com/jenkinsci/logstash-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/logstash-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/logstash-plugin</url>
-    <tag>HEAD</tag>
+    <tag>${scmTag}</tag>
   </scm>
 
   <distributionManagement>
@@ -52,7 +55,7 @@
 
   <artifactId>logstash</artifactId>
   <packaging>hpi</packaging>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${revision}${changelist}</version>
   <name>Logstash</name>
   <description>A Logstash agent to send Jenkins logs to a Logstash indexer.</description>
   <url>https://plugins.jenkins.io/logstash</url>
@@ -121,11 +124,54 @@
       <artifactId>junit</artifactId>
       <version>1.10</version>
     </dependency>
+
+    <!-- For indexing of jobs in Elasticsearch -->
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>unique-id</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jenkins-ci.plugins.workflow</groupId>
+      <artifactId>workflow-job</artifactId>
+      <version>2.22-rc303.18d78f305a45</version> <!-- TODO https://github.com/jenkinsci/workflow-job-plugin/pull/27 -->
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins.workflow</groupId>
+      <artifactId>workflow-support</artifactId>
+      <version>2.19-rc257.cd70bcc4c209</version> <!-- TODO https://github.com/jenkinsci/workflow-support-plugin/pull/15 -->
+    </dependency>
+    <!-- For testing of Log wrapping in Pipeline -->
+    <dependency>
+      <groupId>org.jenkins-ci.plugins.workflow</groupId>
+      <artifactId>workflow-durable-task-step</artifactId>
+      <version>2.20-rc333.74dc7c303e6d</version> <!-- TODO https://github.com/jenkinsci/workflow-durable-task-step-plugin/pull/21 -->
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins.workflow</groupId>
+      <artifactId>workflow-cps</artifactId>
+      <version>2.19</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins.workflow</groupId>
+      <artifactId>workflow-basic-steps</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>credentials-binding</artifactId>
+      <version>1.15</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>structs</artifactId>
-      <version>1.2</version>
+      <version>1.14</version>
     </dependency>
     <dependency>
     	<groupId>org.powermock</groupId>
@@ -142,7 +188,7 @@
     <dependency>
     	<groupId>org.jenkins-ci.plugins.workflow</groupId>
     	<artifactId>workflow-step-api</artifactId>
-    	<version>1.15</version>
+    	<version>2.13</version>
 		<optional>true</optional>
     </dependency>
   </dependencies>
@@ -174,15 +220,6 @@
         </dependencies>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-
       <!-- http://jira.codehaus.org/browse/MRELEASE-812 -->
       <plugin>
         <artifactId>maven-release-plugin</artifactId>