Skip to content

Commit

Permalink
Merge pull request #12964 from rhmdnd/CMP-3121
Browse files Browse the repository at this point in the history
CMP-3121: Build ocp4 content for arm64
  • Loading branch information
rhmdnd authored Feb 5, 2025
2 parents fcf8a7b + c216ee5 commit f291b6e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/k8s-content-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
push: true
platforms: 'linux/amd64,linux/ppc64le,linux/s390x'
platforms: 'linux/amd64,linux/ppc64le,linux/s390x,linux/arm64'
- name: Get container info
id: container_info
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/ocp4_content
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN microdnf -y install cmake make git /usr/bin/python3 python3-pyyaml python3-j
COPY . .

# Enable only certain profiles on ppc64le and s390x
RUN if [ "$(uname -m)" == "x86_64" ]; then \
RUN if [ "$(uname -m)" == "x86_64" ] || [ "$(uname -m)" == "arm64" ]; then \
echo "Building OpenShift and RHCOS content for x86_64"; \
else echo "Building OpenShift content for $(uname -m)" && \
# Disable all profiles first
Expand Down Expand Up @@ -44,7 +44,7 @@ RUN if [ "$(uname -m)" == "x86_64" ]; then \
# Build the OpenShift, EKS, and RHCOS content for x86 architectures. Only build
# OpenShift content for ppc64le and s390x architectures since we're not
# including any RHCOS profiles on those architectures right now anyway.
RUN if [ "$(uname -m)" = "x86_64" ]; then \
RUN if [ "$(uname -m)" = "x86_64" ] || [ "$(uname -m)" == "arm64" ]; then \
./build_product ocp4 rhcos4 eks --datastream-only; \
elif [ "$(uname -m)" = "ppc64le" ]; then \
./build_product ocp4 rhcos4 --datastream-only; \
Expand Down

0 comments on commit f291b6e

Please sign in to comment.