Changes integration test go mod to fix missing dependency

aws · Apr 26, 2021 · 6f627c5 · 6f627c5
1 parent ec409b0
commit 6f627c5
Show file tree

Hide file tree

Showing 5 changed files with 392 additions and 5 deletions.
diff --git a/scripts/lib/aws.sh b/scripts/lib/aws.sh
@@ -16,7 +16,7 @@ ensure_ecr_repo() {
 }
 
 ensure_aws_k8s_tester() {
-    TESTER_RELEASE=${TESTER_RELEASE:-v1.5.7}
+    TESTER_RELEASE=${TESTER_RELEASE:-v1.5.9}
     TESTER_DOWNLOAD_URL=https://github.com/aws/aws-k8s-tester/releases/download/$TESTER_RELEASE/aws-k8s-tester-$TESTER_RELEASE-$OS-$ARCH
 
     # Download aws-k8s-tester if not yet

diff --git a/scripts/lib/cluster.sh b/scripts/lib/cluster.sh
@@ -23,7 +23,8 @@ function up-test-cluster() {
 
     echo -n "Configuring cluster $CLUSTER_NAME"
     AWS_K8S_TESTER_EKS_NAME=$CLUSTER_NAME \
-        AWS_K8S_TESTER_EKS_LOG_COLOR=true \
+        AWS_K8S_TESTER_EKS_LOG_COLOR=false \
+        AWS_K8S_TESTER_EKS_LOG_COLOR_OVERRIDE=true \
         AWS_K8S_TESTER_EKS_KUBECONFIG_PATH=$KUBECONFIG_PATH \
         AWS_K8S_TESTER_EKS_KUBECTL_PATH=$KUBECTL_PATH \
         AWS_K8S_TESTER_EKS_S3_BUCKET_NAME=$S3_BUCKET_NAME \

diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh
@@ -271,11 +271,10 @@ if [[ $TEST_PASS -eq 0 && "$RUN_CONFORMANCE" == true ]]; then
   GOPATH=$(go env GOPATH)
   echo "PATH: $PATH"
 
-  go install github.com/onsi/ginkgo/ginkgo
+  echo "Downloading kubernetes test from: https://dl.k8s.io/v$K8S_VERSION/kubernetes-test.tar.gz"
   wget -qO- https://dl.k8s.io/v$K8S_VERSION/kubernetes-test.tar.gz | tar -zxvf - --strip-components=4 -C ${TEST_BASE_DIR}  kubernetes/platforms/linux/amd64/e2e.test
-  $GOPATH/bin/ginkgo -p --focus="Conformance" --failFast --flakeAttempts 2 \
-   --skip="(should support remote command execution over websockets)|(should support retrieving logs from the container over websockets)|\[Slow\]|\[Serial\]" ${TEST_BASE_DIR}/e2e.test -- --kubeconfig=$KUBECONFIG
 
+  echo "Running e2e tests: "
   ${TEST_BASE_DIR}/e2e.test --ginkgo.focus="\[Serial\].*Conformance" --kubeconfig=$KUBECONFIG --ginkgo.failFast --ginkgo.flakeAttempts 2 \
     --ginkgo.skip="(should support remote command execution over websockets)|(should support retrieving logs from the container over websockets)|\[Slow\]"
 

diff --git a/test/integration/go.mod b/test/integration/go.mod
@@ -50,6 +50,8 @@ replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-201908191442
 
 replace k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190819143301-7c475f5e1313
 
+replace github.com/mholt/caddy => github.com/caddyserver/caddy v1.0.3
+
 require (
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0