Skip to content

Commit 46bc05b

Browse files
authored
fix integration tests, add epoxy release (#428)
* use `cinder/block-storage` service instead of `cinderv3/volumev3` in tests
1 parent b92ea55 commit 46bc05b

File tree

29 files changed

+53
-41
lines changed

29 files changed

+53
-41
lines changed

.github/workflows/integration_tests.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ name: Integration Tests
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
tmate_enabled:
7+
type: boolean
8+
description: 'Run the build with tmate debugging enabled'
9+
required: false
10+
default: false
11+
openstack_version:
12+
description: 'Comma-separated list of Openstack versions e.g. "stable/2025.1", "unmaintained/zed"'
13+
required: false
14+
default: false
515
pull_request:
616
push:
717
branches:
@@ -19,23 +29,11 @@ jobs:
1929
strategy:
2030
fail-fast: false
2131
matrix:
22-
openstack_version: [ "stable/2023.2" ]
32+
openstack_version: ${{ fromJSON(format('[{0}]', inputs.openstack_version || vars.OPENSTACK_VERSIONS )) }}
2333
php_version: [ 8.1 ]
24-
include:
25-
- name: "dalmatian"
26-
openstack_version: "stable/2024.2"
27-
ubuntu_version: "22.04"
28-
- name: "caracal"
29-
openstack_version: "stable/2024.1"
30-
ubuntu_version: "22.04"
31-
- name: "antelope"
32-
openstack_version: "unmaintained/2023.1"
33-
ubuntu_version: "22.04"
34-
- name: "zed"
35-
openstack_version: "unmaintained/zed"
36-
ubuntu_version: "22.04"
34+
ubuntu_version: [ 22.04 ]
3735
runs-on: ubuntu-${{ matrix.ubuntu_version }}
38-
name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
36+
name: Deploy OpenStack ${{ matrix.openstack_version }} and run integration tests with php ${{matrix.php_version}}
3937
steps:
4038
- uses: actions/checkout@v4
4139

@@ -120,3 +118,7 @@ jobs:
120118
with:
121119
name: failure-logs-${{ strategy.job-index }}
122120
path: failure-logs
121+
122+
- name: Setup tmate session
123+
uses: mxschmitt/action-tmate@v3
124+
if: ${{ always() && github.event_name == 'workflow_dispatch' && inputs.tmate_enabled }}

doc/services/block-storage/v3/index.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ Block Storage v3
44
OpenStack Block Storage API v3 (Cinder). Cinder is the OpenStack Block Storage service for providing volumes
55
to Nova virtual machines, Ironic bare metal hosts, containers and more.
66

7+
.. note::
8+
9+
By default we are creating Cinder service with ``cinderv3`` name and ``volumev3`` type.
10+
This is left for backward compatibility and would be changed on the next major release of OpenStack SDK.
11+
It's made to be compatible with the old OpenStack installations where the 2nd version of Cinder was also installed.
12+
Check your service name and type. New installations would use ``cinder`` name and ``block-storage`` type.
13+
714
.. osdoc:: https://docs.openstack.org/api-ref/block-storage/v3/
815

916
.. toctree::

samples/BlockStorage/v3/snapshots/create.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$snapshot = $service->createSnapshot([
1515
'volumeId' => '{volumeId}',

samples/BlockStorage/v3/snapshots/delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$snapshot = $service->getSnapshot('{snapshotId}');
1515
$snapshot->delete();

samples/BlockStorage/v3/snapshots/get.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$snapshot = $service->getSnapshot('{snapshotId}');

samples/BlockStorage/v3/snapshots/get_metadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$metadata = $service->getSnapshot('{snapshotId}')
1515
->getMetadata();

samples/BlockStorage/v3/snapshots/list.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$snapshots = $service->listSnapshots();
1515

samples/BlockStorage/v3/snapshots/list_detail.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$snapshots = $service->listSnapshots(true);
1515

samples/BlockStorage/v3/snapshots/list_sorted.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$snapshots = $service->listSnapshots(false, ['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
1515

samples/BlockStorage/v3/snapshots/merge_metadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'scope' => ['project' => ['id' => '{projectId}']]
1010
]);
1111

12-
$service = $openstack->blockStorageV3();
12+
$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
1313

1414
$snapshot = $service->getSnapshot('{snapshotId}');
1515

0 commit comments

Comments
 (0)