Skip to content

Commit 2c3d717

Browse files
committed
add test case for private image source inputs
1 parent 3777cfb commit 2c3d717

File tree

3 files changed

+62
-10
lines changed

3 files changed

+62
-10
lines changed

test/extended/builds/image_source.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@ var _ = g.Describe("[builds][Slow] build can have Docker image source", func() {
3636
err := oc.Run("create").Args("-f", buildFixture).Execute()
3737
o.Expect(err).NotTo(o.HaveOccurred())
3838

39+
g.By("starting building the private input image")
40+
br, err := exutil.StartBuildAndWait(oc, "inputimage")
41+
br.AssertSuccess()
42+
3943
g.By("starting the source strategy build")
40-
br, err := exutil.StartBuildAndWait(oc, "imagesourcebuild")
44+
br, err = exutil.StartBuildAndWait(oc, "imagesourcebuild")
4145
br.AssertSuccess()
4246

4347
g.By("expecting the pod to deploy successfully")
@@ -59,8 +63,12 @@ var _ = g.Describe("[builds][Slow] build can have Docker image source", func() {
5963
err := oc.Run("create").Args("-f", buildFixture).Execute()
6064
o.Expect(err).NotTo(o.HaveOccurred())
6165

66+
g.By("starting building the private input image")
67+
br, err := exutil.StartBuildAndWait(oc, "inputimage")
68+
br.AssertSuccess()
69+
6270
g.By("starting the docker strategy build")
63-
br, err := exutil.StartBuildAndWait(oc, "imagedockerbuild")
71+
br, err = exutil.StartBuildAndWait(oc, "imagedockerbuild")
6472
br.AssertSuccess()
6573

6674
g.By("expect the pod to deploy successfully")

test/extended/testdata/bindata.go

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

test/extended/testdata/test-imagesource-build.yaml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@ apiVersion: v1
22
kind: List
33
metadata: {}
44
items:
5+
- apiVersion: v1
6+
kind: BuildConfig
7+
metadata:
8+
labels:
9+
build: inputimage
10+
name: inputimage
11+
spec:
12+
output:
13+
to:
14+
kind: ImageStreamTag
15+
name: inputimage:latest
16+
source:
17+
dockerfile: "FROM foo"
18+
strategy:
19+
dockerStrategy:
20+
from:
21+
kind: ImageStreamTag
22+
name: ruby:2.3
23+
namespace: openshift
524
- apiVersion: v1
625
kind: BuildConfig
726
metadata:
@@ -19,8 +38,7 @@ items:
1938
images:
2039
- from:
2140
kind: ImageStreamTag
22-
name: ruby:2.3
23-
namespace: openshift
41+
name: inputimage:latest
2442
paths:
2543
- destinationDir: injected/dir
2644
sourcePath: /opt/rh/rh-ruby23/root/usr/bin/ruby
@@ -48,13 +66,17 @@ items:
4866
images:
4967
- from:
5068
kind: ImageStreamTag
51-
name: ruby:2.3
52-
namespace: openshift
69+
name: inputimage:latest
5370
paths:
5471
- destinationDir: injected/dir
5572
sourcePath: /opt/rh/rh-ruby23/root/usr/bin/ruby
5673
strategy:
5774
dockerStrategy: {}
75+
- apiVersion: v1
76+
kind: ImageStream
77+
metadata:
78+
name: inputimage
79+
spec: {}
5880
- apiVersion: v1
5981
kind: ImageStream
6082
metadata:

0 commit comments

Comments
 (0)