Switch AWS peer discovery test from Bazel to make (backport #13185) #13191
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit b62a36d)
This fixes a regression from 6692fcb: setting the `labels` to the output of the metadata step attaches useful standardized labels like the git hash when built, the source URL and the created timestamp. Actions like `int128/wait-for-docker-image-action` used in the `peer-discovery-aws` workflow use the revision label to detect that the latest image has the desired hash. Without setting `labels` we seem to inherit the version label from the base erlang image: $ docker image inspect -f '{{ json .Config.Labels }}' \ pivotalrabbitmq/rabbitmq:sha-0e7b53c6a8b682411c3f0024691a4760d8219699-otp27 {"org.opencontainers.image.version":"27.2.1"} (cherry picked from commit ed522fe) # Conflicts: # .github/workflows/oci-make.yaml
This change includes some fixes like setting the suffix for the metadata which is necessary since 6692fcb. The main reason for this change though is to switch from running the integration_SUITE from the AWS peer discovery plugin from Bazel to make, a necessary step to dropping the Bazel files. (cherry picked from commit e01ab9b)
`proper-testing/proper` recently added `proper_unicode:utf8_string` which is automatically imported and conflicts with this custom generator. (cherry picked from commit 7baf397)
Proper was moved under the `proper-testing` org. (cherry picked from commit 2f3422c)
Author
|
Cherry-pick of ed522fe has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Collaborator
|
The conflict seemingly stems from #13160, let's see how well it backports. |
Collaborator
Collaborator
|
@the-mikedavis I'm trying this backport #13192. Feel free to take a look, of course. |
Collaborator
|
@Mergifyio rebase |
Author
☑️ Nothing to do
|
Conflicts: .github/workflows/oci-make.yaml
Collaborator
|
@the-mikedavis all green ✅ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This includes some fixes to adapt the workflow to the changes in #13160. The main change is to switch the test from running via
bazel test ...tomake ... ct-integration.This is an automatic backport of pull request #13185 done by Mergify.