github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Update references to test/conformance/image

Browse Source
This commit is contained in:
Jordan Liggitt 2021-07-23 10:18:00 -04:00
parent 024930df11
commit 4115bef826
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/lib/release.sh
View File

@ -310,7 +310,7 @@ function kube::release::build_conformance_image() {
local -r save_dir="${4-}" local -r save_dir="${4-}"
kube::log::status "Building conformance image for arch: ${arch}" kube::log::status "Building conformance image for arch: ${arch}"
ARCH="${arch}" REGISTRY="${registry}" VERSION="${version}" \ ARCH="${arch}" REGISTRY="${registry}" VERSION="${version}" \
make -C cluster/images/conformance/ build >/dev/null make -C test/conformance/image/ build >/dev/null
local conformance_tag local conformance_tag
conformance_tag="${registry}/conformance-${arch}:${version}" conformance_tag="${registry}/conformance-${arch}:${version}"

4
hack/dev-push-conformance.sh
View File

@ -42,8 +42,8 @@ IMAGE="${REGISTRY}/conformance-amd64:${VERSION}"
kube::build::verify_prereqs kube::build::verify_prereqs
kube::build::build_image kube::build::build_image
kube::build::run_build_command make WHAT="vendor/github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test cmd/kubectl cluster/images/conformance/go-runner" kube::build::run_build_command make WHAT="vendor/github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test cmd/kubectl test/conformance/image/go-runner"
kube::build::copy_output kube::build::copy_output
make -C "${KUBE_ROOT}/cluster/images/conformance" build make -C "${KUBE_ROOT}/test/conformance/image" build
docker push "${IMAGE}" docker push "${IMAGE}"

4
hack/lib/golang.sh
View File

@ -110,7 +110,7 @@ kube::golang::conformance_image_targets() {
local targets=( local targets=(
vendor/github.com/onsi/ginkgo/ginkgo vendor/github.com/onsi/ginkgo/ginkgo
test/e2e/e2e.test test/e2e/e2e.test
cluster/images/conformance/go-runner test/conformance/image/go-runner
cmd/kubectl cmd/kubectl
) )
echo "${targets[@]}" echo "${targets[@]}"
@ -272,7 +272,7 @@ kube::golang::test_targets() {
cmd/linkcheck cmd/linkcheck
vendor/github.com/onsi/ginkgo/ginkgo vendor/github.com/onsi/ginkgo/ginkgo
test/e2e/e2e.test test/e2e/e2e.test
cluster/images/conformance/go-runner test/conformance/image/go-runner
) )
echo "${targets[@]}" echo "${targets[@]}"
} }

2
test/conformance/image/README.md
View File

@ -7,7 +7,7 @@
```console ```console
# First, build the binaries by running make from the root directory # First, build the binaries by running make from the root directory
$ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl cluster/images/conformance/go-runner" $ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl test/conformance/image/go-runner"
# Build for linux/amd64 (default) # Build for linux/amd64 (default)
# export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io # export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io