Merge 6ed826f743
into 7e31f818ff
This commit is contained in:
commit
c9b7c5a0a5
6 changed files with 27 additions and 15 deletions
2
Makefile
2
Makefile
|
@ -172,7 +172,7 @@ kind-e2e-chart-tests: ## Run helm chart e2e tests
|
||||||
e2e-test-binary: ## Build binary for e2e tests.
|
e2e-test-binary: ## Build binary for e2e tests.
|
||||||
@build/run-in-docker.sh \
|
@build/run-in-docker.sh \
|
||||||
MAC_OS=$(MAC_OS) \
|
MAC_OS=$(MAC_OS) \
|
||||||
ginkgo build ./test/e2e
|
GOBIN=/tmp/bin go generate tools/ginkgo.go && ls /tmp/bin/ginkgo && /tmp/bin/ginkgo build ./test/e2e
|
||||||
|
|
||||||
.PHONY: print-e2e-suite
|
.PHONY: print-e2e-suite
|
||||||
print-e2e-suite: e2e-test-binary ## Prints information about the suite of e2e tests.
|
print-e2e-suite: e2e-test-binary ## Prints information about the suite of e2e tests.
|
||||||
|
|
|
@ -86,10 +86,6 @@ USER=${USER:-nobody}
|
||||||
if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
|
if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
|
||||||
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
|
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
|
||||||
echo "FLAGS=$FLAGS"
|
echo "FLAGS=$FLAGS"
|
||||||
#go env
|
|
||||||
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
|
|
||||||
find / -type f -name ginkgo 2>/dev/null
|
|
||||||
which ginkgo
|
|
||||||
/bin/bash -c "${FLAGS}"
|
/bin/bash -c "${FLAGS}"
|
||||||
else
|
else
|
||||||
echo "Reached DIND check ELSE block, inside run-in-docker.sh"
|
echo "Reached DIND check ELSE block, inside run-in-docker.sh"
|
||||||
|
|
|
@ -30,7 +30,6 @@ ARG CHART_TESTING_VERSION
|
||||||
ARG HELM_VERSION
|
ARG HELM_VERSION
|
||||||
ARG YAMALE_VERSION
|
ARG YAMALE_VERSION
|
||||||
ARG YAML_LINT_VERSION
|
ARG YAML_LINT_VERSION
|
||||||
ARG GINKGO_VERSION
|
|
||||||
ARG GOLINT_VERSION
|
ARG GOLINT_VERSION
|
||||||
|
|
||||||
|
|
||||||
|
@ -68,8 +67,7 @@ RUN apk update && apk upgrade && apk add --no-cache \
|
||||||
tzdata \
|
tzdata \
|
||||||
libc6-compat
|
libc6-compat
|
||||||
|
|
||||||
RUN go install -v github.com/onsi/ginkgo/v2/ginkgo@v${GINKGO_VERSION} \
|
RUN go install golang.org/x/lint/golint@${GOLINT_VERSION}
|
||||||
&& go install golang.org/x/lint/golint@${GOLINT_VERSION}
|
|
||||||
|
|
||||||
RUN wget -qO /tmp/resty_cli.tgz \
|
RUN wget -qO /tmp/resty_cli.tgz \
|
||||||
https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz \
|
https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz \
|
||||||
|
|
|
@ -77,9 +77,6 @@ if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
|
if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
|
||||||
if ! command -v ginkgo &> /dev/null; then
|
|
||||||
go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
|
|
||||||
fi
|
|
||||||
echo "[dev-env] building image"
|
echo "[dev-env] building image"
|
||||||
make -C ${DIR}/../../ clean-image build image
|
make -C ${DIR}/../../ clean-image build image
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -95,10 +95,6 @@ if [ "${SKIP_INGRESS_IMAGE_CREATION}" = "false" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${SKIP_E2E_IMAGE_CREATION}" = "false" ]; then
|
if [ "${SKIP_E2E_IMAGE_CREATION}" = "false" ]; then
|
||||||
if ! command -v ginkgo &> /dev/null; then
|
|
||||||
go install github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "[dev-env] .. done building controller images"
|
echo "[dev-env] .. done building controller images"
|
||||||
echo "[dev-env] now building e2e-image.."
|
echo "[dev-env] now building e2e-image.."
|
||||||
make -C "${DIR}"/../e2e-image image
|
make -C "${DIR}"/../e2e-image image
|
||||||
|
|
25
tools/ginkgo.go
Normal file
25
tools/ginkgo.go
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
//go:build ignore
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2023 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package tools
|
||||||
|
|
||||||
|
import (
|
||||||
|
_ "github.com/onsi/ginkgo/v2/ginkgo"
|
||||||
|
)
|
||||||
|
|
||||||
|
//go:generate go install github.com/onsi/ginkgo/v2/ginkgo
|
Loading…
Reference in a new issue