Skip to content

Commit 8cabf41

Browse files
BatalexBatalex
authored
[PRA-73] Test with latest juju agent release (#195)
* feat: Update juju agent to latest 3.6.14 release * ci: Update github actions * chore: Fix tox.ini with newer tox versions * fix: Bump integration hub to rev 110 for juju compat * fix: Add test model to hub monitored-service-account * refactor: Remove unneeded juju fixture in deploy test
1 parent 8521e0b commit 8cabf41

20 files changed

Lines changed: 83 additions & 73 deletions

‎.github/actions/run-test/action.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ inputs:
4646
juju-agent-version:
4747
description: "The version of the Juju agent to be used"
4848
required: false
49-
default: 3.6.8
49+
default: 3.6.14
5050
type: string
5151
azure-storage-account:
5252
description: "The Azure Storage account name to be used for test"
@@ -68,7 +68,7 @@ runs:
6868
using: "composite"
6969
steps:
7070
- name: Checkout repository
71-
uses: actions/checkout@v5
71+
uses: actions/checkout@v6
7272

7373
- name: Install pipx
7474
shell: bash
@@ -277,7 +277,7 @@ runs:
277277
278278
- name: Upload the test result as artifact
279279
if: always()
280-
uses: actions/upload-artifact@v4
280+
uses: actions/upload-artifact@v6
281281
with:
282282
name: integration-results-${{ inputs.tox-env }}-${{ inputs.k8s-distribution }}-${{ inputs.spark-version }}-${{ inputs.bundle-backend }}-${{ inputs.storage-backend }}-${{ inputs.cos-model }}-${{ inputs.juju-agent-version }}
283283
path: test-result.json

‎.github/concierge.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
juju:
22
channel: 3.6/stable
3-
agent-version: "3.6.9"
3+
agent-version: "3.6.14"
44
model-defaults:
55
logging-config: <root>=INFO; unit=DEBUG
66

@@ -26,4 +26,4 @@ providers:
2626
host:
2727
snaps:
2828
charmcraft:
29-
channel: 3.x/stable
29+
channel: 3.x/stable

‎.github/workflows/ci-checks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- id: checkout
2222
name: Checkout repo
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
- id: setup-python
2525
name: Setup Python
2626
uses: actions/setup-python@v5.0.0

‎.github/workflows/ci-tests-full.yaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ jobs:
3636
- juju-snap-channel: "3.5/stable"
3737
juju-agent-version: "3.5.6"
3838
- juju-snap-channel: "3.6/stable"
39-
juju-agent-version: "3.6.5"
39+
juju-agent-version: "3.6.14"
4040

4141
# Test integration-basic, with Spark 3.4
4242
- tox-env: integration-basic
4343
spark-version: 3.4.4
4444
juju-snap-channel: "3.6/stable"
45-
juju-agent-version: "3.6.5"
46-
45+
juju-agent-version: "3.6.14"
46+
4747
# Test integration-basic, with Spark 3.5
4848
- tox-env: integration-basic
4949
spark-version: 3.5.5
5050
juju-snap-channel: "3.6/stable"
51-
juju-agent-version: "3.6.5"
51+
juju-agent-version: "3.6.14"
5252

5353
exclude:
5454
# Backup / Restore tests only supported on Terraform
@@ -59,7 +59,7 @@ jobs:
5959
- checks
6060
steps:
6161
- name: Checkout repo
62-
uses: actions/checkout@v4
62+
uses: actions/checkout@v6
6363
- name: Run integration test
6464
uses: ./.github/actions/run-test
6565
timeout-minutes: 40
@@ -76,17 +76,16 @@ jobs:
7676
azure-storage-key: ${{ secrets.AZURE_STORAGE_KEY }}
7777
pytest-args: ${{ matrix.tox-env != 'integration-backup-restore' && '--keep-models' || '' }}
7878

79-
8079
aggregate-results:
8180
name: Aggregate Results
8281
runs-on: ubuntu-22.04
8382
needs: integration-tests
84-
if: always()
83+
if: always()
8584
steps:
8685
- name: Checkout repo
87-
uses: actions/checkout@v4
86+
uses: actions/checkout@v6
8887
- name: Download artifacts
89-
uses: actions/download-artifact@v4
88+
uses: actions/download-artifact@v7
9089
with:
9190
path: results
9291
- id: setup-python
@@ -103,7 +102,7 @@ jobs:
103102
run: python3 .github/scripts/aggregate_results.py results/integration-results-*/matrix-result.json
104103

105104
- name: Upload summary
106-
uses: actions/upload-artifact@v4
105+
uses: actions/upload-artifact@v6
107106
with:
108107
name: matrix-summary
109108
path: matrix-summary.md

‎.github/workflows/ci-tests-minimal.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
spark-version: [ "3.4.4", "3.5.5" ]
2828
storage-backend: [ "s3", "azure_storage" ]
2929
juju-snap-channel: [ "3.6/stable" ]
30-
juju-agent-version: [ "3.6.8" ]
30+
juju-agent-version: [ "3.6.14" ]
3131
k8s-distribution: ["k8s", "microk8s"]
3232
exclude:
3333
- k8s-distribution: "microk8s"
@@ -37,14 +37,14 @@ jobs:
3737
- tox-env: integration-basic
3838
spark-version: 3.4.4
3939
juju-snap-channel: "3.6/stable"
40-
juju-agent-version: "3.6.8"
40+
juju-agent-version: "3.6.14"
4141
k8s-distribution: "k8s"
4242

4343
# Test integration-basic, with Spark 3.5
4444
- tox-env: integration-basic
4545
spark-version: 3.5.5
4646
juju-snap-channel: "3.6/stable"
47-
juju-agent-version: "3.6.8"
47+
juju-agent-version: "3.6.14"
4848
k8s-distribution: "k8s"
4949

5050
# Test bundle + COS with YAML backend just once
@@ -54,39 +54,39 @@ jobs:
5454
storage-backend: s3
5555
spark-version: 3.4.4
5656
juju-snap-channel: "3.6/stable"
57-
juju-agent-version: "3.6.8"
57+
juju-agent-version: "3.6.14"
5858
k8s-distribution: "k8s"
5959

6060
# Test COS just once with integration-sparkjob
6161
- tox-env: integration-sparkjob
6262
bundle-backend: terraform
6363
storage-backend: s3
6464
juju-snap-channel: "3.6/stable"
65-
juju-agent-version: "3.6.8"
65+
juju-agent-version: "3.6.14"
6666
cos-model: cos
6767

6868
# Test COS just once with integration-kyuubi
6969
- tox-env: integration-kyuubi
7070
bundle-backend: terraform
7171
storage-backend: s3
7272
juju-snap-channel: "3.6/stable"
73-
juju-agent-version: "3.6.8"
73+
juju-agent-version: "3.6.14"
7474
cos-model: cos
7575

7676
# Test COS just once with integration-backup-restore
7777
- tox-env: integration-backup-restore
7878
bundle-backend: terraform
7979
storage-backend: s3
8080
juju-snap-channel: "3.6/stable"
81-
juju-agent-version: "3.6.8"
81+
juju-agent-version: "3.6.14"
8282
cos-model: cos
8383

8484
needs:
8585
- checks
8686

8787
steps:
8888
- name: Checkout repo
89-
uses: actions/checkout@v4
89+
uses: actions/checkout@v6
9090
- name: Run integration test
9191
uses: ./.github/actions/run-test
9292
with:
@@ -109,9 +109,9 @@ jobs:
109109
if: ${{ success() || failure() }}
110110
steps:
111111
- name: Checkout repo
112-
uses: actions/checkout@v4
112+
uses: actions/checkout@v6
113113
- name: Download artifacts
114-
uses: actions/download-artifact@v4
114+
uses: actions/download-artifact@v7
115115
with:
116116
path: results
117117
- id: setup-python
@@ -129,7 +129,7 @@ jobs:
129129
run: python3 .github/scripts/aggregate_results.py results/integration-results-*/test-result.json
130130

131131
- name: Upload summary
132-
uses: actions/upload-artifact@v4
132+
uses: actions/upload-artifact@v6
133133
with:
134134
name: matrix-summary
135135
path: matrix-summary.md

‎.github/workflows/ci-uat.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
- --storage-backend azure_storage
2828
juju:
2929
- snap_channel: "3.6/stable"
30-
agent: "3.6.2"
30+
agent: "3.6.14"
3131
steps:
3232
- name: Checkout repo
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434
- id: setup-python
3535
name: Setup Python
3636
uses: actions/setup-python@v5.0.0

‎.github/workflows/deploy-to-aks.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-24.04
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424

2525
- name: Set default envs
2626
run: |
@@ -82,7 +82,7 @@ jobs:
8282
run: |
8383
az aks get-credentials --resource-group ${{ env.RESOURCE_GROUP }} --name ${{ env.NAME }} --admin
8484
juju add-k8s aks --client
85-
juju bootstrap aks aks-controller --agent-version=3.6.9
85+
juju bootstrap aks aks-controller
8686
8787
- name: Deploy Kyuubi Reference Architecture
8888
working-directory: ./python/tests/reference_architecture/azure

‎.github/workflows/markdown-style-checks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
markdown-lint:
1717
runs-on: ubuntu-22.04
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 0
2222
- name: Create venv
2323
working-directory: "docs"
2424
run: make install
2525
- name: Lint markdown
2626
working-directory: "docs"
27-
run: make lint-md
27+
run: make lint-md

‎.github/workflows/publish-to-pypi.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- id: checkout
3030
name: Checkout repo
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
3232
with:
3333
ref: ${{ env.BRANCH }}
3434
fetch-depth: 0
@@ -74,7 +74,7 @@ jobs:
7474
working-directory: ./python
7575
steps:
7676
- name: Checkout
77-
uses: actions/checkout@v4
77+
uses: actions/checkout@v6
7878
with:
7979
ref: ${{ env.BRANCH }}
8080
fetch-depth: 0
@@ -87,7 +87,7 @@ jobs:
8787
echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
8888
poetry build
8989
- name: Store the distribution packages
90-
uses: actions/upload-artifact@v4
90+
uses: actions/upload-artifact@v6
9191
with:
9292
name: distfiles
9393
path: python/dist/
@@ -106,12 +106,12 @@ jobs:
106106
steps:
107107
- id: checkout
108108
name: Checkout repo
109-
uses: actions/checkout@v4
109+
uses: actions/checkout@v6
110110
with:
111111
ref: ${{ env.BRANCH }}
112112
fetch-depth: 0
113113
- name: Download all the dists
114-
uses: actions/download-artifact@v4
114+
uses: actions/download-artifact@v7
115115
with:
116116
name: distfiles
117117
path: dist/
@@ -146,7 +146,7 @@ jobs:
146146
url: https://pypi.org/p/spark-k8s-test
147147
steps:
148148
- name: Download all the dists
149-
uses: actions/download-artifact@v4
149+
uses: actions/download-artifact@v7
150150
with:
151151
name: distfiles
152152
path: dist/

‎.github/workflows/publish-to-testpypi.yaml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ name: Publish spark-k8s-test to TestPyPI
33
on:
44
push:
55
tags:
6-
- 'v[0-9]+\.[0-9]+\.[0-9]+a[0-9]+' # Matches tags like v1.0.0a0
7-
6+
- 'v[0-9]+\.[0-9]+\.[0-9]+a[0-9]+' # Matches tags like v1.0.0a0
87

98
env:
109
BRANCH: ${{ github.ref_name }}
1110

12-
1311
jobs:
1412
ci-checks:
1513
uses: ./.github/workflows/ci-checks.yaml
@@ -26,7 +24,7 @@ jobs:
2624
steps:
2725
- id: checkout
2826
name: Checkout repo
29-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
3028
with:
3129
ref: ${{ env.BRANCH }}
3230
fetch-depth: 0
@@ -71,7 +69,7 @@ jobs:
7169
working-directory: ./python
7270
steps:
7371
- name: Checkout
74-
uses: actions/checkout@v4
72+
uses: actions/checkout@v6
7573
with:
7674
ref: ${{ env.BRANCH }}
7775
fetch-depth: 0
@@ -84,7 +82,7 @@ jobs:
8482
echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
8583
poetry build
8684
- name: Store the distribution packages
87-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8886
with:
8987
name: distfiles
9088
path: python/dist/
@@ -98,7 +96,7 @@ jobs:
9896
url: https://test.pypi.org/p/spark-k8s-test
9997
steps:
10098
- name: Download all the dists
101-
uses: actions/download-artifact@v4
99+
uses: actions/download-artifact@v7
102100
with:
103101
name: distfiles
104102
path: dist/

0 commit comments

Comments
 (0)