Skip to content

Commit 694b59b

Browse files
committed
chore(ci): remove verify step from gitlab
it's covered by the verify step in prow
1 parent 57c139d commit 694b59b

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

.gitlab-ci.jsonnet

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ local jobs = {
5757
'builder': images.ci.olm.name,
5858
'olm': images.prerelease.olm.name,
5959
'e2e': images.e2e.name,
60-
}) +
61-
docker.run(images.ci.olm.name, "make verify-codegen verify-catalog")
60+
})
6261
},
6362

6463
'container-release': baseJob.dockerBuild {

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ container-build:
6262
- docker push quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}
6363
- docker push quay.io/coreos/olm-e2e:${CI_COMMIT_REF_SLUG}-${SHA8}
6464
- docker push quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG}-pre
65-
- docker run quay.io/coreos/olm-ci:${CI_COMMIT_REF_SLUG} make verify-codegen verify-catalog
6665
stage: docker_build
6766
tags:
6867
- kubernetes

codegen.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
33
COPY Makefile Makefile
44
COPY pkg pkg
55
COPY vendor vendor
6-
COPY scripts/generate_groups.sh vendor/k8s.io/code-generator/generate_groups.sh
6+
COPY scripts/generate_groups.sh scripts/generate_groups.sh
77
COPY boilerplate.go.txt boilerplate.go.txt
8-
COPY boilerplate.go.txt vendor/k8s.io/code-generator/hack/boilerplate.go.txt
98
RUN make codegen
109

vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ k8s.io/apimachinery/pkg/labels
287287
k8s.io/apimachinery/pkg/api/errors
288288
k8s.io/apimachinery/pkg/util/strategicpatch
289289
k8s.io/apimachinery/pkg/util/intstr
290+
k8s.io/apimachinery/pkg/util/runtime
290291
k8s.io/apimachinery/pkg/api/equality
291292
k8s.io/apimachinery/pkg/runtime/serializer/json
292293
k8s.io/apimachinery/pkg/api/meta
293294
k8s.io/apimachinery/pkg/apis/meta/v1/unstructured
294295
k8s.io/apimachinery/pkg/util/wait
295-
k8s.io/apimachinery/pkg/util/runtime
296296
k8s.io/apimachinery/pkg/api/validation
297297
k8s.io/apimachinery/pkg/conversion
298298
k8s.io/apimachinery/pkg/util/validation/field
@@ -427,12 +427,12 @@ k8s.io/client-go/discovery/fake
427427
k8s.io/client-go/testing
428428
k8s.io/client-go/tools/cache
429429
k8s.io/client-go/listers/rbac/v1
430-
k8s.io/client-go/util/workqueue
431430
k8s.io/client-go/informers
431+
k8s.io/client-go/util/workqueue
432+
k8s.io/client-go/listers/core/v1
432433
k8s.io/client-go/kubernetes/typed/core/v1
433434
k8s.io/client-go/kubernetes
434435
k8s.io/client-go/listers/apps/v1
435-
k8s.io/client-go/listers/core/v1
436436
k8s.io/client-go/util/cert
437437
k8s.io/client-go/tools/reference
438438
k8s.io/client-go/pkg/version

0 commit comments

Comments
 (0)