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 @@ -3092,6 +3092,24 @@ tests:
test:
- chain: openshift-e2e-test-qe-destructive
workflow: cucushift-installer-rehearse-aws-ipi-custom-dns
- as: metal-ipi-ovn-ipv4-vmedia-rhcos10-worker-tp-arm-f28
capabilities:
- intranet
cron: 41 19 6 * *
steps:
cluster_profile: equinix-ocp-metal-qe
env:
AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
DISCONNECTED: "false"
FEATURE_SET: TechPreviewNoUpgrade
RESERVE_BOOTSTRAP: "false"
WORKER_COREOS_STREAM: rhel-9
architecture: arm64
masters: "3"
workers: "2"
test:
- chain: openshift-e2e-test-qe
workflow: baremetal-lab-ipi-virtual-media
zz_generated_metadata:
branch: release-5.0
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3075,6 +3075,24 @@ tests:
test:
- chain: openshift-e2e-test-qe-destructive
workflow: cucushift-installer-rehearse-aws-ipi-custom-dns
- as: metal-ipi-ovn-ipv4-rhcos10-worker-tp-amd-f28
capabilities:
- intranet
cron: 44 0 14 * *
steps:
cluster_profile: equinix-ocp-metal-qe
env:
AUX_HOST: openshift-qe-metal-ci.arm.eng.rdu2.redhat.com
DISCONNECTED: "false"
FEATURE_SET: TechPreviewNoUpgrade
RESERVE_BOOTSTRAP: "false"
WORKER_COREOS_STREAM: rhel-9
architecture: amd64
masters: "3"
workers: "2"
test:
- chain: openshift-e2e-test-qe
workflow: baremetal-lab-ipi
zz_generated_metadata:
branch: release-5.1
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86034,6 +86034,97 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build09
cron: 41 19 6 * *
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: release-5.0
org: openshift
repo: openshift-tests-private
labels:
capability/intranet: intranet
ci-operator.openshift.io/cloud: equinix-ocp-metal
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal-qe
ci-operator.openshift.io/variant: multi-nightly
ci.openshift.io/generator: prowgen
job-release: "5.0"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-openshift-tests-private-release-5.0-multi-nightly-metal-ipi-ovn-ipv4-vmedia-rhcos10-worker-tp-arm-f28
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
- --oauth-token-path=/usr/local/github-credentials/oauth
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=metal-ipi-ovn-ipv4-vmedia-rhcos10-worker-tp-arm-f28
- --variant=multi-nightly
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: /usr/local/github-credentials
name: github-credentials-openshift-ci-robot-private-git-cloner
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: github-credentials-openshift-ci-robot-private-git-cloner
secret:
secretName: github-credentials-openshift-ci-robot-private-git-cloner
- 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
- agent: kubernetes
cluster: build09
cron: 59 11 1,8,15,22 * *
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54448,6 +54448,97 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build09
cron: 44 0 14 * *
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: release-5.1
org: openshift
repo: openshift-tests-private
labels:
capability/intranet: intranet
ci-operator.openshift.io/cloud: equinix-ocp-metal
ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal-qe
ci-operator.openshift.io/variant: multi-nightly
ci.openshift.io/generator: prowgen
job-release: "5.1"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-openshift-tests-private-release-5.1-multi-nightly-metal-ipi-ovn-ipv4-rhcos10-worker-tp-amd-f28
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
- --oauth-token-path=/usr/local/github-credentials/oauth
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=metal-ipi-ovn-ipv4-rhcos10-worker-tp-amd-f28
- --variant=multi-nightly
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: /usr/local/github-credentials
name: github-credentials-openshift-ci-robot-private-git-cloner
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: github-credentials-openshift-ci-robot-private-git-cloner
secret:
secretName: github-credentials-openshift-ci-robot-private-git-cloner
- 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
- agent: kubernetes
cluster: build09
cron: 19 17 3,10,17,24 * *
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,49 @@ if [[ "$ENABLE_CAPI" == "true" ]]; then
sed -i 's/watchAllNamespaces: false/watchAllNamespaces: true/' "${INSTALL_DIR}/openshift/99_baremetal-provisioning-config.yaml"
fi

# Patch worker BMH manifests to use the specified CoreOS stream.
# This controls which IPA (kernel/initrd/rootfs) version is used
# during PXE boot for worker nodes.
if [[ -n "${WORKER_COREOS_STREAM:-}" ]]; then
if [[ ! "${WORKER_COREOS_STREAM}" =~ ^[a-zA-Z0-9._-]+$ ]]; then
echo "[ERROR] Invalid WORKER_COREOS_STREAM: ${WORKER_COREOS_STREAM}"
exit 1
fi
esc_stream="$(printf '%s' "${WORKER_COREOS_STREAM}" | sed 's/[\/&]/\\&/g')"
for bmh_file in "${INSTALL_DIR}"/openshift/99_openshift-cluster-api_hosts-*.yaml; do
if ! grep -q 'installer.openshift.io/role: control-plane' "${bmh_file}"; then
sed -i "s/coreos.openshift.io\/stream: .*/coreos.openshift.io\/stream: ${esc_stream}/" "${bmh_file}"
grep "${esc_stream}" "${bmh_file}"
fi
done
# Patch worker MachineSet hostSelector to match the new stream
for ms_file in "${INSTALL_DIR}"/openshift/99_openshift-cluster-api_worker-machineset-*.yaml; do
sed -i 's/- rhel-9/- rhel-10/' "${ms_file}"
ls "${ms_file}"
echo -e "\n${ms_file}\n---------------------\n$(cat "${ms_file}")\n----------------------\n"
done
# Set the worker MachineConfigPool to use the specified stream for
# the on-disk OS. Requires the OSStreams feature gate (TechPreviewNoUpgrade).
cat > "${INSTALL_DIR}/openshift/99_worker-osimagestream.yaml" <<EOF
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigPool
metadata:
labels:
machineconfiguration.openshift.io/mco-built-in: ""
pools.operator.machineconfiguration.openshift.io/worker: ""
name: worker
spec:
machineConfigSelector:
matchLabels:
machineconfiguration.openshift.io/role: worker
nodeSelector:
matchLabels:
node-role.kubernetes.io/worker: ""
osImageStream:
name: ${esc_stream}
EOF
Comment thread
coderabbitai[bot] marked this conversation as resolved.
fi

### Inject customized manifests
echo -e "\n[INFO] The following manifests will be included at installation time:"
find "${SHARED_DIR}" \( -name "manifest_*.yml" -o -name "manifest_*.yaml" \)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ ref:
default: "0"
- name: ADDITIONAL_WORKER_ARCHITECTURE
default: ""
- name: WORKER_COREOS_STREAM
default: ""
- name: ADDITIONAL_WORKERS_DAY2
default: "true"
- name: AUX_HOST
Expand Down