Skip to content

Commit 35b539d

Browse files
author
OpenShift Bot
authored
Merge pull request #11508 from gabemontero/bypassOauthPipelineExtTest
Merged by openshift-bot
2 parents 7ae5feb + bf2235a commit 35b539d

File tree

2 files changed

+262
-2
lines changed

2 files changed

+262
-2
lines changed

‎test/extended/jenkins/plugin.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func getAdminPassword(oc *exutil.CLI) string {
2929
return s[1]
3030
}
3131
}
32-
return ""
32+
return "password"
3333
}
3434

3535
func immediateInteractionWithJenkins(uri, method, password string, body io.Reader, status int) {
@@ -142,7 +142,8 @@ var _ = g.Describe("[jenkins][Slow] openshift pipeline plugin", func() {
142142
testingSnapshot = true
143143
} else {
144144
// no test image, testing the base jenkins image with the current, supported version of the plugin
145-
jenkinsEphemeralPath = exutil.FixturePath("..", "..", "examples", "jenkins", "jenkins-ephemeral-template.json")
145+
//TODO disabling oauth until we can update getAdminPassword path to handle oauth (perhaps borrow from oauth integration tests)
146+
jenkinsEphemeralPath = exutil.FixturePath("testdata", "jenkins-ephemeral-template-no-oauth.json")
146147
}
147148
err = oc.Run("new-app").Args(jenkinsEphemeralPath).Execute()
148149
o.Expect(err).NotTo(o.HaveOccurred())

‎test/extended/testdata/jenkins-ephemeral-template-no-oauth.json

+259
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,259 @@
1+
{
2+
"kind": "Template",
3+
"apiVersion": "v1",
4+
"metadata": {
5+
"name": "jenkins-ephemeral",
6+
"creationTimestamp": null,
7+
"annotations": {
8+
"description": "Jenkins service, without persistent storage.\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
9+
"iconClass": "icon-jenkins",
10+
"tags": "instant-app,jenkins"
11+
}
12+
},
13+
"message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",
14+
"objects": [
15+
{
16+
"kind": "Route",
17+
"apiVersion": "v1",
18+
"metadata": {
19+
"name": "${JENKINS_SERVICE_NAME}",
20+
"creationTimestamp": null
21+
},
22+
"spec": {
23+
"to": {
24+
"kind": "Service",
25+
"name": "${JENKINS_SERVICE_NAME}"
26+
},
27+
"tls": {
28+
"termination": "edge",
29+
"insecureEdgeTerminationPolicy": "Redirect"
30+
}
31+
}
32+
},
33+
{
34+
"kind": "DeploymentConfig",
35+
"apiVersion": "v1",
36+
"metadata": {
37+
"name": "${JENKINS_SERVICE_NAME}",
38+
"creationTimestamp": null
39+
},
40+
"spec": {
41+
"strategy": {
42+
"type": "Recreate"
43+
},
44+
"triggers": [
45+
{
46+
"type": "ImageChange",
47+
"imageChangeParams": {
48+
"automatic": true,
49+
"containerNames": [
50+
"jenkins"
51+
],
52+
"from": {
53+
"kind": "ImageStreamTag",
54+
"name": "${JENKINS_IMAGE_STREAM_TAG}",
55+
"namespace": "${NAMESPACE}"
56+
},
57+
"lastTriggeredImage": ""
58+
}
59+
},
60+
{
61+
"type": "ConfigChange"
62+
}
63+
],
64+
"replicas": 1,
65+
"selector": {
66+
"name": "${JENKINS_SERVICE_NAME}"
67+
},
68+
"template": {
69+
"metadata": {
70+
"creationTimestamp": null,
71+
"labels": {
72+
"name": "${JENKINS_SERVICE_NAME}"
73+
}
74+
},
75+
"spec": {
76+
"serviceAccountName": "${JENKINS_SERVICE_NAME}",
77+
"containers": [
78+
{
79+
"name": "jenkins",
80+
"image": " ",
81+
"readinessProbe": {
82+
"timeoutSeconds": 3,
83+
"initialDelaySeconds": 3,
84+
"httpGet": {
85+
"path": "/login",
86+
"port": 8080
87+
}
88+
},
89+
"livenessProbe": {
90+
"timeoutSeconds": 3,
91+
"initialDelaySeconds": 120,
92+
"httpGet": {
93+
"path": "/login",
94+
"port": 8080
95+
}
96+
},
97+
"env": [
98+
{
99+
"name": "KUBERNETES_MASTER",
100+
"value": "https://kubernetes.default:443"
101+
},
102+
{
103+
"name": "KUBERNETES_TRUST_CERTIFICATES",
104+
"value": "true"
105+
},
106+
{
107+
"name": "JNLP_SERVICE_NAME",
108+
"value": "${JNLP_SERVICE_NAME}"
109+
}
110+
],
111+
"resources": {
112+
"limits": {
113+
"memory": "${MEMORY_LIMIT}"
114+
}
115+
},
116+
"volumeMounts": [
117+
{
118+
"name": "${JENKINS_SERVICE_NAME}-data",
119+
"mountPath": "/var/lib/jenkins"
120+
}
121+
],
122+
"terminationMessagePath": "/dev/termination-log",
123+
"imagePullPolicy": "IfNotPresent",
124+
"capabilities": {},
125+
"securityContext": {
126+
"capabilities": {},
127+
"privileged": false
128+
}
129+
}
130+
],
131+
"volumes": [
132+
{
133+
"name": "${JENKINS_SERVICE_NAME}-data",
134+
"emptyDir": {
135+
"medium": ""
136+
}
137+
}
138+
],
139+
"restartPolicy": "Always",
140+
"dnsPolicy": "ClusterFirst"
141+
}
142+
}
143+
}
144+
},
145+
{
146+
"kind": "ServiceAccount",
147+
"apiVersion": "v1",
148+
"metadata": {
149+
"name": "${JENKINS_SERVICE_NAME}",
150+
"annotations": {
151+
"serviceaccounts.openshift.io/oauth-redirectreference.jenkins": "{\"kind\":\"OAuthRedirectReference\",\"apiVersion\":\"v1\",\"reference\":{\"kind\":\"Route\",\"name\":\"${JENKINS_SERVICE_NAME}\"}}"
152+
}
153+
}
154+
},
155+
{
156+
"kind": "RoleBinding",
157+
"apiVersion": "v1",
158+
"metadata": {
159+
"name": "${JENKINS_SERVICE_NAME}_edit"
160+
},
161+
"groupNames": null,
162+
"subjects": [
163+
{
164+
"kind": "ServiceAccount",
165+
"name": "${JENKINS_SERVICE_NAME}"
166+
}
167+
],
168+
"roleRef": {
169+
"name": "edit"
170+
}
171+
},
172+
{
173+
"kind": "Service",
174+
"apiVersion": "v1",
175+
"metadata": {
176+
"name": "${JNLP_SERVICE_NAME}"
177+
},
178+
"spec": {
179+
"ports": [
180+
{
181+
"name": "agent",
182+
"protocol": "TCP",
183+
"port": 50000,
184+
"targetPort": 50000,
185+
"nodePort": 0
186+
}
187+
],
188+
"selector": {
189+
"name": "${JENKINS_SERVICE_NAME}"
190+
},
191+
"type": "ClusterIP",
192+
"sessionAffinity": "None"
193+
}
194+
},
195+
{
196+
"kind": "Service",
197+
"apiVersion": "v1",
198+
"metadata": {
199+
"name": "${JENKINS_SERVICE_NAME}",
200+
"annotations": {
201+
"service.alpha.openshift.io/dependencies": "[{\"name\": \"${JNLP_SERVICE_NAME}\", \"namespace\": \"\", \"kind\": \"Service\"}]",
202+
"service.openshift.io/infrastructure": "true"
203+
},
204+
"creationTimestamp": null
205+
},
206+
"spec": {
207+
"ports": [
208+
{
209+
"name": "web",
210+
"protocol": "TCP",
211+
"port": 80,
212+
"targetPort": 8080,
213+
"nodePort": 0
214+
}
215+
],
216+
"selector": {
217+
"name": "${JENKINS_SERVICE_NAME}"
218+
},
219+
"type": "ClusterIP",
220+
"sessionAffinity": "None"
221+
}
222+
}
223+
],
224+
"parameters": [
225+
{
226+
"name": "JENKINS_SERVICE_NAME",
227+
"displayName": "Jenkins Service Name",
228+
"description": "The name of the OpenShift Service exposed for the Jenkins container.",
229+
"value": "jenkins"
230+
},
231+
{
232+
"name": "JNLP_SERVICE_NAME",
233+
"displayName": "Jenkins JNLP Service Name",
234+
"description": "The name of the service used for master/slave communication.",
235+
"value": "jenkins-jnlp"
236+
},
237+
{
238+
"name": "MEMORY_LIMIT",
239+
"displayName": "Memory Limit",
240+
"description": "Maximum amount of memory the container can use.",
241+
"value": "512Mi"
242+
},
243+
{
244+
"name": "NAMESPACE",
245+
"displayName": "Jenkins ImageStream Namespace",
246+
"description": "The OpenShift Namespace where the Jenkins ImageStream resides.",
247+
"value": "openshift"
248+
},
249+
{
250+
"name": "JENKINS_IMAGE_STREAM_TAG",
251+
"displayName": "Jenkins ImageStreamTag",
252+
"description": "Name of the ImageStreamTag to be used for the Jenkins image.",
253+
"value": "jenkins:latest"
254+
}
255+
],
256+
"labels": {
257+
"template": "jenkins-ephemeral-template"
258+
}
259+
}

0 commit comments

Comments
 (0)