Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5a458e1

Browse filesBrowse files
mandremandre
authored
Merge pull request #3046 from stephenfin/use-makefile-in-ci
Use Makefile for CI jobs
2 parents d08ea79 + 0572399 commit 5a458e1
Copy full SHA for 5a458e1
Expand file treeCollapse file tree

33 files changed

+118
-180
lines changed

‎.github/workflows/functional-baremetal.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-baremetal.yaml
+3-10Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ jobs:
3939
steps:
4040
- name: Checkout Gophercloud
4141
uses: actions/checkout@v4
42-
- name: Workaround for grub-efi-amd64-signed
43-
run: sudo rm /var/cache/debconf/config.dat
44-
shell: bash
45-
if: matrix.ubuntu_version == '20.04'
46-
- name: Ensure update and upgrade
47-
run: sudo apt update && sudo apt -y upgrade
48-
shell: bash
49-
if: matrix.ubuntu_version == '20.04'
5042
- name: Work around broken dnsmasq
5143
run: sudo apt-get purge -y dnsmasq-base
5244
- name: Deploy devstack
@@ -93,10 +85,11 @@ jobs:
9385
with:
9486
go-version: '^1.23'
9587
- name: Run Gophercloud acceptance tests
96-
run: ./script/acceptancetest
88+
run: |
89+
source ${{ github.workspace }}/script/stackenv
90+
make acceptance-baremetal
9791
env:
9892
DEVSTACK_PATH: ${{ github.workspace }}/devstack
99-
PACKAGE: "./internal/acceptance/openstack/baremetal/..."
10093
OS_BRANCH: ${{ matrix.openstack_version }}
10194
# TODO(dtantsur): default to true when no longer supporting versions before 2024.1
10295
USE_SYSTEM_SCOPE: ${{ matrix.use_system_scope }}

‎.github/workflows/functional-basic.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-basic.yaml
+3-2Lines 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

Copy file name to clipboardExpand all lines: .github/workflows/functional-blockstorage.yaml
+3-2Lines 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

Copy file name to clipboardExpand all lines: .github/workflows/functional-compute.yaml
+3-2Lines 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

Copy file name to clipboardExpand all lines: .github/workflows/functional-containerinfra.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ jobs:
6868
with:
6969
go-version: '^1.23'
7070
- name: Run Gophercloud acceptance tests
71-
run: ./script/acceptancetest
71+
run: |
72+
source ${{ github.workspace }}/script/stackenv
73+
make acceptance-containerinfra
7274
env:
7375
DEVSTACK_PATH: ${{ github.workspace }}/devstack
74-
PACKAGE: "./internal/acceptance/openstack/containerinfra/..."
7576
OS_BRANCH: ${{ matrix.openstack_version }}
7677
- name: Generate logs on failure
7778
run: ./script/collectlogs

‎.github/workflows/functional-dns.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-dns.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ jobs:
5353
with:
5454
go-version: '^1.23'
5555
- name: Run Gophercloud acceptance tests
56-
run: ./script/acceptancetest
56+
run: |
57+
source ${{ github.workspace }}/script/stackenv
58+
make acceptance-dns
5759
env:
5860
DEVSTACK_PATH: ${{ github.workspace }}/devstack
59-
PACKAGE: "./internal/acceptance/openstack/dns/..."
6061
OS_BRANCH: ${{ matrix.openstack_version }}
6162
- name: Generate logs on failure
6263
run: ./script/collectlogs

‎.github/workflows/functional-fwaas_v2.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-fwaas_v2.yaml
+3-2Lines 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

Copy file name to clipboardExpand all lines: .github/workflows/functional-identity.yaml
+3-2Lines 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

Copy file name to clipboardExpand all lines: .github/workflows/functional-image.yaml
+3-2Lines 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

Copy file name to clipboardExpand all lines: .github/workflows/functional-keymanager.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ jobs:
5252
with:
5353
go-version: '^1.23'
5454
- name: Run Gophercloud acceptance tests
55-
run: ./script/acceptancetest
55+
run: |
56+
source ${{ github.workspace }}/script/stackenv
57+
make acceptance-keymanager
5658
env:
5759
DEVSTACK_PATH: ${{ github.workspace }}/devstack
58-
PACKAGE: "./internal/acceptance/openstack/keymanager/..."
5960
OS_BRANCH: ${{ matrix.openstack_version }}
6061
- name: Generate logs on failure
6162
run: ./script/collectlogs

‎.github/workflows/functional-loadbalancer.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-loadbalancer.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ jobs:
5353
with:
5454
go-version: '^1.23'
5555
- name: Run Gophercloud acceptance tests
56-
run: ./script/acceptancetest
56+
run: |
57+
source ${{ github.workspace }}/script/stackenv
58+
make acceptance-loadbalancer
5759
env:
5860
DEVSTACK_PATH: ${{ github.workspace }}/devstack
59-
PACKAGE: "./internal/acceptance/openstack/loadbalancer/..."
6061
OS_BRANCH: ${{ matrix.openstack_version }}
6162
- name: Generate logs on failure
6263
run: ./script/collectlogs

‎.github/workflows/functional-messaging.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-messaging.yaml
+3-2Lines 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-messaging
4951
env:
5052
DEVSTACK_PATH: ${{ github.workspace }}/devstack
51-
PACKAGE: "./internal/acceptance/openstack/messaging/..."
5253
OS_BRANCH: ${{ matrix.openstack_version }}
5354
- name: Generate logs on failure
5455
run: ./script/collectlogs

‎.github/workflows/functional-networking.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-networking.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ jobs:
5959
with:
6060
go-version: '^1.23'
6161
- name: Run Gophercloud acceptance tests
62-
run: ./script/acceptancetest
62+
run: |
63+
source ${{ github.workspace }}/script/stackenv
64+
make acceptance-networking
6365
env:
6466
DEVSTACK_PATH: ${{ github.workspace }}/devstack
65-
PACKAGE: "./internal/acceptance/openstack/networking/..."
6667
OS_BRANCH: ${{ matrix.openstack_version }}
6768
- name: Generate logs on failure
6869
run: ./script/collectlogs

‎.github/workflows/functional-objectstorage.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-objectstorage.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ jobs:
4848
with:
4949
go-version: '^1.23'
5050
- name: Run Gophercloud acceptance tests
51-
run: ./script/acceptancetest
51+
run: |
52+
source ${{ github.workspace }}/script/stackenv
53+
make acceptance-objectstorage
5254
env:
5355
DEVSTACK_PATH: ${{ github.workspace }}/devstack
54-
PACKAGE: "./internal/acceptance/openstack/objectstorage/..."
5556
OS_BRANCH: ${{ matrix.openstack_version }}
5657
- name: Generate logs on failure
5758
run: ./script/collectlogs

‎.github/workflows/functional-orchestration.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-orchestration.yaml
+3-2Lines 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-orchestration
4850
env:
4951
DEVSTACK_PATH: ${{ github.workspace }}/devstack
50-
PACKAGE: "./internal/acceptance/openstack/orchestration/..."
5152
OS_BRANCH: ${{ matrix.openstack_version }}
5253
- name: Generate logs on failure
5354
run: ./script/collectlogs

‎.github/workflows/functional-placement.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-placement.yaml
+3-2Lines 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-placement
4648
env:
4749
DEVSTACK_PATH: ${{ github.workspace }}/devstack
48-
PACKAGE: "./internal/acceptance/openstack/placement/..."
4950
OS_BRANCH: ${{ matrix.openstack_version }}
5051
- name: Generate logs on failure
5152
run: ./script/collectlogs

‎.github/workflows/functional-sharedfilesystems.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-sharedfilesystems.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ jobs:
6666
with:
6767
go-version: '^1.23'
6868
- name: Run Gophercloud acceptance tests
69-
run: ./script/acceptancetest
69+
run: |
70+
source ${{ github.workspace }}/script/stackenv
71+
make acceptance-sharedfilesystems
7072
env:
7173
DEVSTACK_PATH: ${{ github.workspace }}/devstack
72-
PACKAGE: "./internal/acceptance/openstack/sharedfilesystems/..."
7374
OS_BRANCH: ${{ matrix.openstack_version }}
7475
- name: Generate logs on failure
7576
run: ./script/collectlogs

‎.github/workflows/functional-workflow.yaml

Copy file name to clipboardExpand all lines: .github/workflows/functional-workflow.yaml
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,11 @@ jobs:
5151
with:
5252
go-version: '^1.23'
5353
- name: Run Gophercloud acceptance tests
54-
run: ./script/acceptancetest
54+
run: |
55+
source ${{ github.workspace }}/script/stackenv
56+
make acceptance-workflow
5557
env:
5658
DEVSTACK_PATH: ${{ github.workspace }}/devstack
57-
PACKAGE: "./internal/acceptance/openstack/workflow/..."
5859
OS_BRANCH: ${{ matrix.openstack_version }}
5960
- name: Generate logs on failure
6061
run: ./script/collectlogs

‎.github/workflows/lint.yaml

Copy file name to clipboard
+9-13Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
on: [push, pull_request]
21
name: Linters
2+
on:
3+
- push
4+
- pull_request
35
permissions:
46
contents: read
5-
67
jobs:
78
test:
89
runs-on: ubuntu-latest
9-
1010
steps:
11+
- name: Checkout Gophercloud
12+
uses: actions/checkout@v4
1113
- uses: actions/setup-go@v5
1214
with:
1315
go-version: '1'
14-
15-
- uses: actions/checkout@v4
16-
17-
- name: Run go fmt
16+
- name: Run linters
1817
run: |
19-
./script/format
20-
21-
- name: Run go vet
22-
run: |
23-
./script/vet
24-
18+
make lint
19+
# TODO: Use 'go mod tidy -diff' instead once go 1.23 is out
20+
# https://github.com/golang/go/issues/27005
2521
- name: Ensure go.mod is up-to-date
2622
run: |
2723
if [ $(go mod tidy && git diff | wc -l) -gt 0 ]; then git diff && exit 1; fi

‎.github/workflows/unit.yaml

Copy file name to clipboardExpand all lines: .github/workflows/unit.yaml
+7-12Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
on: [push, pull_request]
21
name: Unit Testing
2+
on:
3+
- push
4+
- pull_request
35
permissions:
46
contents: read
5-
67
jobs:
78
test:
89
permissions:
@@ -15,35 +16,29 @@ jobs:
1516
go-version:
1617
- "1.23.0"
1718
- "1"
18-
1919
steps:
20+
- name: Checkout Gophercloud
21+
uses: actions/checkout@v4
2022
- name: Setup Go ${{ matrix.go-version }}
2123
uses: actions/setup-go@v5
2224
with:
2325
go-version: ${{ matrix.go-version }}
24-
25-
- uses: actions/checkout@v4
26-
2726
- name: Setup environment
2827
run: |
2928
# Changing into a different directory to avoid polluting go.sum with "go get"
3029
cd "$(mktemp -d)"
3130
go mod init unit_tests
32-
3331
go install github.com/wadey/gocovmerge@master
34-
3532
- name: Run unit tests
3633
run: |
37-
./script/coverage
38-
./script/unittest
39-
34+
make unit
35+
make coverage
4036
- name: Check coverage
4137
uses: coverallsapp/github-action@v2
4238
with:
4339
file: cover.out
4440
flag-name: Go-${{ matrix.go-version }}
4541
parallel: true
46-
4742
finish:
4843
permissions:
4944
checks: write # for coverallsapp/github-action to create a new check based on the results

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.