fix broken make run #13668
fix broken make run #13668
Conversation
Makefile
Outdated
| run: export PLATFORM=$(shell bash -c 'source hack/common.sh; os::build::host_platform') | ||
| run: build | ||
| $(OS_OUTPUT_BINPATH)/$(PLATFORM)/openshift start | ||
| $(PWD)/$(OS_OUTPUT_BINPATH)/$(PLATFORM)/openshift start |
There was a problem hiding this comment.
Please replace $(PWD) with $(OS_ROOT) which you can get like this:
run: export OS_ROOT=$(shell bash -c 'source hack/lib/init.sh; echo $${OS_ROOT}')
Makefile
Outdated
| @@ -217,10 +217,10 @@ test-extended: | |||
| # | |||
| # Example: | |||
| # make run | |||
| run: export OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/common.sh; echo $${OS_OUTPUT_BINPATH}') | |||
| run: export OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/lib/build/constants.sh; echo $${OS_OUTPUT_BINPATH}') | |||
There was a problem hiding this comment.
This should have been hack/lib/init.sh - that's the stable interface
There was a problem hiding this comment.
ok,i will check it
xiaoping378
force-pushed
the
fix-broken-makeifle
branch
from
65137bc
to
6927894
Compare
| @@ -217,7 +217,7 @@ test-extended: | |||
| # | |||
| # Example: | |||
| # make run | |||
| run: export OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/common.sh; echo $${OS_OUTPUT_BINPATH}') | |||
| run: export OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/lib/init.sh; echo $${OS_OUTPUT_BINPATH}') | |||
| run: export PLATFORM=$(shell bash -c 'source hack/common.sh; os::build::host_platform') | |||
| run: build | |||
| $(OS_OUTPUT_BINPATH)/$(PLATFORM)/openshift start | |||
There was a problem hiding this comment.
This still doesn't work for because it tries to run /linux/amd64/openshift start but my openshift binary is in /data/src/github.com/openshift/origin/_output/local/bin/linux/amd64/openshift
There was a problem hiding this comment.
it is worked on my env, can you test bash -c 'source hack/lib/init.sh; echo ${OS_OUTPUT_BINPATH}'
There was a problem hiding this comment.
Sorry, it looks like I've changed wrong line. Yes it works.
| @@ -217,7 +217,7 @@ test-extended: | |||
| # | |||
| # Example: | |||
| # make run | |||
| run: export OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/common.sh; echo $${OS_OUTPUT_BINPATH}') | |||
| run: export OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/lib/init.sh; echo $${OS_OUTPUT_BINPATH}') | |||
| run: export PLATFORM=$(shell bash -c 'source hack/common.sh; os::build::host_platform') | |||
| run: build | |||
| $(OS_OUTPUT_BINPATH)/$(PLATFORM)/openshift start | |||
There was a problem hiding this comment.
Sorry, it looks like I've changed wrong line. Yes it works.
|
LGTM [merge] |
|
[Test]ing while waiting on the merge queue |
|
Evaluated for origin test up to 6927894 |
|
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/675/) (Base Commit: 585b160) |
|
Flake #13708 [merge] |
|
Evaluated for origin merge up to 6927894 |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/311/) (Base Commit: 3963e0b) (Image: devenv-rhel7_6134) |
fix #13667