Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions ci-operator/config/openshift/os/openshift-os-master.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,45 @@
binary_build_commands: ./ci/build-test.sh
base_images:
coreos_coreos-assembler_latest:
name: coreos-assembler
namespace: coreos
tag: latest
coreos_cosa-buildroot_latest:
name: cosa-buildroot
namespace: coreos
tag: latest
build_root:
image_stream_tag:
name: cosa-buildroot
namespace: coreos
tag: latest
images:
- dockerfile_path: ci/Dockerfile
inputs:
coreos_coreos-assembler_latest:
as:
- registry.svc.ci.openshift.org/coreos/coreos-assembler:latest
to: build-test-qemu-img
resources:
'*':
requests:
cpu: 1000m
memory: 1Gi
build-test-qemu:
limits:
devices.kubevirt.io/kvm: "1"
requests:
cpu: 1000m
devices.kubevirt.io/kvm: "1"
memory: 2Gi
tests:
- as: unit
commands: "true"
- as: validate
commands: ./ci/validate.sh
container:
from: src
- as: build-test-qemu
commands: /src/ci/build-test-qemu.sh
container:
from: bin
from: build-test-qemu-img
zz_generated_metadata:
branch: master
org: openshift
Expand Down
106 changes: 101 additions & 5 deletions ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ presubmits:
branches:
- master
cluster: build02
context: ci/prow/unit
context: ci/prow/build-test-qemu
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
devices.kubevirt.io/kvm: "1"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-os-master-unit
rerun_command: /test unit
name: pull-ci-openshift-os-master-build-test-qemu
rerun_command: /test build-test-qemu
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=unit
- --target=build-test-qemu
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -48,4 +48,100 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )unit,?($|\s.*)
trigger: (?m)^/test( | .* )build-test-qemu,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- master
cluster: build02
context: ci/prow/images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-os-master-images
rerun_command: /test images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- master
cluster: build02
context: ci/prow/validate
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-os-master-validate
rerun_command: /test validate
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=validate
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )validate,?($|\s.*)