Skip to content

Get rid of docker run usage #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 1 commit into from
Aug 13, 2018
Merged

Get rid of docker run usage #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions scripts/library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,19 +254,11 @@ function start_latest_knative_build() {
# $2...$n - directories and files to inspect.
function update_licenses() {
cd ${REPO_ROOT_DIR} || return 1
if [[ ! $PWD =~ (.*)/go/src/(.*) ]]; then
echo "ERROR: expected to be under /go/src, but actually in '$PWD'"
return 1
fi
local go_src="/go/src/${BASH_REMATCH[2]}"
local dst=$1
shift
local local_dep_collector="$(which dep-collector)"
if [[ -n ${local_dep_collector} ]]; then
dep-collector $@ > ./${dst}
else
docker run -v $PWD:${go_src} --entrypoint sh \
gcr.io/knative-tests/test-infra/prow-tests -c \
"cd ${go_src} ; dep-collector $@ > ${go_src}/${dst}"
if [[ -z ${local_dep_collector} ]]; then
go get -u github.com/mattmoor/dep-collector
fi
dep-collector $@ > ./${dst}
}
6 changes: 1 addition & 5 deletions test/presubmit-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@
# Use the flags --build-tests, --unit-tests and --integration-tests
# to run a specific set of tests.

# Load github.com/knative/test-infra/images/prow-tests/scripts/presubmit-tests.sh
[ -f /workspace/presubmit-tests.sh ] \
&& source /workspace/presubmit-tests.sh \
|| eval "$(docker run --entrypoint sh gcr.io/knative-tests/test-infra/prow-tests -c 'cat presubmit-tests.sh')"
[ -v KNATIVE_TEST_INFRA ] || exit 1
source $(dirname $0)/../scripts/presubmit-tests.sh

function build_tests() {
header "Running build tests"
Expand Down