fix scripts to run in mac os x and or linux #2260
Merged
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
openshift-ci-robot
added
size/XXL
joelanford
reviewed
Nov 23, 2019
openshift-ci-robot
added
size/M
camilamacedo86
changed the title
openshift-ci-robot
added
the
do-not-merge/work-in-progress
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
camilamacedo86
commented
Nov 25, 2019
joelanford
requested changes
Nov 25, 2019
joelanford
requested changes
Nov 27, 2019
hack/tests/e2e-ansible-molecule.sh
Outdated
| sed -i " " 's|\(FROM quay.io/operator-framework/ansible-operator\)\(:.*\)\?|\1:dev|g' build/Dockerfile | ||
| else | ||
| sed -i 's|\(FROM quay.io/operator-framework/ansible-operator\)\(:.*\)\?|\1:dev|g' build/Dockerfile | ||
| fi |
There was a problem hiding this comment.
Can this be combined into one command, similar to the others?
camilamacedo86
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
camilamacedo86
added
kind/bug
camilamacedo86
commented
Nov 29, 2019
hack/tests/e2e-ansible.sh
Outdated
| sed -i "s|{{ REPLACE_IMAGE }}|$DEST_IMAGE|g" deploy/operator.yaml | ||
| sed -i 's|{{ pull_policy.default..Always.. }}|Never|g' deploy/operator.yaml | ||
| if [[ "$OSTYPE" == "darwin"* ]]; then | ||
| sed -i " " "s|{{ REPLACE_IMAGE }}|$DEST_IMAGE|g" deploy/operator.yaml |
There was a problem hiding this comment.
@joelanford just here that I could not find a solution because of "{{".
There was a problem hiding this comment.
EDIT:
sed -i".bak" -E -e "s|\{\{ REPLACE_IMAGE \}\}|$DEST_IMAGE|g" deploy/operator.yaml; rm -f deploy/operator.yaml.bak
sed -i".bak" -E -e 's|\{\{ pull_policy.default..Always.. \}\}|Never|g' deploy/operator.yaml; rm -f deploy/operator.yaml.bakThere was a problem hiding this comment.
I think I was wrong originally when I said that | characters don't work with BSD sed. It seems that they do, in fact, work with both GNU sed and BSD sed. So I think we should use | everywhere we were using it before so that we don't have to escape the forward slashes in the regex patterns and replacements.
joelanford
requested changes
Dec 2, 2019
ci/tests/e2e-ansible.sh
Outdated
Comment on lines
161
to
163
| sed -i 's|{{ pull_policy.default..Always.. }}|Always|g' deploy/operator.yaml | ||
| sed -i".bak" -e 's/{{ pull_policy.default..Always.. }}/Always/g' deploy/operator.yaml; rm -f deploy/operator.yaml.bak | ||
| cp deploy/operator.yaml deploy/operator-copy.yaml | ||
| sed -i "s|{{ REPLACE_IMAGE }}|$IMAGE|g" deploy/operator.yaml |
There was a problem hiding this comment.
The files in the ci directory do not need to be changed since:
- They are currently unused in this repo
- They will soon be transitioned into the
openshift/ocp-release-operator-sdkrepo - When used with OpenShift CI, they do not need to support mac's sed command syntax.
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:
fix scripts to run in mac os x and/or Linux
Motivation for the change:
Closes #2257