Skip to content

Commit 27cb911

Browse files
ingvagabundingvagabund
committed
[sig-builds]
1 parent c981735 commit 27cb911

File tree

5 files changed

+82
-92
lines changed

5 files changed

+82
-92
lines changed

‎test/extended/builds/volumes.go

+38-22
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ package builds
33
import (
44
"fmt"
55
"path/filepath"
6-
"time"
76

87
g "github.com/onsi/ginkgo/v2"
98
o "github.com/onsi/gomega"
109

1110
apierrors "k8s.io/apimachinery/pkg/api/errors"
1211
admissionapi "k8s.io/pod-security-admission/api"
1312

14-
deploymentutil "github.com/openshift/origin/test/extended/deployments"
1513
exutil "github.com/openshift/origin/test/extended/util"
1614
)
1715

@@ -53,7 +51,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] build volumes", func()
5351
}
5452
})
5553

56-
g.It("should mount given secrets and configmaps into the build pod for source strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
54+
g.It("should mount given secrets and configmaps into the build pod for source strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io]", func() {
5755
g.By("creating an imagestream")
5856
err := oc.Run("create").Args("-f", s2iImageStream).Execute()
5957
o.Expect(err).NotTo(o.HaveOccurred())
@@ -76,22 +74,25 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] build volumes", func()
7674
err = oc.Run("create").Args("-f", s2iDeploymentConfig).Execute()
7775
o.Expect(err).NotTo(o.HaveOccurred())
7876

77+
projectName, err := oc.Run("project").Args("-q").Output()
78+
o.Expect(err).NotTo(o.HaveOccurred())
79+
7980
g.By("waiting for the deployment to complete")
80-
_, err = deploymentutil.WaitForDeployerToComplete(oc, "mys2itest-1", 5*time.Minute)
81+
err = exutil.WaitForDeploymentReady(oc, "mys2itest", projectName, -1)
8182
o.Expect(err).NotTo(o.HaveOccurred())
8283

8384
g.By("ensuring that the secret does not exist in the build image")
84-
out, err := oc.Run("rsh").Args("dc/mys2itest", "cat", "/var/run/secrets/some-secret/key").Output()
85+
out, err := oc.Run("rsh").Args("deployment/mys2itest", "cat", "/var/run/secrets/some-secret/key").Output()
8586
o.Expect(err).To(o.HaveOccurred())
8687
o.Expect(out).To(o.ContainSubstring("cat: /var/run/secrets/some-secret/key: No such file or directory"))
8788

8889
g.By("ensuring that the configmap does not exist in the build image")
89-
out, err = oc.Run("rsh").Args("dc/mys2itest", "cat", "/var/run/configmaps/some-configmap/key").Output()
90+
out, err = oc.Run("rsh").Args("deployment/mys2itest", "cat", "/var/run/configmaps/some-configmap/key").Output()
9091
o.Expect(err).To(o.HaveOccurred())
9192
o.Expect(out).To(o.ContainSubstring("cat: /var/run/configmaps/some-configmap/key: No such file or directory"))
9293
})
9394

94-
g.It("should mount given secrets and configmaps into the build pod for docker strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
95+
g.It("should mount given secrets and configmaps into the build pod for docker strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io]", func() {
9596
g.By("creating an imagestream")
9697
err := oc.Run("create").Args("-f", dockerImageStream).Execute()
9798
o.Expect(err).NotTo(o.HaveOccurred())
@@ -114,17 +115,20 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] build volumes", func()
114115
err = oc.Run("create").Args("-f", dockerDeploymentConfig).Execute()
115116
o.Expect(err).NotTo(o.HaveOccurred())
116117

118+
projectName, err := oc.Run("project").Args("-q").Output()
119+
o.Expect(err).NotTo(o.HaveOccurred())
120+
117121
g.By("waiting for the deployment to complete")
118-
_, err = deploymentutil.WaitForDeployerToComplete(oc, "mydockertest-1", 5*time.Minute)
122+
err = exutil.WaitForDeploymentReady(oc, "mydockertest", projectName, -1)
119123
o.Expect(err).NotTo(o.HaveOccurred())
120124

121125
g.By("ensuring that the secret does not exist in the build image")
122-
out, err := oc.Run("rsh").Args("dc/mydockertest", "cat", "/var/run/secrets/some-secret/key").Output()
126+
out, err := oc.Run("rsh").Args("deployment/mydockertest", "cat", "/var/run/secrets/some-secret/key").Output()
123127
o.Expect(err).To(o.HaveOccurred())
124128
o.Expect(out).To(o.ContainSubstring("cat: /var/run/secrets/some-secret/key: No such file or directory"))
125129

126130
g.By("ensuring that the configmap does not exist in the build image")
127-
out, err = oc.Run("rsh").Args("dc/mydockertest", "cat", "/var/run/configmaps/some-configmap/key").Output()
131+
out, err = oc.Run("rsh").Args("deployment/mydockertest", "cat", "/var/run/configmaps/some-configmap/key").Output()
128132
o.Expect(err).To(o.HaveOccurred())
129133
o.Expect(out).To(o.ContainSubstring("cat: /var/run/configmaps/some-configmap/key: No such file or directory"))
130134
})
@@ -196,7 +200,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] csi build volumes with
196200
}
197201
})
198202

199-
g.It("should mount given csi shared resource secret into the build pod for source strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
203+
g.It("should mount given csi shared resource secret into the build pod for source strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io]", func() {
200204
g.By("creating an imagestream")
201205
err := oc.Run("create").Args("-f", s2iImageStream).Execute()
202206
o.Expect(err).NotTo(o.HaveOccurred())
@@ -218,17 +222,20 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] csi build volumes with
218222
err = oc.Run("create").Args("-f", s2iDeploymentConfig).Execute()
219223
o.Expect(err).NotTo(o.HaveOccurred())
220224

225+
projectName, err := oc.Run("project").Args("-q").Output()
226+
o.Expect(err).NotTo(o.HaveOccurred())
227+
221228
g.By("waiting for the deployment to complete")
222-
_, err = deploymentutil.WaitForDeployerToComplete(oc, "mys2itest-1", 5*time.Minute)
229+
err = exutil.WaitForDeploymentReady(oc, "mys2itest", projectName, -1)
223230
o.Expect(err).NotTo(o.HaveOccurred())
224231

225232
g.By("ensuring that the shared secret does not exist in the build image")
226-
out, err := oc.Run("rsh").Args("dc/mys2itest", "cat", "/var/run/secrets/some-secret/key").Output()
233+
out, err := oc.Run("rsh").Args("deployment/mys2itest", "cat", "/var/run/secrets/some-secret/key").Output()
227234
o.Expect(err).To(o.HaveOccurred())
228235
o.Expect(out).To(o.ContainSubstring("cat: /var/run/secrets/some-secret/key: No such file or directory"))
229236
})
230237

231-
g.It("should mount given csi shared resource secret without resource refresh into the build pod for source strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
238+
g.It("should mount given csi shared resource secret without resource refresh into the build pod for source strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io]", func() {
232239
g.By("creating an imagestream")
233240
err := oc.Run("create").Args("-f", s2iImageStream).Execute()
234241
o.Expect(err).NotTo(o.HaveOccurred())
@@ -250,17 +257,20 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] csi build volumes with
250257
err = oc.Run("create").Args("-f", s2iDeploymentConfig).Execute()
251258
o.Expect(err).NotTo(o.HaveOccurred())
252259

260+
projectName, err := oc.Run("project").Args("-q").Output()
261+
o.Expect(err).NotTo(o.HaveOccurred())
262+
253263
g.By("waiting for the deployment to complete")
254-
_, err = deploymentutil.WaitForDeployerToComplete(oc, "mys2itest-1", 5*time.Minute)
264+
err = exutil.WaitForDeploymentReady(oc, "mys2itest", projectName, -1)
255265
o.Expect(err).NotTo(o.HaveOccurred())
256266

257267
g.By("ensuring that the shared secret does not exist in the build image")
258-
out, err := oc.Run("rsh").Args("dc/mys2itest", "cat", "/var/run/secrets/some-secret/key").Output()
268+
out, err := oc.Run("rsh").Args("deployment/mys2itest", "cat", "/var/run/secrets/some-secret/key").Output()
259269
o.Expect(err).To(o.HaveOccurred())
260270
o.Expect(out).To(o.ContainSubstring("cat: /var/run/secrets/some-secret/key: No such file or directory"))
261271
})
262272

263-
g.It("should mount given csi shared resource secret into the build pod for docker strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
273+
g.It("should mount given csi shared resource secret into the build pod for docker strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io]", func() {
264274
g.By("creating an imagestream")
265275
err := oc.Run("create").Args("-f", dockerImageStream).Execute()
266276
o.Expect(err).NotTo(o.HaveOccurred())
@@ -282,17 +292,20 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] csi build volumes with
282292
err = oc.Run("create").Args("-f", dockerDeploymentConfig).Execute()
283293
o.Expect(err).NotTo(o.HaveOccurred())
284294

295+
projectName, err := oc.Run("project").Args("-q").Output()
296+
o.Expect(err).NotTo(o.HaveOccurred())
297+
285298
g.By("waiting for the deployment to complete")
286-
_, err = deploymentutil.WaitForDeployerToComplete(oc, "mydockertest-1", 5*time.Minute)
299+
err = exutil.WaitForDeploymentReady(oc, "mydockertest", projectName, -1)
287300
o.Expect(err).NotTo(o.HaveOccurred())
288301

289302
g.By("ensuring that the shared secret does not exist in the build image")
290-
out, err := oc.Run("rsh").Args("dc/mydockertest", "cat", "/var/run/secrets/some-secret/key").Output()
303+
out, err := oc.Run("rsh").Args("deployment/mydockertest", "cat", "/var/run/secrets/some-secret/key").Output()
291304
o.Expect(err).To(o.HaveOccurred())
292305
o.Expect(out).To(o.ContainSubstring("cat: /var/run/secrets/some-secret/key: No such file or directory"))
293306
})
294307

295-
g.It("should mount given csi shared resource secret without resource refresh into the build pod for docker strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io][apigroup:apps.openshift.io]", func() {
308+
g.It("should mount given csi shared resource secret without resource refresh into the build pod for docker strategy builds [apigroup:image.openshift.io][apigroup:build.openshift.io]", func() {
296309
g.By("creating an imagestream")
297310
err := oc.Run("create").Args("-f", dockerImageStream).Execute()
298311
o.Expect(err).NotTo(o.HaveOccurred())
@@ -314,12 +327,15 @@ var _ = g.Describe("[sig-builds][Feature:Builds][volumes] csi build volumes with
314327
err = oc.Run("create").Args("-f", dockerDeploymentConfig).Execute()
315328
o.Expect(err).NotTo(o.HaveOccurred())
316329

330+
projectName, err := oc.Run("project").Args("-q").Output()
331+
o.Expect(err).NotTo(o.HaveOccurred())
332+
317333
g.By("waiting for the deployment to complete")
318-
_, err = deploymentutil.WaitForDeployerToComplete(oc, "mydockertest-1", 5*time.Minute)
334+
err = exutil.WaitForDeploymentReady(oc, "mydockertest", projectName, -1)
319335
o.Expect(err).NotTo(o.HaveOccurred())
320336

321337
g.By("ensuring that the shared secret does not exist in the build image")
322-
out, err := oc.Run("rsh").Args("dc/mydockertest", "cat", "/var/run/secrets/some-secret/key").Output()
338+
out, err := oc.Run("rsh").Args("deployment/mydockertest", "cat", "/var/run/secrets/some-secret/key").Output()
323339
o.Expect(err).To(o.HaveOccurred())
324340
o.Expect(out).To(o.ContainSubstring("cat: /var/run/secrets/some-secret/key: No such file or directory"))
325341
})

‎test/extended/testdata/bindata.go

+20-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/extended/testdata/builds/volumes/docker-deploymentconfig.yaml

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
1-
apiVersion: apps.openshift.io/v1
2-
kind: DeploymentConfig
1+
apiVersion: apps/v1
2+
kind: Deployment
33
metadata:
44
name: mydockertest
5+
annotations:
6+
image.openshift.io/triggers: "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mydockerstream:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]"
57
spec:
68
replicas: 1
79
selector:
8-
app: mydockertest
9-
deploymentconfig: mydockertest
10+
matchLabels:
11+
app: mydockertest
12+
deploymentconfig: mydockertest
1013
strategy:
11-
type: Rolling
14+
type: RollingUpdate
1215
template:
1316
metadata:
1417
labels:
1518
app: mydockertest
1619
deploymentconfig: mydockertest
1720
spec:
1821
containers:
19-
- image:
22+
- image: " "
2023
imagePullPolicy: Always
2124
name: mydockertest
2225
terminationMessagePath: /dev/termination-log
2326
dnsPolicy: ClusterFirst
2427
restartPolicy: Always
2528
securityContext: {}
26-
triggers:
27-
- imageChangeParams:
28-
automatic: true
29-
containerNames:
30-
- mydockertest
31-
from:
32-
kind: ImageStreamTag
33-
name: mydockerstream:latest
34-
type: ImageChange
35-
- type: ConfigChange

‎test/extended/testdata/builds/volumes/s2i-deploymentconfig.yaml

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
1-
apiVersion: apps.openshift.io/v1
2-
kind: DeploymentConfig
1+
apiVersion: apps/v1
2+
kind: Deployment
33
metadata:
44
name: mys2itest
5+
annotations:
6+
image.openshift.io/triggers: "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"mys2istream:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]"
57
spec:
68
replicas: 1
79
selector:
8-
app: mys2itest
9-
deploymentconfig: mys2itest
10+
matchLabels:
11+
app: mys2itest
12+
deploymentconfig: mys2itest
1013
strategy:
11-
type: Rolling
14+
type: RollingUpdate
1215
template:
1316
metadata:
1417
labels:
1518
app: mys2itest
1619
deploymentconfig: mys2itest
1720
spec:
1821
containers:
19-
- image:
22+
- image: " "
2023
imagePullPolicy: Always
2124
name: mys2itest
2225
terminationMessagePath: /dev/termination-log
2326
dnsPolicy: ClusterFirst
2427
restartPolicy: Always
2528
securityContext: {}
26-
triggers:
27-
- imageChangeParams:
28-
automatic: true
29-
containerNames:
30-
- mys2itest
31-
from:
32-
kind: ImageStreamTag
33-
name: mys2istream:latest
34-
type: ImageChange
35-
- type: ConfigChange

0 commit comments

Comments
 (0)