File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -5,6 +5,11 @@ RUN yum install -y make git
5
5
ENV GOPATH /go
6
6
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
7
7
8
+ # install helm for templating - used in verification tests
9
+ RUN curl -LO https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz && \
10
+ tar -zxvf helm-v2.13.1-linux-amd64.tar.gz && \
11
+ mv linux-amd64/helm /usr/local/bin/helm
12
+
8
13
WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
9
14
10
15
# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
@@ -18,9 +23,11 @@ COPY pkg pkg
18
23
COPY vendor vendor
19
24
COPY cmd cmd
20
25
COPY test test
26
+ COPY scripts scripts
27
+ COPY deploy deploy
28
+ RUN make verify-manifests
21
29
RUN make build
22
30
23
-
24
31
FROM openshift/origin-base
25
32
26
33
ADD manifests/ /manifests
Original file line number Diff line number Diff line change @@ -154,12 +154,14 @@ container-mockgen:
154
154
docker cp temp-mockgen:/operator-lifecycle-manager/pkg/package-server/client/fakes/. ./pkg/package-server/client/fakes
155
155
docker rm temp-mockgen
156
156
157
+ verify : verify-codegen verify-manifests
158
+
157
159
# Must be run in gopath: https://github.com/kubernetes/kubernetes/issues/67566
158
160
verify-codegen : codegen
159
161
git diff --exit-code
160
162
161
163
# this is here for backwards compatibility with the ci job that calls verify-catalog
162
- verify-catalog : verify-manifests
164
+ verify-catalog :
163
165
164
166
verify-manifests : ver=$(shell cat OLM_VERSION)
165
167
verify-manifests :
You can’t perform that action at this time.
0 commit comments