Skip to content

Commit 71d28e4

Browse files
Merge pull request opendatahub-io#523 from jiridanek/rhds-main
Update Pipfile.lock files by piplock-renewal.yaml action
2 parents 4874bcf + 51a14a2 commit 71d28e4

File tree

67 files changed

+6551
-6091
lines changed

Some content is hidden

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

67 files changed

+6551
-6091
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
"name": "Build Notebooks (push)"
3+
"on":
4+
"push":
5+
"workflow_dispatch":
6+
"schedule":
7+
- "cron": "0 2 * * *"
8+
9+
permissions:
10+
contents: read
11+
packages: write
12+
13+
jobs:
14+
gen:
15+
name: Generate job matrix
16+
runs-on: ubuntu-latest
17+
outputs:
18+
matrix: ${{ steps.gen.outputs.matrix }}
19+
has_jobs: ${{ steps.gen.outputs.has_jobs }}
20+
steps:
21+
- uses: actions/checkout@v4
22+
23+
- name: Determine targets to build (we want to build everything on push)
24+
run: |
25+
set -x
26+
python3 ci/cached-builds/gen_gha_matrix_jobs.py
27+
id: gen
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
shell: bash
31+
32+
build:
33+
needs: ["gen"]
34+
strategy:
35+
fail-fast: false
36+
matrix: "${{ fromJson(needs.gen.outputs.matrix) }}"
37+
uses: ./.github/workflows/build-notebooks-TEMPLATE.yaml
38+
if: ${{ fromJson(needs.gen.outputs.has_jobs) }}
39+
with:
40+
target: "${{ matrix.target }}"
41+
github: "${{ toJSON(github) }}"
42+
secrets: inherit

.github/workflows/build-notebooks.yaml

Lines changed: 0 additions & 181 deletions
This file was deleted.

.github/workflows/params-env.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on: # yamllint disable-line rule:truthy
77
- 'manifests/base/commit.env'
88
- 'manifests/base/params.env'
99
- 'ci/check-params-env.sh'
10+
- 'ci/check-runtime-images.sh'
1011
workflow_dispatch:
1112

1213
permissions:
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
name: Validation of software versions referenced in ImageStream manifests
3+
on: # yamllint disable-line rule:truthy
4+
push:
5+
# Since this check is so resource demanding, let's restrict also push action here.
6+
paths:
7+
- 'manifests/base/params.env'
8+
- 'manifests/base/*-imagestream.yaml'
9+
- 'ci/check-software-versions.py'
10+
pull_request:
11+
paths:
12+
- 'manifests/base/params.env'
13+
- 'manifests/base/*-imagestream.yaml'
14+
- 'ci/check-software-versions.py'
15+
workflow_dispatch:
16+
release:
17+
18+
permissions:
19+
contents: read
20+
21+
jobs:
22+
validation-of-sw-versions-in-imagestreams:
23+
runs-on: ubuntu-latest
24+
env:
25+
# Some pieces of code (image pulls for example) in podman consult TMPDIR or default to /var/tmp
26+
TMPDIR: /home/runner/.local/share/containers/tmpdir
27+
steps:
28+
- uses: actions/checkout@v4
29+
30+
- name: Mount lvm overlay for podman operations
31+
run: |
32+
df -h
33+
free -h
34+
35+
bash ./ci/cached-builds/gha_lvm_overlay.sh
36+
37+
df -h
38+
free -h
39+
40+
- name: Configure Podman
41+
run: |
42+
set -Eeuxo pipefail
43+
44+
sudo cp ci/cached-builds/storage.conf /etc/containers/storage.conf
45+
46+
# should reset storage when changing storage.conf
47+
sudo mkdir -p $HOME/.local/share/containers/storage/tmp
48+
# remote (CONTAINER_HOST) podman does not do reset (and refuses --force option)
49+
sudo podman system reset --force
50+
# podman running as service ignores the TMPDIR env var here, let's give it a bind-mount to /var/tmp
51+
sudo mkdir -p $TMPDIR
52+
sudo mount --bind -o rw,noexec,nosuid,nodev,bind $TMPDIR /var/tmp
53+
54+
# quick check that podman works
55+
sudo podman info
56+
57+
- name: Check software versions in manifest referencing the images
58+
id: software-versions-check
59+
run: |
60+
sudo ./ci/check-software-versions.py --prune-podman-data

.tekton/jupyter-minimal-ubi9-python-3-11-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1111
pipelinesascode.tekton.dev/max-keep-runs: "3"
1212
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
13-
== "main"
13+
== "main" && has(body.repository) && body.repository.full_name == "opendatahub-io/notebooks"
1414
creationTimestamp: null
1515
labels:
1616
appstudio.openshift.io/application: notebooks

.tekton/jupyter-minimal-ubi9-python-3-11-push.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
pipelinesascode.tekton.dev/cancel-in-progress: "false"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
1111
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
12-
== "main"
12+
== "main" && has(body.repository) && body.repository.full_name == "opendatahub-io/notebooks"
1313
creationTimestamp: null
1414
labels:
1515
appstudio.openshift.io/application: notebooks
@@ -25,6 +25,8 @@ spec:
2525
value: '{{revision}}'
2626
- name: output-image
2727
value: quay.io/redhat-user-workloads/rhoai-ide-konflux-tenant/jupyter-minimal-ubi9-python-3-11:{{revision}}
28+
- name: image-expires-after
29+
value: 28d
2830
- name: build-platforms
2931
value:
3032
- linux/x86_64

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ endef
107107
####################################### Build helpers #######################################
108108

109109
# https://stackoverflow.com/questions/78899903/how-to-create-a-make-target-which-is-an-implicit-dependency-for-all-other-target
110-
skip-init-for := deploy% undeploy% test% scan-image-vulnerabilities
110+
skip-init-for := all-images deploy% undeploy% test% scan-image-vulnerabilities
111111
ifneq (,$(filter-out $(skip-init-for),$(MAKECMDGOALS) $(.DEFAULT_GOAL)))
112112
$(SELF): bin/buildinputs
113113
endif

0 commit comments

Comments
 (0)