Skip to content

Commit 6612a60

Browse files
authored
Merge pull request #1018 from SUSE/update_cdi
Update to newer versions in 16.0
2 parents 25824eb + 1fbee68 commit 6612a60

3 files changed

Lines changed: 23 additions & 19 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
steps:
3838
- name: checkout source code
3939
uses: actions/checkout@v6
40+
4041
- name: get the current PR
4142
uses: 8BitJonny/gh-get-current-pr@4.0.0
4243
id: pr
@@ -48,7 +49,7 @@ jobs:
4849

4950
# jo is used only to generate matrix using json easily
5051
- name: Install necessary software
51-
run: sudo apt-get update && sudo apt install jo tox fish
52+
run: sudo apt-get update && sudo apt install jo tox fish iproute2
5253

5354
- id: setmatrix
5455
run: |
@@ -245,6 +246,9 @@ jobs:
245246
command -v ldapwhoami
246247
if: ${{ matrix.toxenv == '389ds' }}
247248

249+
- name: log ip address
250+
run: ip r
251+
248252
- uses: actions/cache@v5
249253
with:
250254
path: .tox
@@ -443,7 +447,7 @@ jobs:
443447
done
444448
445449
- name: Run the tests for docker
446-
run: python3 -m tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 3 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
450+
run: python3 -m tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 1 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
447451
env:
448452
CONTAINER_RUNTIME: docker
449453
OS_VERSION: ${{ matrix.os_version }}
@@ -452,7 +456,7 @@ jobs:
452456

453457
- name: Run tests as root for podman
454458
run: |
455-
sudo --preserve-env=CONTAINER_RUNTIME,OS_VERSION,TARGET,PULL_ALWAYS -H $(type -p python3) -m tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 3 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
459+
sudo --preserve-env=CONTAINER_RUNTIME,OS_VERSION,TARGET,PULL_ALWAYS -H $(type -p python3) -m tox -e ${{ matrix.toxenv }} -- -n 3 --reruns 1 --durations=25 --durations-min=600.0 --pytest-container-log-level=debug
456460
env:
457461
CONTAINER_RUNTIME: podman
458462
OS_VERSION: ${{ matrix.os_version }}

bci_tester/data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ def create_BCI(
12031203
build_tag=(
12041204
f"{APP_CONTAINER_PREFIX}/virt-{service}:latest"
12051205
if os_version == "tumbleweed"
1206-
else f"suse/sles/16.0/virt-{service}:1.5"
1206+
else f"suse/sles/16.0/virt-{service}:1.7"
12071207
),
12081208
bci_type=ImageType.APPLICATION,
12091209
available_versions=[os_version],
@@ -1227,7 +1227,7 @@ def create_BCI(
12271227
KUBEVIRT_CDI_CONTAINERS = [
12281228
create_BCI(
12291229
build_tag=(
1230-
f"suse/sles/16.0/cdi-{service}:1.60"
1230+
f"suse/sles/16.0/cdi-{service}:1.64"
12311231
if os_version.startswith("16")
12321232
else f"{APP_CONTAINER_PREFIX}/cdi-{service}:latest"
12331233
),

pyproject.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@ markers = [
8080
'bind_9',
8181
'blackbox_exporter_0.26',
8282
'blackbox_exporter_latest',
83-
'cdi-apiserver_1.60',
83+
'cdi-apiserver_1.64',
8484
'cdi-apiserver_latest',
85-
'cdi-cloner_1.60',
85+
'cdi-cloner_1.64',
8686
'cdi-cloner_latest',
87-
'cdi-controller_1.60',
87+
'cdi-controller_1.64',
8888
'cdi-controller_latest',
89-
'cdi-importer_1.60',
89+
'cdi-importer_1.64',
9090
'cdi-importer_latest',
91-
'cdi-uploadproxy_1.60',
91+
'cdi-uploadproxy_1.64',
9292
'cdi-uploadproxy_latest',
93-
'cdi-uploadserver_1.60',
93+
'cdi-uploadserver_1.64',
9494
'cdi-uploadserver_latest',
9595
'cosign_2.5',
9696
'cosign_latest',
@@ -200,21 +200,21 @@ markers = [
200200
'stunnel_5',
201201
'valkey_8.0',
202202
'valkey_latest',
203-
'virt-api_1.5',
203+
'virt-api_1.7',
204204
'virt-api_latest',
205-
'virt-controller_1.5',
205+
'virt-controller_1.7',
206206
'virt-controller_latest',
207-
'virt-exportproxy_1.5',
207+
'virt-exportproxy_1.7',
208208
'virt-exportproxy_latest',
209-
'virt-exportserver_1.5',
209+
'virt-exportserver_1.7',
210210
'virt-exportserver_latest',
211-
'virt-handler_1.5',
211+
'virt-handler_1.7',
212212
'virt-handler_latest',
213-
'virt-launcher_1.5',
213+
'virt-launcher_1.7',
214214
'virt-launcher_latest',
215-
'virt-operator_1.5',
215+
'virt-operator_1.7',
216216
'virt-operator_latest',
217-
'virt-pr-helper_1.5',
217+
'virt-pr-helper_1.7',
218218
'virt-pr-helper_latest',
219219
'xorg_21',
220220
'harbor-core_latest',

0 commit comments

Comments
 (0)