Skip to content

Commit 8997011

Browse files
authored
Merge branch 'main' into diagon-setup-and-workload
2 parents c55e7cd + 68dd6a6 commit 8997011

Some content is hidden

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

53 files changed

+1783
-376
lines changed

.github/actions/install-kueue/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ inputs:
1919
version:
2020
description: "The version to install"
2121
required: false
22-
default: "0.14.2"
22+
default: "0.14.3"
2323

2424
runs:
2525
using: composite
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License
14+
15+
name: Legacy integration tests
16+
17+
on:
18+
workflow_call:
19+
20+
permissions:
21+
contents: read
22+
23+
jobs:
24+
install-dependencies:
25+
runs-on: ubuntu-22.04
26+
strategy:
27+
matrix:
28+
python-version: ["3.10", "3.11"]
29+
steps:
30+
- uses: actions/checkout@v4
31+
- uses: google-github-actions/setup-gcloud@v2
32+
with:
33+
version: ">= 363.0.0"
34+
install_components: "beta, gke-gcloud-auth-plugin"
35+
- uses: actions/setup-python@v5
36+
with:
37+
python-version: ${{ matrix.python-version }}
38+
- name: Check if cache exists
39+
id: check-cache
40+
uses: actions/cache@v3
41+
with:
42+
path: |
43+
usr/local/bin/
44+
~/.cache/pip
45+
${{env.pythonLocation}}
46+
key: xpk-deps-${{ matrix.python-version }}-${{github.run_id}}-${{github.run_attempt}}
47+
lookup-only: true
48+
- name: install dependencies
49+
if: steps.check-cache.outputs.cache-hit != 'true'
50+
run: make install-dev && cp ./bin/kubectl-kueue /usr/local/bin/kubectl-kueue && cp ./bin/kubectl-kjob /usr/local/bin/kubectl-kjob
51+
- name: Cache dependencies
52+
if: steps.check-cache.outputs.cache-hit != 'true'
53+
uses: actions/cache/save@v3
54+
with:
55+
path: |
56+
/usr/local/bin/kubectl-kueue
57+
/usr/local/bin/kubectl-kjob
58+
~/.cache/pip
59+
${{env.pythonLocation}}
60+
key: xpk-deps-${{ matrix.python-version }}-${{github.run_id}}-${{github.run_attempt}}
61+
run-integration-tests:
62+
needs: [install-dependencies]
63+
uses: ./.github/workflows/reusable_integration_tests.yaml
64+
concurrency: # We support one build or nightly test to run at a time currently.
65+
group: integration-tests
66+
cancel-in-progress: true
67+
secrets: inherit

.github/workflows/reusable_storage_tests.yaml renamed to .github/workflows/integration_storage_tests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ name: Storage Tests
1717
on:
1818
workflow_call:
1919

20+
permissions:
21+
contents: read
22+
2023
env:
2124
CLUSTER_ARGUMENTS: "--network=${{secrets.NETWORK_NAME}} --subnetwork=${{secrets.SUBNETWORK_NAME}}"
2225

.github/workflows/nightly_tests.yaml

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name: Nightly Tests
1717
on:
1818
workflow_dispatch:
1919
schedule: # Schedule the job run at 12AM PST daily.
20-
- cron: '0 8 * * *'
20+
- cron: "0 8 * * *"
2121

2222
permissions:
2323
contents: read
@@ -43,52 +43,11 @@ jobs:
4343
needs: [build_kjob, build_actions, build_wheel]
4444
uses: ./.github/workflows/integration_ray_cluster_create.yaml
4545
secrets: inherit
46-
install-dependencies:
47-
runs-on: ubuntu-22.04
48-
strategy:
49-
matrix:
50-
python-version: ["3.10", "3.11"]
51-
steps:
52-
- uses: actions/checkout@v4
53-
- uses: google-github-actions/setup-gcloud@v2
54-
with:
55-
version: '>= 363.0.0'
56-
install_components: 'beta, gke-gcloud-auth-plugin'
57-
- uses: actions/setup-python@v5
58-
with:
59-
python-version: ${{ matrix.python-version }}
60-
- name: Check if cache exists
61-
id: check-cache
62-
uses: actions/cache@v3
63-
with:
64-
path: |
65-
usr/local/bin/
66-
~/.cache/pip
67-
${{env.pythonLocation}}
68-
key: xpk-deps-${{ matrix.python-version }}-${{github.run_id}}-${{github.run_attempt}}
69-
lookup-only: true
70-
- name: install dependencies
71-
if : steps.check-cache.outputs.cache-hit != 'true'
72-
run: make install-dev && cp ./bin/kubectl-kueue /usr/local/bin/kubectl-kueue && cp ./bin/kubectl-kjob /usr/local/bin/kubectl-kjob
73-
- name: Cache dependencies
74-
if : steps.check-cache.outputs.cache-hit != 'true'
75-
uses: actions/cache/save@v3
76-
with:
77-
path: |
78-
/usr/local/bin/kubectl-kueue
79-
/usr/local/bin/kubectl-kjob
80-
~/.cache/pip
81-
${{env.pythonLocation}}
82-
key: xpk-deps-${{ matrix.python-version }}-${{github.run_id}}-${{github.run_attempt}}
83-
run-integration-tests:
84-
needs: [install-dependencies]
85-
uses: ./.github/workflows/reusable_integration_tests.yaml
86-
concurrency: # We support one build or nightly test to run at a time currently.
87-
group: integration-tests
88-
cancel-in-progress: true
46+
legacy_integration:
47+
needs: [build_kjob, build_actions, build_wheel]
48+
uses: ./.github/workflows/integration_legacy_tests.yaml
8949
secrets: inherit
9050
storage-tests:
9151
needs: [build_kjob, build_actions, build_wheel]
92-
uses: ./.github/workflows/reusable_storage_tests.yaml
52+
uses: ./.github/workflows/integration_storage_tests.yaml
9353
secrets: inherit
94-

.github/workflows/reusable_storage_create.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ on:
4141
required: true
4242
BUCKET_NAME:
4343
required: true
44+
45+
permissions:
46+
contents: read
47+
4448
jobs:
4549
storage-create:
4650
name: "${{inputs.storage-type}}-${{inputs.storage-command}}"

.github/workflows/reusable_storage_delete.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ on:
3434
secrets:
3535
GCP_SA_KEY:
3636
required: true
37+
38+
permissions:
39+
contents: read
40+
3741
jobs:
3842
storage-delete:
3943
name: "${{inputs.storage-type}}-${{inputs.storage-command}}"

.github/workflows/stale.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
steps:
2525
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
2626
with:
27-
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
2827
stale-pr-message: 'This pull request is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
29-
days-before-stale: 30
30-
days-before-close: 7
28+
days-before-pr-stale: 30
29+
days-before-pr-close: 7
30+
operations-per-run: 100
3131

3232
permissions:
3333
actions: write

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
KUEUE_REPO=https://github.com/kubernetes-sigs/kueue.git
22

33
KUBECTL_VERSION := $(shell curl -L -s https://dl.k8s.io/release/stable.txt)
4-
KUEUE_VERSION=v0.12.2
4+
KUEUE_VERSION=v0.14.3
55
KJOB_VERSION=v0.1.0
66

77
OS := $(shell uname -s | tr A-Z a-z)

0 commit comments

Comments
 (0)