diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-31 16:57:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 16:57:07 -0500 |
| commit | d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b (patch) | |
| tree | 8a5677558578d83edd2fc2def96263265add3a18 /roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json | |
| parent | 577b4f46ebf8db9b3e5601367cc7bc7cd73bce28 (diff) | |
| parent | 945812d9849305649d52a24936b3288a44a5cdad (diff) | |
| download | openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.gz openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.bz2 openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.xz openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.zip | |
Merge pull request #3823 from sdodson/image-stream-sync
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json')
| -rw-r--r-- | roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json index b0aef3cfc..264e4b2de 100644 --- a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json @@ -110,6 +110,10 @@ "value": "true" }, { + "name": "OPENSHIFT_JENKINS_JVM_ARCH", + "value": "${JVM_ARCH}" + }, + { "name": "KUBERNETES_MASTER", "value": "https://kubernetes.default:443" }, @@ -255,6 +259,12 @@ "value": "true" }, { + "name": "JVM_ARCH", + "displayName": "Jenkins JVM Architecture", + "description": "Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.", + "value": "i386" + }, + { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", "description": "Maximum amount of memory the container can use.", |