Use kubeconformance binary, deprecate gorunner and run_e2e

Actual name change will take place later as it involves changes to test-infra and other repositories
This commit is contained in:
Wilson E. Husin 2021-03-09 13:29:15 -08:00
parent be3719a357
commit 00d2a17b2a
2 changed files with 10 additions and 3 deletions

View File

@ -21,12 +21,15 @@ FROM ${BASEIMAGE}
# This is a dependency for `kubectl diff` tests
COPY --from=base /usr/bin/diff /usr/local/bin/
COPY cluster /kubernetes/cluster
COPY ginkgo /usr/local/bin/
COPY e2e.test /usr/local/bin/
COPY kubectl /usr/local/bin/
COPY gorunner /usr/local/bin/
COPY gorunner /usr/local/bin/kubeconformance
# Legacy executables -- deprecated
COPY gorunner /run_e2e.sh
COPY gorunner /gorunner
COPY cluster /kubernetes/cluster
ENV E2E_FOCUS="\[Conformance\]"
ENV E2E_SKIP=""
@ -36,4 +39,4 @@ ENV E2E_VERBOSITY="4"
ENV RESULTS_DIR="/tmp/results"
ENV KUBECONFIG=""
ENTRYPOINT [ "/gorunner" ]
ENTRYPOINT [ "kubeconformance" ]

View File

@ -23,11 +23,15 @@ import (
"os"
"os/signal"
"path/filepath"
"strings"
"github.com/pkg/errors"
)
func main() {
if strings.Contains(os.Args[0], "run_e2e.sh") || strings.Contains(os.Args[0], "gorunner") {
log.Print("warn: calling test with e2e.test is deprecated, please rely on container manifest to invoke executable")
}
env := envWithDefaults(map[string]string{
resultsDirEnvKey: defaultResultsDir,
skipEnvKey: defaultSkip,