Skip to content

Commit 90cded1

Browse files
stephenfinstephenfin
committed
CI: Switch to Makefile for running acceptance tests
We can remove the 'acceptancetest' script in the process. Note that this isn't a 1:1 match: the fwaasv2 test job now runs the entire networking test suite and not just the fwaasv2-specific tests but seeing as this is using OVS rather than OVN that doesn't seem like such a bad thing. Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent 8ed2c3f commit 90cded1

20 files changed

+61
-63
lines changed

‎.github/workflows/functional-baremetal.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,11 @@ jobs:
9393
with:
9494
go-version: '^1.23'
9595
- name: Run Gophercloud acceptance tests
96-
run: ./script/acceptancetest
96+
run: |
97+
source ${{ github.workspace }}/script/stackenv
98+
make acceptance-baremetal
9799
env:
98100
DEVSTACK_PATH: ${{ github.workspace }}/devstack
99-
PACKAGE: "./internal/acceptance/openstack/baremetal/..."
100101
OS_BRANCH: ${{ matrix.openstack_version }}
101102
# TODO(dtantsur): default to true when no longer supporting versions before 2024.1
102103
USE_SYSTEM_SCOPE: ${{ matrix.use_system_scope }}

‎.github/workflows/functional-basic.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ jobs:
4545
with:
4646
go-version: '^1.23'
4747
- name: Run Gophercloud acceptance tests
48-
run: ./script/acceptancetest
48+
run: |
49+
source ${{ github.workspace }}/script/stackenv
50+
make acceptance-basic
4951
env:
5052
DEVSTACK_PATH: ${{ github.workspace }}/devstack
51-
PACKAGE: './internal/acceptance/openstack'
5253
OS_BRANCH: ${{ matrix.openstack_version }}
5354
- name: Generate logs on failure
5455
run: ./script/collectlogs

‎.github/workflows/functional-blockstorage.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ jobs:
4444
with:
4545
go-version: '^1.23'
4646
- name: Run Gophercloud acceptance tests
47-
run: ./script/acceptancetest
47+
run: |
48+
source ${{ github.workspace }}/script/stackenv
49+
make acceptance-blockstorage
4850
env:
4951
DEVSTACK_PATH: ${{ github.workspace }}/devstack
50-
PACKAGE: "./internal/acceptance/openstack/blockstorage/..."
5152
OS_BRANCH: ${{ matrix.openstack_version }}
5253
- name: Generate logs on failure
5354
run: ./script/collectlogs

‎.github/workflows/functional-compute.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ jobs:
4444
with:
4545
go-version: '^1.23'
4646
- name: Run Gophercloud acceptance tests
47-
run: ./script/acceptancetest
47+
run: |
48+
source ${{ github.workspace }}/script/stackenv
49+
make acceptance-compute
4850
env:
4951
DEVSTACK_PATH: ${{ github.workspace }}/devstack
50-
PACKAGE: "./internal/acceptance/openstack/compute/..."
5152
OS_BRANCH: ${{ matrix.openstack_version }}
5253
- name: Generate logs on failure
5354
run: ./script/collectlogs

‎.github/workflows/functional-containerinfra.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ jobs:
6161
with:
6262
go-version: '^1.23'
6363
- name: Run Gophercloud acceptance tests
64-
run: ./script/acceptancetest
64+
run: |
65+
source ${{ github.workspace }}/script/stackenv
66+
make acceptance-containerinfra
6567
env:
6668
DEVSTACK_PATH: ${{ github.workspace }}/devstack
67-
PACKAGE: "./internal/acceptance/openstack/containerinfra/..."
6869
OS_BRANCH: ${{ matrix.openstack_version }}
6970
- name: Generate logs on failure
7071
run: ./script/collectlogs

‎.github/workflows/functional-dns.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ jobs:
4545
with:
4646
go-version: '^1.23'
4747
- name: Run Gophercloud acceptance tests
48-
run: ./script/acceptancetest
48+
run: |
49+
source ${{ github.workspace }}/script/stackenv
50+
make acceptance-dns
4951
env:
5052
DEVSTACK_PATH: ${{ github.workspace }}/devstack
51-
PACKAGE: "./internal/acceptance/openstack/dns/..."
5253
OS_BRANCH: ${{ matrix.openstack_version }}
5354
- name: Generate logs on failure
5455
run: ./script/collectlogs

‎.github/workflows/functional-fwaas_v2.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ jobs:
4949
with:
5050
go-version: '^1.23'
5151
- name: Run Gophercloud acceptance tests
52-
run: ./script/acceptancetest
52+
run: |
53+
source ${{ github.workspace }}/script/stackenv
54+
make acceptance-networking
5355
env:
5456
DEVSTACK_PATH: ${{ github.workspace }}/devstack
55-
PACKAGE: "./internal/acceptance/openstack/networking/v2/extensions/fwaas_v2/..."
5657
OS_BRANCH: ${{ matrix.openstack_version }}
5758
- name: Generate logs on failure
5859
run: ./script/collectlogs

‎.github/workflows/functional-identity.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ jobs:
4242
with:
4343
go-version: '^1.23'
4444
- name: Run Gophercloud acceptance tests
45-
run: ./script/acceptancetest
45+
run: |
46+
source ${{ github.workspace }}/script/stackenv
47+
make acceptance-identity
4648
env:
4749
DEVSTACK_PATH: ${{ github.workspace }}/devstack
48-
PACKAGE: "./internal/acceptance/openstack/identity/..."
4950
OS_BRANCH: ${{ matrix.openstack_version }}
5051
- name: Generate logs on failure
5152
run: ./script/collectlogs

‎.github/workflows/functional-image.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ jobs:
4242
with:
4343
go-version: '^1.23'
4444
- name: Run Gophercloud acceptance tests
45-
run: ./script/acceptancetest
45+
run: |
46+
source ${{ github.workspace }}/script/stackenv
47+
make acceptance-image
4648
env:
4749
DEVSTACK_PATH: ${{ github.workspace }}/devstack
48-
PACKAGE: "./internal/acceptance/openstack/image/..."
4950
OS_BRANCH: ${{ matrix.openstack_version }}
5051
- name: Generate logs on failure
5152
run: ./script/collectlogs

‎.github/workflows/functional-keymanager.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ jobs:
4444
with:
4545
go-version: '^1.23'
4646
- name: Run Gophercloud acceptance tests
47-
run: ./script/acceptancetest
47+
run: |
48+
source ${{ github.workspace }}/script/stackenv
49+
make acceptance-keymanager
4850
env:
4951
DEVSTACK_PATH: ${{ github.workspace }}/devstack
50-
PACKAGE: "./internal/acceptance/openstack/keymanager/..."
5152
OS_BRANCH: ${{ matrix.openstack_version }}
5253
- name: Generate logs on failure
5354
run: ./script/collectlogs

0 commit comments

Comments
 (0)