Skip to content

Commit 924198c

Browse files
committed
Leverage new makefile target in whereabouts
I added a new maketarget that skips some go building to allow us to run our upstream unit tests against downstream prs Also added a new testing dockerfile containing the whole whereabouts binary which should resolve the current package not found error, this uses that Dockerfile Signed-off-by: Benjamin Pickard <[email protected]>
1 parent 7d51be3 commit 924198c

File tree

3 files changed

+64
-1
lines changed

3 files changed

+64
-1
lines changed

ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-master.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ images:
2626
as:
2727
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
2828
to: multus-whereabouts-ipam-cni
29+
- dockerfile_path: Dockerfile.test.openshift
30+
inputs:
31+
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
32+
as:
33+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
34+
to: whereabouts-testing
2935
promotion:
3036
to:
3137
- name: "4.19"
@@ -46,6 +52,10 @@ resources:
4652
cpu: 100m
4753
memory: 200Mi
4854
tests:
55+
- as: whereabouts-unit
56+
commands: make test-skip-static
57+
container:
58+
from: whereabouts-testing
4959
- as: e2e-aws
5060
steps:
5161
cluster_profile: aws

ci-operator/config/openshift/whereabouts-cni/openshift-whereabouts-cni-master__okd-scos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ images:
2020
- build_args:
2121
- name: TAGS
2222
value: scos
23-
dockerfile_path: Dockerfile.openshift
23+
dockerfile_path: Dockerfile.test.openshift
2424
from: origin_scos-4.19_base-stream9
2525
inputs:
2626
ocp_builder_rhel-8-golang-1.23-openshift-4.19:

ci-operator/jobs/openshift/whereabouts-cni/openshift-whereabouts-cni-master-presubmits.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,3 +324,56 @@ presubmits:
324324
secret:
325325
secretName: result-aggregator
326326
trigger: (?m)^/test( | .* )security,?($|\s.*)
327+
- agent: kubernetes
328+
always_run: true
329+
branches:
330+
- ^master$
331+
- ^master-
332+
cluster: build09
333+
context: ci/prow/whereabouts-unit
334+
decorate: true
335+
labels:
336+
ci.openshift.io/generator: prowgen
337+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
338+
name: pull-ci-openshift-whereabouts-cni-master-whereabouts-unit
339+
rerun_command: /test whereabouts-unit
340+
spec:
341+
containers:
342+
- args:
343+
- --gcs-upload-secret=/secrets/gcs/service-account.json
344+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
345+
- --report-credentials-file=/etc/report/credentials
346+
- --target=whereabouts-unit
347+
command:
348+
- ci-operator
349+
image: ci-operator:latest
350+
imagePullPolicy: Always
351+
name: ""
352+
resources:
353+
requests:
354+
cpu: 10m
355+
volumeMounts:
356+
- mountPath: /secrets/gcs
357+
name: gcs-credentials
358+
readOnly: true
359+
- mountPath: /secrets/manifest-tool
360+
name: manifest-tool-local-pusher
361+
readOnly: true
362+
- mountPath: /etc/pull-secret
363+
name: pull-secret
364+
readOnly: true
365+
- mountPath: /etc/report
366+
name: result-aggregator
367+
readOnly: true
368+
serviceAccountName: ci-operator
369+
volumes:
370+
- name: manifest-tool-local-pusher
371+
secret:
372+
secretName: manifest-tool-local-pusher
373+
- name: pull-secret
374+
secret:
375+
secretName: registry-pull-credentials
376+
- name: result-aggregator
377+
secret:
378+
secretName: result-aggregator
379+
trigger: (?m)^/test( | .* )whereabouts-unit,?($|\s.*)

0 commit comments

Comments
 (0)