Skip to content

Commit c7a063d

Browse files
committed
update template to allow 32 vs. 64 bit JVM selection for Jenkins
1 parent 9e1c93e commit c7a063d

File tree

3 files changed

+40
-0
lines changed

3 files changed

+40
-0
lines changed

examples/jenkins/jenkins-ephemeral-template.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@
109109
"name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT",
110110
"value": "true"
111111
},
112+
{
113+
"name": "OPENSHIFT_JENKINS_JVM_ARCH",
114+
"value": "${JVM_ARCH}"
115+
},
112116
{
113117
"name": "KUBERNETES_MASTER",
114118
"value": "https://kubernetes.default:443"
@@ -254,6 +258,12 @@
254258
"description": "Whether to enable OAuth OpenShift integration. If false, the static account 'admin' will be initialized with the password 'password'.",
255259
"value": "true"
256260
},
261+
{
262+
"name": "JVM_ARCH",
263+
"displayName": "Jenkins JVM Architecture",
264+
"description": "Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.",
265+
"value": "i386"
266+
},
257267
{
258268
"name": "MEMORY_LIMIT",
259269
"displayName": "Memory Limit",

examples/jenkins/jenkins-persistent-template.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@
126126
"name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT",
127127
"value": "true"
128128
},
129+
{
130+
"name": "OPENSHIFT_JENKINS_JVM_ARCH",
131+
"value": "${JVM_ARCH}"
132+
},
129133
{
130134
"name": "KUBERNETES_MASTER",
131135
"value": "https://kubernetes.default:443"
@@ -271,6 +275,12 @@
271275
"description": "Whether to enable OAuth OpenShift integration. If false, the static account 'admin' will be initialized with the password 'password'.",
272276
"value": "true"
273277
},
278+
{
279+
"name": "JVM_ARCH",
280+
"displayName": "Jenkins JVM Architecture",
281+
"description": "Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.",
282+
"value": "i386"
283+
},
274284
{
275285
"name": "MEMORY_LIMIT",
276286
"displayName": "Memory Limit",

pkg/bootstrap/bindata.go

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)