Skip to content
Open
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
Expand Up @@ -451,6 +451,15 @@ tests:
- chain: ipi-install
test:
- ref: openshift-e2e-test
- as: e2e-aws-ovn-rhcos10-devpreview
optional: true
steps:
cluster_profile: aws-4
env:
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
FEATURE_SET: DevPreviewNoUpgrade
OS_IMAGE_STREAM: rhel-10
workflow: openshift-e2e-aws
- as: e2e-gcp-ovn
run_if_changed: (gcp|google)
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2598,6 +2598,87 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-ovn-public-subnets,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build10
context: ci/prow/e2e-aws-ovn-rhcos10-devpreview
decorate: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-4
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-installer-main-e2e-aws-ovn-rhcos10-devpreview
optional: true
rerun_command: /test e2e-aws-ovn-rhcos10-devpreview
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-aws-ovn-rhcos10-devpreview
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-ovn-rhcos10-devpreview,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down
7 changes: 7 additions & 0 deletions ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ fips: true
EOF
fi

if [[ -n "${OS_IMAGE_STREAM}" ]]; then
echo "Adding 'osImageStream: ${OS_IMAGE_STREAM}' to install-config.yaml"
cat >> "${out}" << EOF
osImageStream: ${OS_IMAGE_STREAM}
EOF
fi

if [ -n "${BASELINE_CAPABILITY_SET}" ]; then
echo "Adding 'capabilities: ...' to install-config.yaml"
cat >> "${out}" << EOF
Expand Down
5 changes: 5 additions & 0 deletions ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ ref:
Enable FIPS:
* "false" (default) - do not enable FIPS
* "true" - enable FIPS
- name: OS_IMAGE_STREAM
default: ""
documentation: |-
OSImageStream is the global OS Image Stream to be used for all machines in the cluster.
Valid Values: "rhel-9","rhel-10"
- name: BASELINE_CAPABILITY_SET
default: ""
documentation: |-
Expand Down