Skip to content

Commit 50e828c

Browse files
committed
konflux: arm64 build
Signed-off-by: Haoyu Sun <hasun@redhat.com>
1 parent c203677 commit 50e828c

5 files changed

Lines changed: 4042 additions & 8 deletions

File tree

.tekton/lightspeed-stack-pull-request.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ spec:
2727
value: quay.io/redhat-user-workloads/lightspeed-core-tenant/lightspeed-stack:on-pr-{{revision}}
2828
- name: image-expires-after
2929
value: 5d
30-
# todo: add arm64. refer to https://konflux.pages.redhat.com/docs/users/getting-started/multi-platform-builds.html#arm64-2
3130
- name: build-platforms
3231
value:
3332
- linux/x86_64
34-
# todo: change on-push pipeline,too
33+
- linux-c6gd2xlarge/arm64
3534
- name: build-source-image
3635
value: 'true'
3736
- name: prefetch-input
38-
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.txt", "requirements.hermetic.txt"]}]'
37+
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.x86_64.txt", "requirements.aarch64.txt", "requirements.hermetic.txt"]}]'
3938
- name: hermetic
4039
value: 'true'
4140
- name: dockerfile
@@ -633,6 +632,9 @@ spec:
633632
optional: true
634633
- name: netrc
635634
optional: true
635+
timeouts:
636+
pipeline: 4h
637+
tasks: 4h
636638
taskRunTemplate:
637639
serviceAccountName: build-pipeline-lightspeed-stack
638640
workspaces:

.tekton/lightspeed-stack-push.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ spec:
2424
value: '{{revision}}'
2525
- name: output-image
2626
value: quay.io/redhat-user-workloads/lightspeed-core-tenant/lightspeed-stack:{{revision}}
27-
# todo: add arm64. refer to https://konflux.pages.redhat.com/docs/users/getting-started/multi-platform-builds.html#arm64-2
2827
- name: build-platforms
2928
value:
3029
- linux/x86_64
30+
- linux-c6gd2xlarge/arm64
3131
- name: build-source-image
3232
value: 'true'
3333
- name: prefetch-input
34-
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.txt", "requirements.hermetic.txt"]}]'
34+
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.x86_64.txt", "requirements.aarch64.txt", "requirements.hermetic.txt"]}]'
3535
- name: hermetic
3636
value: 'true'
3737
- name: dockerfile
@@ -629,6 +629,9 @@ spec:
629629
optional: true
630630
- name: netrc
631631
optional: true
632+
timeouts:
633+
pipeline: 4h
634+
tasks: 4h
632635
taskRunTemplate:
633636
serviceAccountName: build-pipeline-lightspeed-stack
634637
workspaces:

Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ RUN pip3.12 install "uv==0.8.15"
2222
# Add explicit files and directories
2323
# (avoid accidental inclusion of local directories or env files or credentials)
2424
COPY ${LSC_SOURCE_DIR}/src ./src
25-
COPY ${LSC_SOURCE_DIR}/pyproject.toml ${LSC_SOURCE_DIR}/LICENSE ${LSC_SOURCE_DIR}/README.md ${LSC_SOURCE_DIR}/uv.lock ${LSC_SOURCE_DIR}/requirements.txt ./
25+
COPY ${LSC_SOURCE_DIR}/pyproject.toml ${LSC_SOURCE_DIR}/LICENSE ${LSC_SOURCE_DIR}/README.md ${LSC_SOURCE_DIR}/uv.lock ${LSC_SOURCE_DIR}/requirements.*.txt ./
2626

2727
# Bundle additional dependencies for library mode.
2828
# Source cachi2 environment for hermetic builds if available, otherwise use normal installation
2929
# cachi2.env has these env vars:
3030
# PIP_FIND_LINKS=/cachi2/output/deps/pip
3131
# PIP_NO_INDEX=true
3232
RUN if [ -f /cachi2/cachi2.env ]; then \
33-
. /cachi2/cachi2.env && uv venv --seed --no-index --find-links ${PIP_FIND_LINKS} && . .venv/bin/activate && pip install --no-index --find-links ${PIP_FIND_LINKS} -r requirements.txt; \
33+
. /cachi2/cachi2.env && uv venv --seed --no-index --find-links ${PIP_FIND_LINKS} && . .venv/bin/activate && pip install --no-index --find-links ${PIP_FIND_LINKS} -r requirements.$(uname -m).txt; \
3434
else \
3535
uv sync --locked --no-dev --group llslibdev; \
3636
fi

0 commit comments

Comments
 (0)