Skip to content

Commit 9cc69d4

Browse files
committed
chore(sync): update from opendatahub-io:main
This commit merges updates from opendatahub-io. Please be mindful of the following resolutions employed when resolving conflicts: - `build-notebooks.yaml` was regenerated from the `ci` script - The `pyyaml` dependency defined in `Poetry` is now a `dev` dependency from `upstream` as well as a `main` dependency in this repo. A simple script was written to "re-lock" this file to ensure a valid `content-hash` is provided. This results in the `groups = ["main", "dev"]` attribute in the `pyyaml` `[[package]]` section of `poetry.lock`. - The following files were resolved via accepting `Current Changes`: - `check-params-env.sh` - `package_versions_selftestdata.py` - ⚠️ _it is no obvious to me why a conflict was even reported in this file as the "conflict" seemed to be reported from a totally different file!_ - `rstudio-gpu-notebook-imagestream.yaml` - _this file doesn't exist in `red-hat-data-services` org - `commit.env` - `params.env`
2 parents b23e7ed + 58e788d commit 9cc69d4

File tree

135 files changed

+19163
-12146
lines changed

Some content is hidden

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

135 files changed

+19163
-12146
lines changed

.github/renovate.json

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"description": [
4+
"https://konflux.pages.redhat.com/docs/users/mintmaker/user.html",
5+
"https://github.com/konflux-ci/mintmaker/blob/main/config/renovate/renovate.json"
6+
],
7+
"extends": [
8+
"config:recommended",
9+
":gitSignOff",
10+
":disableDependencyDashboard"
11+
],
12+
"ignorePresets": [
13+
":dependencyDashboard"
14+
],
15+
"onboarding": false,
16+
"requireConfig": "optional",
17+
"inheritConfig": true,
18+
"platformCommit": "enabled",
19+
"autodiscover": false,
20+
"pruneStaleBranches": false,
21+
"branchConcurrentLimit": 0,
22+
"customEnvVariables": {
23+
"GOTOOLCHAIN": "auto"
24+
},
25+
"vulnerabilityAlerts": {
26+
"enabled": false
27+
},
28+
"additionalBranchPrefix": "{{baseBranch}}/",
29+
"branchPrefix": "konflux/mintmaker/",
30+
"enabledManagers": [
31+
"tekton",
32+
"dockerfile"
33+
],
34+
"tekton": {
35+
"additionalBranchPrefix": "",
36+
"fileMatch": [
37+
"\\.yaml$",
38+
"\\.yml$"
39+
],
40+
"includePaths": [
41+
".tekton/**"
42+
],
43+
"packageRules": [
44+
{
45+
"matchPackageNames": [
46+
"/^quay.io/redhat-appstudio-tekton-catalog//",
47+
"/^quay.io/konflux-ci/tekton-catalog//"
48+
],
49+
"enabled": true,
50+
"groupName": "Konflux references",
51+
"branchPrefix": "konflux/references/",
52+
"group": {
53+
"branchTopic": "{{{baseBranch}}}",
54+
"commitMessageTopic": "{{{groupName}}}"
55+
},
56+
"commitMessageTopic": "Konflux references",
57+
"semanticCommits": "enabled",
58+
"prBodyColumns": [
59+
"Package",
60+
"Change",
61+
"Notes"
62+
],
63+
"prBodyDefinitions": {
64+
"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}}"
65+
},
66+
"prBodyTemplate": "{{{header}}}{{{table}}}{{{notes}}}{{{changelogs}}}{{{configDescription}}}{{{controls}}}{{{footer}}}",
67+
"recreateWhen": "always",
68+
"rebaseWhen": "behind-base-branch"
69+
},
70+
{
71+
"matchManagers": [
72+
"gomod"
73+
],
74+
"matchDepTypes": [
75+
"indirect"
76+
],
77+
"enabled": true
78+
}
79+
],
80+
"schedule": [
81+
"after 5am on saturday"
82+
]
83+
},
84+
"dockerfile": {
85+
"enabled": true,
86+
"schedule": [
87+
"before 5am"
88+
]
89+
},
90+
"forkProcessing": "enabled",
91+
"allowedCommands": [
92+
"^rpm-lockfile-prototype rpms.in.yaml$"
93+
],
94+
"updateNotScheduled": false,
95+
"dependencyDashboard": false,
96+
"stopUpdatingLabel": "konflux-nudge"
97+
}

.github/workflows/build-notebooks-TEMPLATE.yaml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ jobs:
4242

4343
steps:
4444

45+
# image repository name must be lowercase
46+
- name: downcase IMAGE_REGISTRY and CACHE
47+
run: |
48+
echo "IMAGE_REGISTRY=${IMAGE_REGISTRY,,}" >>${GITHUB_ENV}
49+
echo "CACHE=${CACHE,,}" >>${GITHUB_ENV}
50+
4551
- uses: actions/checkout@v4
4652

4753
- run: mkdir -p $TMPDIR
@@ -248,8 +254,6 @@ jobs:
248254
env:
249255
IMAGE_TAG: "${{ steps.calculated_vars.outputs.IMAGE_TAG }}"
250256
CONTAINER_BUILD_CACHE_ARGS: "--cache-from ${{ env.CACHE }} --cache-to ${{ env.CACHE }}"
251-
# dependent images were already built and pushed, so just let podman pull it
252-
BUILD_DEPENDENT_IMAGES: "no"
253257
- name: "pull_request: make ${{ inputs.target }}"
254258
run: |
255259
make ${{ inputs.target }}
@@ -290,10 +294,10 @@ jobs:
290294
- name: Install deps
291295
run: poetry install --sync
292296

293-
- name: Run container tests (in PyTest)
297+
- name: Run Testcontainers container tests (in PyTest)
294298
run: |
295299
set -Eeuxo pipefail
296-
poetry run pytest --capture=fd tests/containers --image="${{ steps.calculated_vars.outputs.OUTPUT_IMAGE }}"
300+
poetry run pytest --capture=fd tests/containers -m 'not openshift' --image="${{ steps.calculated_vars.outputs.OUTPUT_IMAGE }}"
297301
env:
298302
DOCKER_HOST: "unix:///var/run/podman/podman.sock"
299303
TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: "/var/run/podman/podman.sock"
@@ -439,6 +443,16 @@ jobs:
439443
kubectl wait deployments --all --all-namespaces --for=condition=Available --timeout=100s
440444
kubectl wait pods --all --all-namespaces --for=condition=Ready --timeout=100s
441445
446+
- name: "Install local-path provisioner"
447+
if: ${{ steps.have-tests.outputs.tests == 'true' }}
448+
run: |
449+
set -Eeuxo pipefail
450+
kubectl apply -f https://raw.githubusercontent.com/rancher/local-path-provisioner/v0.0.31/deploy/local-path-storage.yaml
451+
kubectl wait deployments --all --namespace=local-path-storage --for=condition=Available --timeout=100s
452+
# https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/
453+
kubectl get storageclass
454+
kubectl patch storageclass local-path -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
455+
442456
- name: "Run image tests"
443457
if: ${{ steps.have-tests.outputs.tests == 'true' }}
444458
run: python3 ci/cached-builds/make_test.py --target ${{ inputs.target }}
@@ -449,6 +463,18 @@ jobs:
449463

450464
# endregion
451465

466+
- name: Run OpenShift container tests (in PyTest)
467+
if: ${{ steps.have-tests.outputs.tests == 'true' }}
468+
run: |
469+
set -Eeuxo pipefail
470+
poetry run pytest --capture=fd tests/containers -m 'openshift' --image="${{ steps.calculated_vars.outputs.OUTPUT_IMAGE }}"
471+
env:
472+
# TODO(jdanek): this Testcontainers stuff should not be necessary but currently it has to be there
473+
DOCKER_HOST: "unix:///var/run/podman/podman.sock"
474+
TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: "/var/run/podman/podman.sock"
475+
# pulling the Ryuk container from docker.io introduces CI flakiness
476+
TESTCONTAINERS_RYUK_DISABLED: "true"
477+
452478
# region Trivy vulnerability scan
453479

454480
- name: Run Trivy vulnerability scanner

0 commit comments

Comments
 (0)