Skip to content

[v2] Use Makefile for CI jobs#3367

Merged
pierreprinetti merged 17 commits intogophercloud:v2from
shiftstack:use-makefile-in-ci-v2
May 16, 2025
Merged

[v2] Use Makefile for CI jobs#3367
pierreprinetti merged 17 commits intogophercloud:v2from
shiftstack:use-makefile-in-ci-v2

Conversation

@stephenfin
Copy link
Copy Markdown
Contributor

@stephenfin stephenfin commented May 7, 2025

This is manual backport of #3046 combined with #3377, dropping two irrelevant commits and addressing two trivial merge conflicts (called out inline).

@github-actions github-actions bot added semver:patch No API change edit:actions This PR updates GitHub Actions code v2 This PR targets v2 edit:testinfra This PR updates testing infrastructure code labels May 7, 2025
@coveralls
Copy link
Copy Markdown

coveralls commented May 7, 2025

Coverage Status

coverage: 63.679% (-14.9%) from 78.612%
when pulling 5fa68ea on shiftstack:use-makefile-in-ci-v2
into d819c3f on gophercloud:v2.

stephenfin added 17 commits May 14, 2025 11:21
It's more common than the object storage service and allows us to run on
a DevStack with default configuration.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit c81a270)
We mangled this, probably since we were renaming the 'imageservice'
module to 'image' at the time.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit c56703d)
For use in CI.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit cfeb6d5)
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 7f4ed82)
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 56b90f6)
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>
(cherry picked from commit 90cded1)
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 641d7c1)
Conflicts:
  .github/workflows/unit.yaml

NOTE(stephenfin): Conflicts are due to trivial spacing.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit c237277)
Users can use 'make unit' for this now.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 5d36693)
We no longer test on Ubuntu 20.04.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 0572399)
It's annoying that GitHub doesn't surface this error.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Fixes: c4a191e
(cherry picked from commit 7c10efb)
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 69b5446)
Place service-specific conditions in service-specific locations.

We also removed the now-unused RequireNovaNetwork helper.

Conflicts:
    internal/acceptance/openstack/baremetal/httpbasic/portgroups_test.go

NOTE(stephenfin): Conflicts are because the file doesn't exist on the v2
branch (yet)

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 2a22f9d)
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 8314ff1)
We already do this for the networking workflow. Now do it for the
fwaas-specific workflow.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit df9032a)
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 148e43a)
We also fix some typos in test names.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 13997f3)
@stephenfin stephenfin force-pushed the use-makefile-in-ci-v2 branch from 45478ba to 5fa68ea Compare May 14, 2025 10:24
@github-actions github-actions bot added edit:networking This PR updates networking code edit:compute This PR updates compute code edit:sharedfilesystems This PR updates sharedfilesystems code edit:baremetal This PR updates baremetal code edit:blockstorage This PR updates blockstorage code edit:identity This PR updates identity code labels May 14, 2025
@stephenfin
Copy link
Copy Markdown
Contributor Author

@kayrus Think this one is good to go now too. Same failures with the same reasoning as the master version.

@pierreprinetti pierreprinetti merged commit b4b38ba into gophercloud:v2 May 16, 2025
63 of 70 checks passed
@pierreprinetti pierreprinetti deleted the use-makefile-in-ci-v2 branch May 16, 2025 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

edit:actions This PR updates GitHub Actions code edit:baremetal This PR updates baremetal code edit:blockstorage This PR updates blockstorage code edit:compute This PR updates compute code edit:identity This PR updates identity code edit:networking This PR updates networking code edit:sharedfilesystems This PR updates sharedfilesystems code edit:testinfra This PR updates testing infrastructure code semver:patch No API change v2 This PR targets v2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants