Merge pull request #15 from keptn/new-jenkins

Build new Jenkins image 0.5.0

Author: johannes-b

README.md

@@ -18,6 +18,7 @@ During the setup of the Jenkins, a secret is created that contains key-value pai
 
 ## Docker Jenkins
 The `docker-jenkins` folder contains a `Dockerfile` and all artifacts for building the Jenkins container image. Characteristics of this Jenkins image are:
+* **Performance Signature Plugin 3.1.1**
 * **Jenkins jobs**:
   * deploy
   * run_test

config/jenkins/k8s-jenkins-deployment.yml

@@ -69,7 +69,7 @@ spec:
     spec:
       containers:
       - name: jenkins
-        image: keptn/jenkins:0.4.1
+        image: keptn/jenkins:0.5.0
         imagePullPolicy: Always
         env:
           - name: GITHUB_USER_EMAIL
@@ -78,10 +78,6 @@ spec:
             value: GITHUB_ORGANIZATION_PLACEHOLDER
           - name: DOCKER_REGISTRY_IP
             value: DOCKER_REGISTRY_IP_PLACEHOLDER
-          - name: DT_TENANT_URL
-            value: DT_TENANT_URL_PLACEHOLDER
-          - name: DT_API_TOKEN
-            value: DT_API_TOKEN_PLACEHOLDER
         ports:
         - containerPort: 8080
         - containerPort: 50000

docker-jenkins/Dockerfile

@@ -80,6 +80,7 @@ RUN chmod +x /usr/local/bin/jenkins.sh
 
 COPY /configs/jenkins_home_config.xml "$JENKINS_HOME"/config.xml
 COPY /configs/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml "$JENKINS_HOME"/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
+COPY /configs/de.tsystems.mms.apm.performancesignature.dynatracesaas.DynatraceGlobalConfiguration.xml "$JENKINS_HOME"/de.tsystems.mms.apm.performancesignature.dynatracesaas.DynatraceGlobalConfiguration.xml
 
 ADD /configs/jobs /tmp/jobs
 ADD /configs/users "$JENKINS_HOME"/users
@@ -97,6 +98,9 @@ credentials-binding:1.16 \
 git:3.9.1 \
 google-oauth-plugin:0.6 \
 google-source-plugin:0.3 \
+performance:3.12 \
+performance-signature-dynatracesaas:3.1.1 \
+performance-signature-ui:3.1.1 \
 github-branch-source:2.4.1
 
 RUN cp -R /tmp/jobs/* "$JENKINS_HOME"/jobs/

docker-jenkins/configs/de.tsystems.mms.apm.performancesignature.dynatracesaas.DynatraceGlobalConfiguration.xml

@@ -0,0 +1,12 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<de.tsystems.mms.apm.performancesignature.dynatracesaas.DynatraceGlobalConfiguration plugin="[email protected]">
+  <configurations>
+    <de.tsystems.mms.apm.performancesignature.dynatracesaas.model.DynatraceServerConfiguration>
+      <name>Dynatrace Tenant</name>
+      <apiTokenId>perfsig-api-token</apiTokenId>
+      <verifyCertificate>false</verifyCertificate>
+      <useProxy>false</useProxy>
+      <serverUrl>https://DT_TENANT_URL_PLACEHOLDER</serverUrl>
+    </de.tsystems.mms.apm.performancesignature.dynatracesaas.model.DynatraceServerConfiguration>
+  </configurations>
+</de.tsystems.mms.apm.performancesignature.dynatracesaas.DynatraceGlobalConfiguration>

docker-jenkins/configs/jobs/deploy/config.xml

@@ -96,7 +96,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>*/release-0.1.x</name>
+          <name>*/release-0.2.x</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

docker-jenkins/configs/jobs/evaluation_done/config.xml

@@ -103,7 +103,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>*/release-0.1.x</name>
+          <name>*/release-0.2.x</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

docker-jenkins/configs/jobs/run_tests/config.xml

@@ -102,7 +102,7 @@
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>*/release-0.1.x</name>
+          <name>*/release-0.2.x</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

docker-jenkins/jenkins.sh

@@ -9,6 +9,7 @@ find /usr/share/jenkins/ref/ \( -type f -o -type l \) -exec bash -c '. /usr/loca
 sed -i 's/DOCKER_REGISTRY_URL_PLACEHOLDER/'"$DOCKER_REGISTRY_IP"'/' $JENKINS_HOME/config.xml
 sed -i 's/GITHUB_USER_EMAIL_PLACEHOLDER/'"$GITHUB_USER_EMAIL"'/' $JENKINS_HOME/config.xml
 sed -i 's/GITHUB_ORGANIZATION_PLACEHOLDER/'"$GITHUB_ORGANIZATION"'/' $JENKINS_HOME/config.xml
+sed -i 's~DT_TENANT_URL_PLACEHOLDER~'"$DT_TENANT_URL"'~' $JENKINS_HOME/de.tsystems.mms.apm.performancesignature.dynatracesaas.DynatraceGlobalConfiguration.xml
 
 # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then

docker-jenkins/version

@@ -1 +1 @@
-0.4.1
+0.5.0

releasenotes/releasenotes_V0.2.0.md

@@ -1,11 +1,11 @@
 # Release Notes 0.2.0
 
 ## New Features
+- new Jenkins image: keptn/jenkins:0.5.0
 
 ## Fixed Issues
 - Jenkins URL removed from Jenkins configuration
 - Dynatrace-related environment variables removed from Jenkins configuration
-- Performance signature plugin removed from Jenkins [#297](https://github.com/keptn/keptn/issues/297)
 - Hardening the deploy script to check each installation step [#250](https://github.com/keptn/keptn/issues/250)
 - Hardening the deploy pipeline to check whether the DT_TENANT_URL is set. Besides, DT deploy event contains additional meta-information [#268](https://github.com/keptn/keptn/issues/268).