Skip to content

Commit 8147de2

Browse files
RHAIENG-5164: build: use Dockerfile.konflux.* in .tekton and Makefile (#3978)
Point ODH Konflux pipelines and local make builds at canonical Dockerfile.konflux.* paths while keeping symlink files for a follow-up removal PR. KONFLUX still selects build-args conf files only. * RHAIENG-5164: build: drop realpath and tighten makefile_helper test Build Dockerfile.konflux.* directly with wildcard existence check; assert --file and build-args conf selection in makefile_helper for both KONFLUX modes. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 07ef1a4 commit 8147de2

60 files changed

Lines changed: 109 additions & 100 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.tekton/odh-pipeline-runtime-datascience-cpu-py312-ubi9-ci-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- name: output-image
2626
value: quay.io/opendatahub/odh-pipeline-runtime-datascience-cpu-py312-ubi9:odh-stable
2727
- name: dockerfile
28-
value: runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu
28+
value: runtimes/datascience/ubi9-python-3.12/Dockerfile.konflux.cpu
2929
- name: build-args-file
3030
value: runtimes/datascience/ubi9-python-3.12/build-args/cpu.conf
3131
- name: path-context

.tekton/odh-pipeline-runtime-datascience-cpu-py312-ubi9-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
- linux/ppc64le
4242
- linux/s390x
4343
- name: dockerfile
44-
value: runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu
44+
value: runtimes/datascience/ubi9-python-3.12/Dockerfile.konflux.cpu
4545
- name: path-context
4646
value: .
4747
- name: build-args-file

.tekton/odh-pipeline-runtime-datascience-cpu-py312-ubi9-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
- linux/ppc64le
3434
- linux/s390x
3535
- name: dockerfile
36-
value: runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu
36+
value: runtimes/datascience/ubi9-python-3.12/Dockerfile.konflux.cpu
3737
- name: build-args-file
3838
value: runtimes/datascience/ubi9-python-3.12/build-args/cpu.conf
3939
- name: path-context

.tekton/odh-pipeline-runtime-minimal-cpu-py312-ubi9-ci-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- name: output-image
2626
value: quay.io/opendatahub/odh-pipeline-runtime-minimal-cpu-py312-ubi9:odh-stable
2727
- name: dockerfile
28-
value: runtimes/minimal/ubi9-python-3.12/Dockerfile.cpu
28+
value: runtimes/minimal/ubi9-python-3.12/Dockerfile.konflux.cpu
2929
- name: build-args-file
3030
value: runtimes/minimal/ubi9-python-3.12/build-args/cpu.conf
3131
- name: path-context

.tekton/odh-pipeline-runtime-minimal-cpu-py312-ubi9-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
- linux/ppc64le
4242
- linux/s390x
4343
- name: dockerfile
44-
value: runtimes/minimal/ubi9-python-3.12/Dockerfile.cpu
44+
value: runtimes/minimal/ubi9-python-3.12/Dockerfile.konflux.cpu
4545
- name: path-context
4646
value: .
4747
- name: build-args-file

.tekton/odh-pipeline-runtime-minimal-cpu-py312-ubi9-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
- linux/ppc64le
3434
- linux/s390x
3535
- name: dockerfile
36-
value: runtimes/minimal/ubi9-python-3.12/Dockerfile.cpu
36+
value: runtimes/minimal/ubi9-python-3.12/Dockerfile.konflux.cpu
3737
- name: build-args-file
3838
value: runtimes/minimal/ubi9-python-3.12/build-args/cpu.conf
3939
- name: path-context

.tekton/odh-pipeline-runtime-pytorch-cuda-py312-ubi9-ci-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- name: output-image
2828
value: quay.io/opendatahub/odh-pipeline-runtime-pytorch-cuda-py312-ubi9:odh-stable
2929
- name: dockerfile
30-
value: runtimes/pytorch/ubi9-python-3.12/Dockerfile.cuda
30+
value: runtimes/pytorch/ubi9-python-3.12/Dockerfile.konflux.cuda
3131
- name: build-args-file
3232
value: runtimes/pytorch/ubi9-python-3.12/build-args/cuda.conf
3333
- name: path-context

.tekton/odh-pipeline-runtime-pytorch-cuda-py312-ubi9-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
value:
3838
- linux-d160-m4xlarge/amd64
3939
- name: dockerfile
40-
value: runtimes/pytorch/ubi9-python-3.12/Dockerfile.cuda
40+
value: runtimes/pytorch/ubi9-python-3.12/Dockerfile.konflux.cuda
4141
- name: path-context
4242
value: .
4343
- name: event-type

.tekton/odh-pipeline-runtime-pytorch-cuda-py312-ubi9-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
value:
3232
- linux-d160-m4xlarge/amd64
3333
- name: dockerfile
34-
value: runtimes/pytorch/ubi9-python-3.12/Dockerfile.cuda
34+
value: runtimes/pytorch/ubi9-python-3.12/Dockerfile.konflux.cuda
3535
- name: build-args-file
3636
value: runtimes/pytorch/ubi9-python-3.12/build-args/cuda.conf
3737
- name: path-context

.tekton/odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-ci-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- name: output-image
2828
value: quay.io/opendatahub/odh-pipeline-runtime-pytorch-llmcompressor-cuda-py312-ubi9:odh-stable
2929
- name: dockerfile
30-
value: runtimes/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda
30+
value: runtimes/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.konflux.cuda
3131
- name: build-args-file
3232
value: runtimes/pytorch+llmcompressor/ubi9-python-3.12/build-args/cuda.conf
3333
- name: path-context

0 commit comments

Comments
 (0)