From d69514766e693ec1b960a0169c5594e881436af2 Mon Sep 17 00:00:00 2001 From: Chelsea Mafrica Date: Fri, 19 Jan 2024 12:52:31 -0800 Subject: [PATCH] src: Remove references to files in tests repo Change scripts and source that uses files in the tests repo to use the corresponding file in the current repo. Fixes #9165 Signed-off-by: Chelsea Mafrica --- src/runtime/Makefile | 2 +- src/runtime/pkg/katautils/katatrace/tracing.go | 4 ++-- tools/osbuilder/dockerfiles/QAT/run.sh | 10 +++------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index ea209f8613..4fefd71a66 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -817,7 +817,7 @@ fast-test: $(GENERATED_FILES) go clean -testcache for s in $$(go list ./...); do if ! go test -failfast -v -mod=vendor -p 1 $$s; then break; fi; done -GOLANGCI_LINT_FILE := ../../../tests/.ci/.golangci.yml +GOLANGCI_LINT_FILE := ../../tests/.golangci.yml GOLANGCI_LINT_NAME = golangci-lint GOLANGCI_LINT_CMD := $(shell command -v $(GOLANGCI_LINT_NAME) 2>/dev/null) lint: all diff --git a/src/runtime/pkg/katautils/katatrace/tracing.go b/src/runtime/pkg/katautils/katatrace/tracing.go index d697dd576d..1203cc8204 100644 --- a/src/runtime/pkg/katautils/katatrace/tracing.go +++ b/src/runtime/pkg/katautils/katatrace/tracing.go @@ -24,7 +24,7 @@ import ( // kataSpanExporter is used to ensure that Jaeger logs each span. // This is essential as it is used by: // -// https: //github.com/kata-containers/tests/blob/master/tracing/tracing-test.sh +// https://github.com/kata-containers/kata-containers/blob/main/tests/functional/tracing/tracing-test.sh type kataSpanExporter struct{} var _ sdktrace.SpanExporter = (*kataSpanExporter)(nil) @@ -152,7 +152,7 @@ func Trace(parent context.Context, logger *logrus.Entry, name string, tags ...ma // display the message when tracing is really enabled. if tracing { // This log message is *essential*: it is used by: - // https: //github.com/kata-containers/tests/blob/master/tracing/tracing-test.sh + // https://github.com/kata-containers/kata-containers/blob/main/tests/functional/tracing/tracing-test.sh kataTraceLogger.Debugf("created span %v", span) } diff --git a/tools/osbuilder/dockerfiles/QAT/run.sh b/tools/osbuilder/dockerfiles/QAT/run.sh index 59194a2bcb..cc53749517 100755 --- a/tools/osbuilder/dockerfiles/QAT/run.sh +++ b/tools/osbuilder/dockerfiles/QAT/run.sh @@ -16,9 +16,6 @@ export PATH=${PATH}:/usr/local/go/bin:${GOPATH}/bin kata_repo=github.com/kata-containers/kata-containers kata_repo_path=${GOPATH}/src/${kata_repo} -tests_repo=github.com/kata-containers/tests -tests_repo_path=${GOPATH}/src/${tests_repo} - grab_qat_drivers() { /bin/echo -e "\n\e[1;42mDownload and extract the drivers\e[0m" @@ -39,17 +36,16 @@ grab_kata_repos() # Check out all the repos we will use now, so we can try and ensure they use the specified branch # Only check out the branch needed, and make it shallow and thus space/bandwidth efficient # Use a green prompt with white text for easy viewing - /bin/echo -e "\n\e[1;42mClone and checkout Kata repos\e[0m" + /bin/echo -e "\n\e[1;42mClone and checkout Kata repo\e[0m" [ -d "${kata_repo_path}" ] || git clone --single-branch --branch $KATA_REPO_VERSION --depth=1 https://${kata_repo} ${kata_repo_path} - [ -d "${tests_repo_path}" ] || git clone --single-branch --branch $KATA_REPO_VERSION --depth=1 https://${tests_repo} ${tests_repo_path} } configure_kernel() { cp /input/qat.conf ${kata_repo_path}/tools/packaging/kernel/configs/fragments/common/qat.conf # We need yq and go to grab kernel versions etc. - ${tests_repo_path}/.ci/install_yq.sh - ${tests_repo_path}/.ci/install_go.sh -p + ${kata_repo_path}/ci/install_yq.sh + ${kata_repo_path}/tests/install_go.sh -p cd ${kata_repo_path} /bin/echo -e "\n\e[1;42mDownload and configure Kata kernel with CRYPTO support\e[0m" ./tools/packaging/kernel/build-kernel.sh setup