Skip to content

Commit 20023e1

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

5 files changed

Lines changed: 4042 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ spec:
3131
- name: build-platforms
3232
value:
3333
- linux/x86_64
34+
- linux-c6gd2xlarge/arm64
3435
# todo: change on-push pipeline,too
3536
- name: build-source-image
3637
value: 'true'
3738
- name: prefetch-input
38-
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.txt", "requirements.hermetic.txt"]}]'
39+
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.x86_64.txt", "requirements.aarch64.txt", "requirements.hermetic.txt"]}]'
3940
- name: hermetic
4041
value: 'true'
4142
- name: dockerfile
@@ -633,6 +634,9 @@ spec:
633634
optional: true
634635
- name: netrc
635636
optional: true
637+
timeouts:
638+
pipeline: 4h
639+
tasks: 4h
636640
taskRunTemplate:
637641
serviceAccountName: build-pipeline-lightspeed-stack
638642
workspaces:

.tekton/lightspeed-stack-push.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ spec:
2828
- name: build-platforms
2929
value:
3030
- linux/x86_64
31+
- linux-c6gd2xlarge/arm64
3132
- name: build-source-image
3233
value: 'true'
3334
- name: prefetch-input
34-
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.txt", "requirements.hermetic.txt"]}]'
35+
value: '[{"type": "rpm", "path": "."}, {"type": "pip", "path": ".", "allow_binary": "true", "requirements_files": ["requirements.x86_64.txt", "requirements.aarch64.txt", "requirements.hermetic.txt"]}]'
3536
- name: hermetic
3637
value: 'true'
3738
- name: dockerfile
@@ -629,6 +630,9 @@ spec:
629630
optional: true
630631
- name: netrc
631632
optional: true
633+
timeouts:
634+
pipeline: 4h
635+
tasks: 4h
632636
taskRunTemplate:
633637
serviceAccountName: build-pipeline-lightspeed-stack
634638
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)