Skip to content

Commit 4313c8d

Browse files
brettmthompsonspolti
brettmthompson
and
spolti
authored
Sync ODH v2.26 to RHOAI main (#444)
* [RHOAIENG-19884] - Upgrade python to 3.11 (opendatahub-io#98) (opendatahub-io#87) chore: Update python to 3.11 in preparation of UBI9 upgrade. Cherry-picks kserve#98 Signed-off-by: Spolti <[email protected]> * formatting fixes Signed-off-by: Brett Thompson <[email protected]> --------- Signed-off-by: Spolti <[email protected]> Signed-off-by: Brett Thompson <[email protected]> Co-authored-by: Filippe Spolti <[email protected]>
1 parent e96ed16 commit 4313c8d

File tree

4 files changed

+365
-353
lines changed

4 files changed

+365
-353
lines changed

‎.github/renovate.json

Lines changed: 112 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,132 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["config:recommended"],
4-
"branchPrefix": "renovate/",
5-
"baseBranches": ["main", "rhoai-2.16", "rhoai-2.19", "rhoai-2.20", "rhoai-2.8"],
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["config:recommended"],
4+
"branchPrefix": "renovate/",
5+
"baseBranches": [
6+
"main",
7+
"rhoai-2.16",
8+
"rhoai-2.19",
9+
"rhoai-2.20",
10+
"rhoai-2.8"
11+
],
12+
"ignoreTests": true,
13+
"automergeType": "pr",
14+
"automerge": true,
15+
"enabledManagers": ["dockerfile", "tekton", "rpm"],
16+
"packageRules": [
17+
{
18+
"matchManagers": ["dockerfile"],
19+
"matchBaseBranches": ["main", "rhoai-2.16", "rhoai-2.8"],
20+
"matchUpdateTypes": ["digest"],
21+
"matchFileNames": ["*Dockerfile.konflux*"],
22+
"enabled": true,
23+
"ignoreTests": true,
24+
"automergeType": "pr",
25+
"automerge": true,
26+
"groupName": "Dockerfile Digest Updates",
27+
"branchPrefix": "renovate/docker-main/",
28+
"semanticCommits": "enabled"
29+
},
30+
{
31+
"matchManagers": ["dockerfile"],
32+
"matchBaseBranches": ["rhoai-2.19"],
33+
"enabled": false
34+
},
35+
{
36+
"matchManagers": ["tekton"],
37+
"matchBaseBranches": [
38+
"rhoai-2.16",
39+
"rhoai-2.8",
40+
"rhoai-2.19",
41+
"rhoai-2.20"
42+
],
43+
"matchUpdateTypes": ["digest", "minor"],
44+
"schedule": ["* 0-3 1 * *"],
45+
"enabled": true,
46+
"groupName": "Tekton Updates",
47+
"branchPrefix": "renovate/tekton-rhoai-2.16/",
48+
"semanticCommits": "enabled",
49+
"prFooter": "To execute skipped test pipelines write comment `/ok-to-test`",
50+
"matchPackageNames": [
51+
"/^quay.io/redhat-appstudio-tekton-catalog//",
52+
"/^quay.io/konflux-ci/tekton-catalog//"
53+
]
54+
},
55+
{
56+
"matchManagers": ["rpm"],
57+
"matchBaseBranches": [
58+
"main",
59+
"rhoai-2.16",
60+
"rhoai-2.19",
61+
"rhoai-2.20",
62+
"rhoai-2.8"
63+
],
64+
"groupName": "RPM Updates",
65+
"commitMessageTopic": "RPM updates",
66+
"enabled": true,
67+
"schedule": ["at any time"],
68+
"branchPrefix": "renovate/rpm/",
69+
"semanticCommits": "enabled"
70+
}
71+
],
72+
"dockerfile": {
73+
"enabled": true,
74+
"schedule": ["at any time"],
75+
"additionalBranchPrefix": "{{baseBranch}}/",
76+
"branchPrefix": "konflux/mintmaker/",
677
"ignoreTests": true,
778
"automergeType": "pr",
879
"automerge": true,
9-
"enabledManagers": ["dockerfile", "tekton", "rpm"],
1080
"packageRules": [
1181
{
12-
"matchManagers": ["dockerfile"],
13-
"matchBaseBranches": ["main", "rhoai-2.16", "rhoai-2.8"],
14-
"matchUpdateTypes": ["digest"],
15-
"matchFileNames": ["*Dockerfile.konflux*"],
16-
"enabled": true,
17-
"ignoreTests": true,
18-
"automergeType": "pr",
19-
"automerge": true,
20-
"groupName": "Dockerfile Digest Updates",
21-
"branchPrefix": "renovate/docker-main/",
22-
"semanticCommits": "enabled"
23-
},
82+
"matchUpdateTypes": [
83+
"major",
84+
"minor",
85+
"pin",
86+
"pinDigest",
87+
"patch",
88+
"bump"
89+
],
90+
"enabled": false
91+
}
92+
],
93+
"ignorePaths": ["**/Dockerfile", "!**/Dockerfile.konflux*"],
94+
"pinDigests": true
95+
},
96+
"tekton": {
97+
"enabled": true,
98+
"schedule": ["* 0-3 1 * *"],
99+
"fileMatch": ["\\.yaml$", "\\.yml$"],
100+
"includePaths": [".tekton/**"],
101+
"packageRules": [
24102
{
25-
"matchManagers": ["dockerfile"],
26-
"matchBaseBranches": ["rhoai-2.19"],
103+
"matchUpdateTypes": ["major", "pin", "pinDigest", "patch"],
27104
"enabled": false
28105
},
29106
{
30-
"matchManagers": ["tekton"],
31-
"matchBaseBranches": ["rhoai-2.16", "rhoai-2.8", "rhoai-2.19", "rhoai-2.20"],
32107
"matchUpdateTypes": ["digest", "minor"],
33-
"schedule": ["* 0-3 1 * *"],
34108
"enabled": true,
35-
"groupName": "Tekton Updates",
36-
"branchPrefix": "renovate/tekton-rhoai-2.16/",
109+
"groupName": "Konflux references",
110+
"branchPrefix": "konflux/references/",
37111
"semanticCommits": "enabled",
38112
"prFooter": "To execute skipped test pipelines write comment `/ok-to-test`",
113+
"prBodyColumns": ["Package", "Change", "Notes"],
114+
"prBodyDefinitions": {
115+
"Notes": "{{#if (or (containsString updateType 'minor') (containsString updateType 'major'))}}:warning:[migration](https://github.com/redhat-appstudio/build-definitions/blob/main/task/{{{replace '^quay.io/(redhat-appstudio-tekton-catalog|konflux-ci/tekton-catalog)/task-' '' packageName}}}/{{{newVersion}}}/MIGRATION.md):warning:{{/if}}"
116+
},
117+
"prBodyTemplate": "{{{header}}}{{{table}}}{{{notes}}}{{{changelogs}}}{{{controls}}}{{{footer}}}",
118+
"recreateWhen": "always",
119+
"rebaseWhen": "behind-base-branch",
39120
"matchPackageNames": [
40121
"/^quay.io/redhat-appstudio-tekton-catalog//",
41122
"/^quay.io/konflux-ci/tekton-catalog//"
42123
]
43-
},
44-
{
45-
"matchManagers": ["rpm"],
46-
"matchBaseBranches": ["main", "rhoai-2.16", "rhoai-2.19", "rhoai-2.20", "rhoai-2.8"],
47-
"groupName": "RPM Updates",
48-
"commitMessageTopic": "RPM updates",
49-
"enabled": true,
50-
"schedule": ["at any time"],
51-
"branchPrefix": "renovate/rpm/",
52-
"semanticCommits": "enabled"
53-
}
54-
],
55-
"dockerfile": {
56-
"enabled": true,
57-
"schedule": ["at any time"],
58-
"additionalBranchPrefix": "{{baseBranch}}/",
59-
"branchPrefix": "konflux/mintmaker/",
60-
"ignoreTests": true,
61-
"automergeType": "pr",
62-
"automerge": true,
63-
"packageRules": [
64-
{
65-
"matchUpdateTypes": [
66-
"major",
67-
"minor",
68-
"pin",
69-
"pinDigest",
70-
"patch",
71-
"bump"
72-
],
73-
"enabled": false
74-
}
75-
],
76-
"ignorePaths": [
77-
"**/Dockerfile",
78-
"!**/Dockerfile.konflux*"
79-
],
80-
"pinDigests": true
81-
},
82-
"tekton": {
83-
"enabled": true,
84-
"schedule": ["* 0-3 1 * *"],
85-
"fileMatch": ["\\.yaml$", "\\.yml$"],
86-
"includePaths": [".tekton/**"],
87-
"packageRules": [
88-
{
89-
"matchUpdateTypes": [
90-
"major",
91-
"pin",
92-
"pinDigest",
93-
"patch"
94-
],
95-
"enabled": false
96-
},
97-
{
98-
"matchUpdateTypes": ["digest", "minor"],
99-
"enabled": true,
100-
"groupName": "Konflux references",
101-
"branchPrefix": "konflux/references/",
102-
"semanticCommits": "enabled",
103-
"prFooter": "To execute skipped test pipelines write comment `/ok-to-test`",
104-
"prBodyColumns": ["Package", "Change", "Notes"],
105-
"prBodyDefinitions": {
106-
"Notes": "{{#if (or (containsString updateType 'minor') (containsString updateType 'major'))}}:warning:[migration](https://github.com/redhat-appstudio/build-definitions/blob/main/task/{{{replace '^quay.io/(redhat-appstudio-tekton-catalog|konflux-ci/tekton-catalog)/task-' '' packageName}}}/{{{newVersion}}}/MIGRATION.md):warning:{{/if}}"
107-
},
108-
"prBodyTemplate": "{{{header}}}{{{table}}}{{{notes}}}{{{changelogs}}}{{{controls}}}{{{footer}}}",
109-
"recreateWhen": "always",
110-
"rebaseWhen": "behind-base-branch",
111-
"matchPackageNames": [
112-
"/^quay.io/redhat-appstudio-tekton-catalog//",
113-
"/^quay.io/konflux-ci/tekton-catalog//"
114-
]
115-
}
116-
]
117-
},
118-
"rpm": {
119-
"enabled": true,
124+
}
125+
]
126+
},
127+
"rpm": {
128+
"enabled": true,
120129
"schedule": ["at any time"]
121130
},
122-
"prHourlyLimit": 0
123-
}
131+
"prHourlyLimit": 0
132+
}

‎Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ USER root
2525
ENV HOME=/root
2626

2727
# Install build and dev tools
28-
# NOTE: Require python38 to install pre-commit
28+
# NOTE: Require python311 to install pre-commit
2929
RUN --mount=type=cache,target=/root/.cache/dnf:rw \
3030
dnf install --setopt=cachedir=/root/.cache/dnf -y --nodocs \
3131
nodejs \
32-
python38 \
32+
python3.11 \
33+
python3.11-pip \
3334
&& ln -sf /usr/bin/python3 /usr/bin/python \
3435
&& ln -sf /usr/bin/pip3 /usr/bin/pip \
3536
&& true
@@ -158,8 +159,9 @@ RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
158159
microdnf install --setopt=cachedir=/root/.cache/microdnf --setopt=ubi-8-appstream-rpms.module_hotfixes=1 \
159160
gcc \
160161
gcc-c++ \
161-
python38-devel \
162-
python38 \
162+
python3.11-devel \
163+
python3.11 \
164+
python3.11-pip \
163165
&& ln -sf /usr/bin/python3 /usr/bin/python \
164166
&& ln -sf /usr/bin/pip3 /usr/bin/pip \
165167
&& true

‎model-mesh-triton-adapter/scripts/tf_pb.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
1415
import os
1516
import sys
1617
import time

0 commit comments

Comments
 (0)