Skip to content

Commit c672c28

Browse files
committed
updating aks and eks to use matrix strategy
1 parent ca5f2f4 commit c672c28

File tree

3 files changed

+34
-167
lines changed

3 files changed

+34
-167
lines changed

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

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

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,20 @@ jobs:
2525
env:
2626
AZURE_CORE_OUTPUT: none
2727

28+
strategy:
29+
max-parallel: 1
30+
fail-fast: false
31+
matrix:
32+
bundle:
33+
- module: kubeflow-mlflow
34+
uats:
35+
env: uats-remote
36+
extra-args: --filter "not feast"
37+
- module: kubeflow-feast
38+
uats:
39+
env: feast-remote
40+
extra-args: ""
41+
2842
steps:
2943
- name: Checkout repository
3044
uses: actions/checkout@v5
@@ -93,22 +107,22 @@ jobs:
93107
run: |
94108
az aks get-credentials --resource-group ${{ env.RESOURCE_GROUP }} --name ${{ env.NAME }} --admin
95109
juju add-k8s aks --client
96-
juju bootstrap aks aks-controller
110+
juju bootstrap aks aks-controller --agent-version 3.6.9
97111
98112
- name: Deploy and assert kubeflow-mlflow solution
99113
run: |
100114
if [[ '${{ github.event_name }}' != 'pull_request' ]]; then
101115
git checkout '${{ env.CKF_BRANCH }}'
102116
fi
103117
104-
tox -c ./modules/kubeflow-mlflow -vve test_deployment -- -vv -s --risk ${{ env.RISK }}
118+
tox -c ./modules/${{ matrix.bundle.module }} -vve test_deployment -- -vv -s --risk ${{ env.RISK }}
105119
106120
- name: Run UATs
107121
run: |
108122
git clone https://github.com/canonical/charmed-kubeflow-uats.git ~/charmed-kubeflow-uats
109123
cd ~/charmed-kubeflow-uats
110124
git checkout ${{ env.UATS_BRANCH }}
111-
tox -e uats-remote -- --filter "not feast"
125+
tox -e ${{ matrix.bundle.uats.env }} -- ${{ matrix.bundle.uats.extra-args }}
112126
113127
# On failure, capture debugging resources
114128
- name: Select model

.github/workflows/deploy-to-eks.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@ jobs:
3030
outputs:
3131
aws_region: ${{ steps.extract_region.outputs.region }}
3232

33+
strategy:
34+
max-parallel: 1
35+
fail-fast: false
36+
matrix:
37+
bundle:
38+
- module: kubeflow-mlflow
39+
uats:
40+
env: uats-remote
41+
extra-args: --filter "not feast"
42+
- module: kubeflow-feast
43+
uats:
44+
env: feast-remote
45+
extra-args: ""
46+
3347
steps:
3448
- name: Checkout repository
3549
uses: actions/checkout@v5
@@ -136,7 +150,7 @@ jobs:
136150
- name: Setup Juju controller
137151
run: |
138152
/snap/juju/current/bin/juju add-k8s eks --client
139-
juju bootstrap eks eks-controller
153+
juju bootstrap eks eks-controller --agent-version 3.6.9
140154
141155
- name: Deploy and assert kubeflow-mlflow solution
142156
env:
@@ -148,14 +162,14 @@ jobs:
148162
git checkout 'track/${{ env.CKF_VERSION }}'
149163
fi
150164
151-
tox -c ./modules/kubeflow-mlflow -vve test_deployment -- -vv -s --risk ${{ env.RISK }}
165+
tox -c ./modules/${{ matrix.bundle.module }} -vve test_deployment -- -vv -s --risk ${{ env.RISK }}
152166
153167
- name: Run UATs
154168
run: |
155169
git clone https://github.com/canonical/charmed-kubeflow-uats.git ~/charmed-kubeflow-uats
156170
cd ~/charmed-kubeflow-uats
157171
git checkout ${{ env.UATS_BRANCH }}
158-
tox -e uats-remote -- --filter "not feast"
172+
tox -e ${{ matrix.bundle.uats.env }} -- ${{ matrix.bundle.uats.extra-args }}
159173
160174
# On failure, capture debugging resources
161175
- name: Select model (for debug)

0 commit comments

Comments
 (0)