Skip to content
Closed
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
base_images:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to define the explicit base images here you want from fcos, i.e.:

base_images:
  ...
  machine-os-content:
     namespace: fcos
     name: 4.3
     tag: machine-os-content
  // any other images that differ, like installer

base:
name: "4.3"
namespace: ocp
tag: base
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.12
images:
- dockerfile_path: Dockerfile
from: base
to: machine-config-operator
promotion:
name: "4.3"
namespace: fcos
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is probably fine as a promotion target. I think we'll want a separate job that takes over from the okd promotion flow that combines the three custom images here (machine-os-content, machine-config-operator, and installer) tests them with the latest okd images, and promotes them.

Once we have these publishing to fcos I will update the release controller so that it stops publishing the three images from ocp to okd, and instead we'll side load them via the job I mentioned.

resources:
'*':
limits:
memory: 8Gi
requests:
cpu: 100m
memory: 200Mi
tag_specification:
name: "4.3"
namespace: fcos
tests:
- as: unit
commands: make test-unit
container:
from: src
- as: e2e-aws
commands: TEST_SUITE=openshift/conformance/parallel run-tests
openshift_installer:
cluster_profile: aws
- as: verify
commands: |
make verify
container:
from: src
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
postsubmits:
openshift/machine-config-operator:
- agent: kubernetes
branches:
- ^fcos-master$
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
name: branch-ci-openshift-machine-config-operator-fcos-master-images
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --branch=fcos-master
- --give-pr-author-access-to-namespace=true
- --org=openshift
- --promote
- --repo=machine-config-operator
- --resolver-address=http://ci-operator-configresolver
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=[images]
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-machine-config-operator-fcos-master.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
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
presubmits:
openshift/machine-config-operator:
- agent: kubernetes
always_run: true
branches:
- fcos-master
context: ci/prow/e2e-aws
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-machine-config-operator-fcos-master-e2e-aws
rerun_command: /test e2e-aws
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --branch=fcos-master
- --give-pr-author-access-to-namespace=true
- --org=openshift
- --repo=machine-config-operator
- --resolver-address=http://ci-operator-configresolver
- --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: openshift-machine-config-operator-fcos-master.yaml
name: ci-operator-master-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:
- fcos-master
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-machine-config-operator-fcos-master-images
rerun_command: /test images
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --branch=fcos-master
- --give-pr-author-access-to-namespace=true
- --org=openshift
- --repo=machine-config-operator
- --resolver-address=http://ci-operator-configresolver
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=[images]
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-machine-config-operator-fcos-master.yaml
name: ci-operator-master-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:
- fcos-master
context: ci/prow/unit
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-machine-config-operator-fcos-master-unit
rerun_command: /test unit
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --branch=fcos-master
- --give-pr-author-access-to-namespace=true
- --org=openshift
- --repo=machine-config-operator
- --resolver-address=http://ci-operator-configresolver
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=unit
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-machine-config-operator-fcos-master.yaml
name: ci-operator-master-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( | .* )unit,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- fcos-master
context: ci/prow/verify
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-machine-config-operator-fcos-master-verify
rerun_command: /test verify
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --branch=fcos-master
- --give-pr-author-access-to-namespace=true
- --org=openshift
- --repo=machine-config-operator
- --resolver-address=http://ci-operator-configresolver
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=verify
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-machine-config-operator-fcos-master.yaml
name: ci-operator-master-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( | .* )verify,?($|\s.*)