Skip to content

Commit 70d0c35

Browse files
committed
RHOAIENG-38634: ODH Konflux Release Build Onboarding RStudio workbenches (opendatahub-io#2664)
```bash if command -v subscription-manager &> /dev/null; then echo "RHEL system detected. Running subscription-manager register." ... else echo "Non-RHEL system detected. Skipping subscription-manager register." fi ```
1 parent 603bf2f commit 70d0c35

8 files changed

+222
-6
lines changed
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# yamllint disable-file
2+
# This pipeline is autogenerated by scripts/generate_pull_request_pipelineruns.py
3+
---
4+
apiVersion: tekton.dev/v1
5+
kind: PipelineRun
6+
metadata:
7+
annotations:
8+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
9+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
10+
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
11+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
12+
pipelinesascode.tekton.dev/cancel-in-progress: 'true'
13+
pipelinesascode.tekton.dev/max-keep-runs: '3'
14+
pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-rstudio\-minimal\-cpu\-py312\-rhel9|rstudio/rhel9\-python\-3\.12)
15+
pipelinesascode.tekton.dev/on-cel-expression: |
16+
event == "pull_request" && target_branch == "main" &&
17+
!("manifests/base/params-latest.env".pathChanged()) &&
18+
( ".tekton/odh-workbench-rstudio-minimal-cpu-py312-rhel9-pull-request.yaml".pathChanged() || "rstudio/rhel9-python-3.12/**".pathChanged() || "rstudio/rhel9-python-3.12/build-args/cpu.conf".pathChanged() )
19+
&& body.repository.full_name == "opendatahub-io/notebooks"
20+
labels:
21+
appstudio.openshift.io/application: opendatahub-release
22+
appstudio.openshift.io/component: odh-workbench-rstudio-minimal-cpu-py312-rhel9
23+
pipelines.appstudio.openshift.io/type: build
24+
name: odh-workbench-rstudio-minimal-cpu-py312-rhel9-on-pull-request
25+
namespace: open-data-hub-tenant
26+
spec:
27+
timeouts:
28+
pipeline: 3h
29+
params:
30+
- name: git-url
31+
value: '{{source_url}}'
32+
- name: revision
33+
value: '{{revision}}'
34+
- name: output-image
35+
value: quay.io/opendatahub/odh-workbench-rstudio-minimal-cpu-py312-rhel9:on-pr-{{revision}}
36+
- name: image-expires-after
37+
value: 5d
38+
- name: build-platforms
39+
value:
40+
- linux/x86_64
41+
- name: dockerfile
42+
value: rstudio/rhel9-python-3.12/Dockerfile.cpu
43+
- name: path-context
44+
value: .
45+
- name: build-args-file
46+
value: rstudio/rhel9-python-3.12/build-args/cpu.conf
47+
pipelineRef:
48+
name: multiarch-pull-request-pipeline
49+
taskRunTemplate:
50+
serviceAccountName: build-pipeline-odh-workbench-rstudio-minimal-cpu-py312-rhel9
51+
workspaces:
52+
- name: git-auth
53+
secret:
54+
secretName: '{{ git_auth_secret }}'
55+
status: {}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8+
pipelinesascode.tekton.dev/cancel-in-progress: "false"
9+
pipelinesascode.tekton.dev/max-keep-runs: "3"
10+
build.appstudio.openshift.io/build-nudge-files: "manifests/base/params-latest.env"
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" &&
12+
!("manifests/base/params-latest.env".pathChanged()) &&
13+
( ".tekton/odh-workbench-rstudio-minimal-cpu-py312-rhel9-push.yaml".pathChanged() || "rstudio/rhel9-python-3.12/**".pathChanged() || "rstudio/rhel9-python-3.12/build-args/cpu.conf".pathChanged() )
14+
creationTimestamp:
15+
labels:
16+
appstudio.openshift.io/application: opendatahub-release
17+
appstudio.openshift.io/component: odh-workbench-rstudio-minimal-cpu-py312-rhel9
18+
pipelines.appstudio.openshift.io/type: build
19+
name: odh-workbench-rstudio-minimal-cpu-py312-rhel9-on-push
20+
namespace: open-data-hub-tenant
21+
spec:
22+
timeouts:
23+
pipeline: 8h
24+
params:
25+
- name: git-url
26+
value: '{{source_url}}'
27+
- name: revision
28+
value: '{{revision}}'
29+
- name: output-image
30+
value: quay.io/opendatahub/odh-workbench-rstudio-minimal-cpu-py312-rhel9:{{revision}}
31+
- name: dockerfile
32+
value: rstudio/rhel9-python-3.12/Dockerfile.cpu
33+
- name: build-args-file
34+
value: rstudio/rhel9-python-3.12/build-args/cpu.conf
35+
- name: path-context
36+
value: .
37+
- name: additional-tags
38+
value:
39+
- '{{target_branch}}-{{revision}}'
40+
- 2025b-v1.39
41+
pipelineRef:
42+
name: singlearch-push-pipeline
43+
taskRunTemplate:
44+
serviceAccountName: build-pipeline-odh-workbench-rstudio-minimal-cpu-py312-rhel9
45+
workspaces:
46+
- name: git-auth
47+
secret:
48+
secretName: '{{ git_auth_secret }}'
49+
status: {}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# yamllint disable-file
2+
# This pipeline is autogenerated by scripts/generate_pull_request_pipelineruns.py
3+
---
4+
apiVersion: tekton.dev/v1
5+
kind: PipelineRun
6+
metadata:
7+
annotations:
8+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
9+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
10+
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
11+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
12+
pipelinesascode.tekton.dev/cancel-in-progress: 'true'
13+
pipelinesascode.tekton.dev/max-keep-runs: '3'
14+
pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-rstudio\-minimal\-cuda\-py312\-rhel9|rstudio/rhel9\-python\-3\.12)
15+
pipelinesascode.tekton.dev/on-cel-expression: |
16+
event == "pull_request" && target_branch == "main" &&
17+
!("manifests/base/params-latest.env".pathChanged()) &&
18+
( ".tekton/odh-workbench-rstudio-minimal-cuda-py312-rhel9-pull-request.yaml".pathChanged() || "rstudio/rhel9-python-3.12/**".pathChanged() || "rstudio/rhel9-python-3.12/build-args/cuda.conf".pathChanged() )
19+
&& body.repository.full_name == "opendatahub-io/notebooks"
20+
labels:
21+
appstudio.openshift.io/application: opendatahub-release
22+
appstudio.openshift.io/component: odh-workbench-rstudio-minimal-cuda-py312-rhel9
23+
pipelines.appstudio.openshift.io/type: build
24+
name: odh-workbench-rstudio-minimal-cuda-py312-rhel9-on-pull-request
25+
namespace: open-data-hub-tenant
26+
spec:
27+
timeouts:
28+
pipeline: 3h
29+
params:
30+
- name: git-url
31+
value: '{{source_url}}'
32+
- name: revision
33+
value: '{{revision}}'
34+
- name: output-image
35+
value: quay.io/opendatahub/odh-workbench-rstudio-minimal-cuda-py312-rhel9:on-pr-{{revision}}
36+
- name: image-expires-after
37+
value: 5d
38+
- name: build-platforms
39+
value:
40+
- linux/x86_64
41+
- name: dockerfile
42+
value: rstudio/rhel9-python-3.12/Dockerfile.cuda
43+
- name: path-context
44+
value: .
45+
- name: build-args-file
46+
value: rstudio/rhel9-python-3.12/build-args/cuda.conf
47+
pipelineRef:
48+
name: multiarch-pull-request-pipeline
49+
taskRunTemplate:
50+
serviceAccountName: build-pipeline-odh-workbench-rstudio-minimal-cuda-py312-rhel9
51+
workspaces:
52+
- name: git-auth
53+
secret:
54+
secretName: '{{ git_auth_secret }}'
55+
status: {}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8+
pipelinesascode.tekton.dev/cancel-in-progress: "false"
9+
pipelinesascode.tekton.dev/max-keep-runs: "3"
10+
build.appstudio.openshift.io/build-nudge-files: "manifests/base/params-latest.env"
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" &&
12+
!("manifests/base/params-latest.env".pathChanged()) &&
13+
( ".tekton/odh-workbench-rstudio-minimal-cuda-py312-rhel9-push.yaml".pathChanged() || "rstudio/rhel9-python-3.12/**".pathChanged() || "rstudio/rhel9-python-3.12/build-args/cuda.conf".pathChanged() )
14+
creationTimestamp:
15+
labels:
16+
appstudio.openshift.io/application: opendatahub-release
17+
appstudio.openshift.io/component: odh-workbench-rstudio-minimal-cuda-py312-rhel9
18+
pipelines.appstudio.openshift.io/type: build
19+
name: odh-workbench-rstudio-minimal-cuda-py312-rhel9-on-push
20+
namespace: open-data-hub-tenant
21+
spec:
22+
timeouts:
23+
pipeline: 8h
24+
params:
25+
- name: git-url
26+
value: '{{source_url}}'
27+
- name: revision
28+
value: '{{revision}}'
29+
- name: output-image
30+
value: quay.io/opendatahub/odh-workbench-rstudio-minimal-cuda-py312-rhel9:{{revision}}
31+
- name: dockerfile
32+
value: rstudio/rhel9-python-3.12/Dockerfile.cuda
33+
- name: build-args-file
34+
value: rstudio/rhel9-python-3.12/build-args/cuda.conf
35+
- name: path-context
36+
value: .
37+
- name: additional-tags
38+
value:
39+
- '{{target_branch}}-{{revision}}'
40+
- 2025b-v1.39
41+
pipelineRef:
42+
name: singlearch-push-pipeline
43+
taskRunTemplate:
44+
serviceAccountName: build-pipeline-odh-workbench-rstudio-minimal-cuda-py312-rhel9
45+
workspaces:
46+
- name: git-auth
47+
secret:
48+
secretName: '{{ git_auth_secret }}'
49+
status: {}

rstudio/rhel9-python-3.12/Dockerfile.cpu

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ ENV R_VERSION=4.5.1
107107
RUN /bin/bash <<'EOF'
108108
set -Eeuxo pipefail
109109
dnf install -y dnf-plugins-core
110-
subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms
110+
if command -v subscription-manager &> /dev/null; then
111+
subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms
112+
else
113+
dnf config-manager --set-enabled crb
114+
fi
111115
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
112116
INSTALL_PKGS="R-core R-core-devel R-java R-Rcpp R-highlight \
113117
R-littler R-littler-examples openssl-libs compat-openssl11"

rstudio/rhel9-python-3.12/Dockerfile.cuda

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@ ENV R_VERSION=4.5.1
121121
RUN /bin/bash <<'EOF'
122122
set -Eeuxo pipefail
123123
dnf install -y dnf-plugins-core
124-
subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms
124+
if command -v subscription-manager &> /dev/null; then
125+
subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms
126+
else
127+
dnf config-manager --set-enabled crb
128+
fi
125129
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
126130
INSTALL_PKGS="R-core R-core-devel R-java R-Rcpp R-highlight \
127131
R-littler R-littler-examples openssl-libs compat-openssl11"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Base Image : UBI 9 with Python 3.12
1+
# Base Image : CentOS Stream 9 with Python 3.12
22
# Architectures: linux/arm64, linux/x86_64
3-
BASE_IMAGE=registry.redhat.io/rhel9/python-312:latest
3+
BASE_IMAGE=quay.io/opendatahub/odh-base-image-cpu-py312-c9s:latest
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Base Image : UBI 9 with Python 3.12
1+
# Base Image : CentOS Stream 9 with Python 3.12
22
# CUDA Version : 12.8.1
33
# Architectures: linux/arm64, linux/x86_64
4-
BASE_IMAGE=quay.io/opendatahub/odh-base-image-cuda-py312-ubi9:v12.8
4+
BASE_IMAGE=quay.io/opendatahub/odh-base-image-cuda-py312-c9s:v12.8

0 commit comments

Comments
 (0)