Skip to content

Commit 136e265

Browse files
Logan Donleyoybed
Logan Donley
authored andcommitted
Adding a slave_image_tag parameter (#66)
* Adding a slave_image_tag parameter This will allow us to use the image tag to make sure we can set specific slave versions. * Adding SLAVE_IMAGE_TAG to slave-pod template
1 parent 67c070e commit 136e265

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

openshift-templates/jenkins-slave-pod/template-with-secret.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{
2424
"from": {
2525
"kind": "DockerImage",
26-
"name": "openshift/jenkins-slave-base-rhel7:latest"
26+
"name": "openshift/jenkins-slave-base-rhel7:${SLAVE_IMAGE_TAG}"
2727
},
2828
"generation": 2,
2929
"importPolicy": {},
@@ -147,6 +147,12 @@
147147
"displayName": "Image name from which to build this pod",
148148
"description": "The build image which this build pod will extend to create it's new build pod type.",
149149
"value": "jenkins-slave-base-rhel7"
150+
},
151+
{
152+
"name": "SLAVE_IMAGE_TAG",
153+
"displayName": "Image tag for Jenkins slave.",
154+
"description": "This is the image tag used for the Jenkins slave.",
155+
"value": "latest"
150156
}
151157
],
152158
"labels": {

openshift-templates/jenkins-slave-pod/template.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{
2424
"from": {
2525
"kind": "DockerImage",
26-
"name": "openshift/jenkins-slave-base-rhel7:latest"
26+
"name": "openshift/jenkins-slave-base-rhel7:${SLAVE_IMAGE_TAG}"
2727
},
2828
"generation": 2,
2929
"importPolicy": {},
@@ -138,9 +138,15 @@
138138
"displayName": "Image name from which to build this pod",
139139
"description": "The build image which this build pod will extend to create it's new build pod type.",
140140
"value": "jenkins-slave-base-rhel7"
141+
},
142+
{
143+
"name": "SLAVE_IMAGE_TAG",
144+
"displayName": "Image tag for Jenkins slave.",
145+
"description": "This is the image tag used for the Jenkins slave.",
146+
"value": "latest"
141147
}
142148
],
143149
"labels": {
144150
"template": "build-pod-template"
145151
}
146-
}
152+
}

0 commit comments

Comments
 (0)