Skip to content

Commit

Permalink
Merge pull request #4030 from umohnani8/crio-1.14
Browse files Browse the repository at this point in the history
Add ci-operator config and job for cri-o 1.14
  • Loading branch information
openshift-merge-robot authored Jun 26, 2019
2 parents 16eaebe + 03b9b38 commit 872b1e0
Show file tree
Hide file tree
Showing 3 changed files with 236 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ci-operator/config/cri-o/cri-o/OWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT; this file is auto-generated using tools/populate-owners.
# from https://github.com/cri-o/cri-o/blob/66eaece433489575f46261b90252c84c58b7e93e/OWNERS
# from https://github.com/cri-o/cri-o/blob/72cabe6dc84b9ef37f686b1f58b3ae495887a0c2/OWNERS
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md

approvers:
Expand Down
60 changes: 60 additions & 0 deletions ci-operator/config/cri-o/cri-o/cri-o-cri-o-release-1.14.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
base_images:
base:
name: "4.2"
namespace: ocp
tag: base
base-machine:
cluster: https://api.ci.openshift.org
name: fedora
namespace: openshift
tag: "29"
machine-os-content-base:
name: "4.2"
namespace: ocp
tag: machine-os-content
build_root:
image_stream_tag:
cluster: https://api.ci.openshift.org
name: release
namespace: openshift
tag: golang-1.11
canonical_go_repository: github.com/cri-o/cri-o
images:
- context_dir: images/os/
from: base
inputs:
base-machine-with-rpms:
as:
- fedora:29
paths: null
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.2:machine-os-content
paths: null
to: machine-os-content
raw_steps:
- rpm_image_injection_step:
from: base-machine
to: base-machine-with-rpms
resources:
'*':
limits:
memory: 8Gi
requests:
cpu: 100m
memory: 4Gi
rpm_build_commands: hack/build-rpms.sh
tag_specification:
name: "4.2"
namespace: ocp
tests:
- as: e2e-aws
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: aws
upgrade: false
- as: launch-aws
commands: sleep 7200 & wait
openshift_installer:
cluster_profile: aws
upgrade: false
175 changes: 175 additions & 0 deletions ci-operator/jobs/cri-o/cri-o/cri-o-cri-o-release-1.14-presubmits.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
presubmits:
cri-o/cri-o:
- agent: kubernetes
always_run: false
branches:
- release-1.14
context: ci/prow/e2e-aws
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
name: pull-ci-cri-o-cri-o-release-1.14-e2e-aws
rerun_command: /test e2e-aws
run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/e2e-aws-cluster-profile
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=e2e-aws
- --template=/usr/local/e2e-aws
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: cri-o-cri-o-release-1.14.yaml
name: ci-operator-misc-configs
- name: JOB_NAME_SAFE
value: e2e-aws
- name: TEST_COMMAND
value: TEST_SUITE=openshift/conformance/parallel run-tests
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-aws-cluster-profile
name: cluster-profile
- mountPath: /usr/local/e2e-aws
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/sentry-dsn
name: sentry-dsn
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: sentry-dsn
secret:
secretName: sentry-dsn
trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- release-1.14
context: ci/prow/images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
name: pull-ci-cri-o-cri-o-release-1.14-images
rerun_command: /test images
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=[images]
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: cri-o-cri-o-release-1.14.yaml
name: ci-operator-misc-configs
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/sentry-dsn
name: sentry-dsn
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: sentry-dsn
secret:
secretName: sentry-dsn
trigger: (?m)^/test( | .* )images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- release-1.14
context: ci/prow/launch-aws
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
name: pull-ci-cri-o-cri-o-release-1.14-launch-aws
optional: true
rerun_command: /test launch-aws
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/launch-aws-cluster-profile
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=launch-aws
- --template=/usr/local/launch-aws
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: cri-o-cri-o-release-1.14.yaml
name: ci-operator-misc-configs
- name: JOB_NAME_SAFE
value: launch-aws
- name: TEST_COMMAND
value: sleep 7200 & wait
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/launch-aws-cluster-profile
name: cluster-profile
- mountPath: /usr/local/launch-aws
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
- mountPath: /etc/sentry-dsn
name: sentry-dsn
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
- name: sentry-dsn
secret:
secretName: sentry-dsn
trigger: (?m)^/test( | .* )launch-aws,?($|\s.*)

0 comments on commit 872b1e0

Please sign in to comment.