Update jenkins chart version (#2721)

* Update jenkins chatrs version

Update jenkins chatrs version

* Use default Jenkins agent image

* Use default Jenkins image tag and plugins

* Use spinnaker image in test rather than Jenkins image

* Fix requriements lock

* Use curl trusty for UI test

* Update jenkins agent image in jenkins jobs
This commit is contained in:
riverzhang
2017-11-27 11:50:48 -08:00
committed by Vic Iglesias
parent 2e26226829
commit f5c8b4d86d
6 changed files with 8 additions and 17 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
name: spinnaker
version: 0.3.7
version: 0.3.8
appVersion: 1.1.0
home: http://spinnaker.io/
sources:
+3 -3
View File
@@ -7,6 +7,6 @@ dependencies:
version: 0.1.5
- name: jenkins
repository: https://kubernetes-charts.storage.googleapis.com/
version: 0.8.8
digest: sha256:6b423935ab814a98e59e9a477eac6330580b11fba11197210a4ea76bb48e2643
generated: 2017-09-03T14:41:12.599693583-04:00
version: 0.9.0
digest: sha256:3eb5e7d64f60f5f65be2dace04a7fe1a3c4aca05ae9cb91f170f7f84d85dabea
generated: 2017-11-27T09:51:22.234269869-08:00
+1 -1
View File
@@ -7,5 +7,5 @@ dependencies:
repository: https://kubernetes-charts.storage.googleapis.com/
condition: minio.enabled
- name: jenkins
version: 0.8.8
version: 0.9.0
repository: https://kubernetes-charts.storage.googleapis.com/
@@ -17,7 +17,7 @@ data:
<hudson.model.StringParameterDefinition>
<name>EXECUTOR_IMAGE</name>
<description></description>
<defaultValue>viglesiasce/spinnaker-jenkins-agent:v0.2.0</defaultValue>
<defaultValue>jenkins/jnlp-slave:3.10-1</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>REPOSITORY_URL</name>
@@ -100,7 +100,7 @@ data:
<hudson.model.StringParameterDefinition>
<name>EXECUTOR_IMAGE</name>
<description></description>
<defaultValue>viglesiasce/spinnaker-jenkins-agent:v0.2.0</defaultValue>
<defaultValue>jenkins/jnlp-slave:3.10-1</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+1 -1
View File
@@ -20,7 +20,7 @@ spec:
name: tools
containers:
- name: {{.Release.Name}}-ui-test
image: {{.Values.jenkins.Master.Image}}:{{.Values.jenkins.Master.ImageTag}}
image: tutum/curl:trusty
command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
volumeMounts:
- mountPath: /tests
-9
View File
@@ -105,20 +105,11 @@ gcs:
# https://www.spinnaker.io/setup/ci/jenkins/
jenkins:
Master:
ImageTag: 2.62
Cpu: "500m"
Memory: "512Mi"
ServiceType: ClusterIP
CustomConfigMap: true
InstallPlugins:
- kubernetes:0.11
- workflow-aggregator:2.5
- workflow-job:2.11
- credentials-binding:1.12
- git:3.2.0
Agent:
Image: viglesiasce/spinnaker-jenkins-agent
ImageTag: v0.2.0
Cpu: "500m"
Memory: "512Mi"