Skip to content

Commit

Permalink
Merge pull request #85 from ingvagabund/allow-to-set-repo-org
Browse files Browse the repository at this point in the history
Allow to override repository organization
  • Loading branch information
ingvagabund authored Mar 29, 2018
2 parents d26cd4b + e41ef8c commit a6af54a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion hack/lib/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ OS_ROOT="$( os::util::absolute_path "${init_source}" )"
export OS_ROOT
cd "${OS_ROOT}"

PRJ_PREFIX="github.com/kubernetes-incubator/descheduler"
PRJ_PREFIX="github.com/${REPO_ORG:-kubernetes-incubator}/descheduler"
OS_OUTPUT_BINPATH="${OS_ROOT}/_output/bin"
2 changes: 1 addition & 1 deletion hack/update-codecgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ generated_files=($(

# We only work for deps within this prefix.
#my_prefix="k8s.io/kubernetes"
my_prefix="github.com/kubernetes-incubator/descheduler"
my_prefix="github.com/${REPO_ORG:-kubernetes-incubator}/descheduler"

# Register function to be called on EXIT to remove codecgen
# binary and also to touch the files that should be regenerated
Expand Down
3 changes: 2 additions & 1 deletion test/run-e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
#!/bin/bash

# This just run e2e tests.
go test github.com/kubernetes-incubator/descheduler/test/e2e/ -v
PRJ_PREFIX="github.com/${REPO_ORG:-kubernetes-incubator}/descheduler"
go test ${PRJ_PREFIX}/test/e2e/ -v

3 changes: 2 additions & 1 deletion test/run-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
#!/bin/bash

# This just run unit-tests. Ignoring the current directory so as to avoid running e2e tests.
go test $(go list github.com/kubernetes-incubator/descheduler/... | grep -v github.com/kubernetes-incubator/descheduler/vendor/| grep -v github.com/kubernetes-incubator/descheduler/test/)
PRJ_PREFIX="github.com/${REPO_ORG:-kubernetes-incubator}/descheduler"
go test $(go list ${PRJ_PREFIX}/... | grep -v ${PRJ_PREFIX}/vendor/| grep -v ${PRJ_PREFIX}/test/)

0 comments on commit a6af54a

Please sign in to comment.