fixes broken "make run" for ansible operators #6110
Merged
Conversation
This file contains 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
Previously, an ansible operator would be scaffolded with a Makefile whose "run" target had incorrect syntax. It would run this command: `ANSIBLE_ROLES_PATH="$(ANSIBLE_ROLES_PATH):$(shell pwd)/roles" $(ANSIBLE_OPERATOR) run` That command failed to set the `ANSIBLE_ROLES_PATH` variable correctly because it was using Makefile syntax in a target's recipe, which gets interpreted as shell script. This commit moves the variable setting statement, which uses Makefile syntax, out of the recipe. It also uses the standard `?=` operator to only set the variable if it is unset. Signed-off-by: Michael Hrivnak <mhrivnak@hrivnak.org>
mhrivnak
force-pushed
the
fix-ansible-makefile-run
branch
from
eeead51 to
30512ce
Compare
|
I see that the sanity/sanity test failed, but it's not giving me much info from which to figure out what it was testing or why it failed. If anyone could point me in the right direction, that would be appreciated. |
Signed-off-by: jesus m. rodriguez <jesusr@redhat.com>
Fix test-sanity
|
/lgtm |
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.
Description of the change:
Previously, an ansible operator would be scaffolded with a Makefile whose "run" target had incorrect syntax. It would run this command:
ANSIBLE_ROLES_PATH="$(ANSIBLE_ROLES_PATH):$(shell pwd)/roles" $(ANSIBLE_OPERATOR) runThat command failed to set the
ANSIBLE_ROLES_PATHvariable correctly because it was using Makefile syntax in a target's recipe, which gets interpreted as shell script.This commit moves the variable setting statement, which uses Makefile syntax, out of the recipe. It also uses the standard
?=operator to only set the variable if it is unset.Signed-off-by: Michael Hrivnak mhrivnak@redhat.com
Motivation for the change:
fix the bug
Checklist
If the pull request includes user-facing changes, extra documentation is required:
changelog/fragments(seechangelog/fragments/00-template.yaml)website/content/en/docs