github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 23:11:57 +00:00
Code Issues Projects Releases Wiki Activity

src: Remove references to files in tests repo

Browse Source 
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 <chelsea.e.mafrica@intel.com>
This commit is contained in:
Chelsea Mafrica 2024-01-19 12:52:31 -08:00
parent 4029d154ba
commit d69514766e
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/Makefile
View File

@ -817,7 +817,7 @@ fast-test: $(GENERATED_FILES)
go clean -testcache go clean -testcache
for s in $$(go list ./...); do if ! go test -failfast -v -mod=vendor -p 1 $$s; then break; fi; done 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_NAME = golangci-lint
GOLANGCI_LINT_CMD := $(shell command -v $(GOLANGCI_LINT_NAME) 2>/dev/null) GOLANGCI_LINT_CMD := $(shell command -v $(GOLANGCI_LINT_NAME) 2>/dev/null)
lint: all lint: all

4
src/runtime/pkg/katautils/katatrace/tracing.go
View File

@ -24,7 +24,7 @@ import (
// kataSpanExporter is used to ensure that Jaeger logs each span. // kataSpanExporter is used to ensure that Jaeger logs each span.
// This is essential as it is used by: // 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{} type kataSpanExporter struct{}
var _ sdktrace.SpanExporter = (*kataSpanExporter)(nil) 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. // display the message when tracing is really enabled.
if tracing { if tracing {
// This log message is *essential*: it is used by: // 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) kataTraceLogger.Debugf("created span %v", span)
} }

10
tools/osbuilder/dockerfiles/QAT/run.sh
View File

@ -16,9 +16,6 @@ export PATH=${PATH}:/usr/local/go/bin:${GOPATH}/bin
kata_repo=github.com/kata-containers/kata-containers kata_repo=github.com/kata-containers/kata-containers
kata_repo_path=${GOPATH}/src/${kata_repo} kata_repo_path=${GOPATH}/src/${kata_repo}
tests_repo=github.com/kata-containers/tests
tests_repo_path=${GOPATH}/src/${tests_repo}
grab_qat_drivers() grab_qat_drivers()
{ {
/bin/echo -e "\n\e[1;42mDownload and extract the drivers\e[0m" /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 # 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 # 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 # 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 "${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() configure_kernel()
{ {
cp /input/qat.conf ${kata_repo_path}/tools/packaging/kernel/configs/fragments/common/qat.conf 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. # We need yq and go to grab kernel versions etc.
${tests_repo_path}/.ci/install_yq.sh ${kata_repo_path}/ci/install_yq.sh
${tests_repo_path}/.ci/install_go.sh -p ${kata_repo_path}/tests/install_go.sh -p
cd ${kata_repo_path} cd ${kata_repo_path}
/bin/echo -e "\n\e[1;42mDownload and configure Kata kernel with CRYPTO support\e[0m" /bin/echo -e "\n\e[1;42mDownload and configure Kata kernel with CRYPTO support\e[0m"
./tools/packaging/kernel/build-kernel.sh setup ./tools/packaging/kernel/build-kernel.sh setup