Merge pull request #103874 from liggitt/move-conformance
Move conformance image
This commit is contained in:
@@ -42,8 +42,8 @@ IMAGE="${REGISTRY}/conformance-amd64:${VERSION}"
|
||||
|
||||
kube::build::verify_prereqs
|
||||
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
|
||||
|
||||
make -C "${KUBE_ROOT}/cluster/images/conformance" build
|
||||
make -C "${KUBE_ROOT}/test/conformance/image" build
|
||||
docker push "${IMAGE}"
|
||||
|
@@ -110,7 +110,7 @@ kube::golang::conformance_image_targets() {
|
||||
local targets=(
|
||||
vendor/github.com/onsi/ginkgo/ginkgo
|
||||
test/e2e/e2e.test
|
||||
cluster/images/conformance/go-runner
|
||||
test/conformance/image/go-runner
|
||||
cmd/kubectl
|
||||
)
|
||||
echo "${targets[@]}"
|
||||
@@ -272,7 +272,7 @@ kube::golang::test_targets() {
|
||||
cmd/linkcheck
|
||||
vendor/github.com/onsi/ginkgo/ginkgo
|
||||
test/e2e/e2e.test
|
||||
cluster/images/conformance/go-runner
|
||||
test/conformance/image/go-runner
|
||||
)
|
||||
echo "${targets[@]}"
|
||||
}
|
||||
|
Reference in New Issue
Block a user