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>
stephenfin · May 15, 2024 · 6104d02 · 6104d02
1 parent 5de8acf
commit 6104d02
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 79 deletions.
diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml
@@ -86,10 +86,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-baremetal
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: '^.*baremetal(.(?!noauth).*)?$'
  OS_BRANCH: ${{ matrix.openstack_version }}
  # TODO(dtantsur): default to "all" when no longer supporting versions before 2024.1
  OS_SYSTEM_SCOPE: ${{ matrix.os_system_scope }}

diff --git a/.github/workflows/functional-basic.yaml b/.github/workflows/functional-basic.yaml
@@ -41,10 +41,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-basic
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: '^internal/acceptance/openstack$'
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-blockstorage.yaml b/.github/workflows/functional-blockstorage.yaml
@@ -40,10 +40,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-blockstorage
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: ^.*blockstorage(.(?!noauth).*)?$
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-clustering.yaml b/.github/workflows/functional-clustering.yaml
@@ -42,10 +42,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-clustering
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*clustering.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-compute.yaml b/.github/workflows/functional-compute.yaml
@@ -39,10 +39,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-compute
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*compute.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-containerinfra.yaml b/.github/workflows/functional-containerinfra.yaml
@@ -57,10 +57,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-containerinfra
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*containerinfra.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-dns.yaml b/.github/workflows/functional-dns.yaml
@@ -41,10 +41,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-dns
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^acceptance/openstack/dns.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-fwaas_v2.yaml b/.github/workflows/functional-fwaas_v2.yaml
@@ -45,10 +45,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-networking
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*fwaas_v2.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-identity.yaml b/.github/workflows/functional-identity.yaml
@@ -37,10 +37,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-identity
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*identity.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-image.yaml b/.github/workflows/functional-image.yaml
@@ -37,10 +37,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-image
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*image.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-keymanager.yaml b/.github/workflows/functional-keymanager.yaml
@@ -40,10 +40,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-keymanager
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*keymanager.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-loadbalancer.yaml b/.github/workflows/functional-loadbalancer.yaml
@@ -41,10 +41,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-loadbalancer
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*loadbalancer.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-messaging.yaml b/.github/workflows/functional-messaging.yaml
@@ -40,10 +40,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-messaging
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*messaging.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-networking.yaml b/.github/workflows/functional-networking.yaml
@@ -54,10 +54,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-networking
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^(?!.*fwaas_v2.*).*networking.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-objectstorage.yaml b/.github/workflows/functional-objectstorage.yaml
@@ -44,10 +44,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-objectstorage
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: '^.*objectstorage.*$'
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-orchestration.yaml b/.github/workflows/functional-orchestration.yaml
@@ -40,10 +40,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-orchestration
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: ^.*orchestration.*$
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-placement.yaml b/.github/workflows/functional-placement.yaml
@@ -37,10 +37,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-placement
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: ^.*placement.*$
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/.github/workflows/functional-sharedfilesystems.yaml b/.github/workflows/functional-sharedfilesystems.yaml
@@ -53,10 +53,9 @@ jobs:
  with:
  go-version: '^1.20'
  - name: Run Gophercloud acceptance tests
- run: ./script/acceptancetest
+ run: make acceptance-sharedfilesystem
  env:
  DEVSTACK_PATH: ${{ github.workspace }}/devstack
- ACCEPTANCE_TESTS_FILTER: "^.*sharedfilesystems.*$"
  OS_BRANCH: ${{ matrix.openstack_version }}
  - name: Generate logs on failure
  run: ./script/collectlogs

diff --git a/internal/acceptance/README.md b/internal/acceptance/README.md
@@ -91,7 +91,13 @@ to set them manually.
 From the root directory, run:
 
 ```
-./script/acceptancetest
+make acceptance
+```
+
+You can also run tests for a specific service:
+
+```
+make acceptance-compute
 ```
 
 Alternatively, add the following to your `.bashrc`:

diff --git a/script/acceptancetest b/script/acceptancetest