ci: add Go e2e test for new project layouts

Author: estroz

.travis.yml

@@ -132,9 +132,9 @@ jobs:
       name: Subcommands on Kubernetes
       script: make test-subcommand
 
-    # Build and test go
+    # Build and test go for legacy project layouts
     - <<: *test
-      name: Go on Kubernetes
+      name: Go for legacy project layouts on Kubernetes
       before_script:
       - (cd / && go get github.com/mattn/goveralls)
       script:
@@ -143,6 +143,23 @@ jobs:
       - make test-e2e-go
       - make test-integration
 
+    # Build and test go for new project layouts
+    - name: Go e2e tests for new project layouts
+      before_install:
+      # hack/ci/check-doc-only-update.sh needs to be sourced so
+      # that it can properly exit the test early with success
+      - source hack/ci/check-doc-only-update.sh
+      script:
+      - make test-e2e-go-new
+      after_success:
+      - echo "E2E tests passed"
+      after_failure:
+      - echo "E2E tests failed"
+      - kubectl get all --all-namespaces
+      - kubectl get events --all-namespaces --field-selector=type=Warning
+      services:
+      - docker
+
     # Build and test helm
     - <<: *test
       name: Helm on Kubernetes

Makefile

@@ -254,14 +254,17 @@ test-subcommand-scorecard:
 test-subcommand-olm-install:
 	./hack/tests/subcommand-olm-install.sh
 
-# E2E and integration tests.
-.PHONY: test-e2e test-e2e-go test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm test-integration
+# E2E tests.
+.PHONY: test-e2e test-e2e-go test-e2e-go-new test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm
 
-test-e2e: test-e2e-go test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm ## Run the e2e tests
+test-e2e: test-e2e-go test-e2e-go-new test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm ## Run the e2e tests
 
 test-e2e-go:
 	./hack/tests/e2e-go.sh $(ARGS)
 
+test-e2e-go-new:
+	K8S_VERSION=$(K8S_VERSION) ./hack/tests/e2e-go-new.sh
+
 test-e2e-ansible: image-build-ansible
 	./hack/tests/e2e-ansible.sh
 
@@ -271,5 +274,8 @@ test-e2e-ansible-molecule: image-build-ansible
 test-e2e-helm: image-build-helm
 	./hack/tests/e2e-helm.sh
 
-test-integration:
+# Integration tests.
+.PHONY: test-integration
+
+test-integration: ## Run integration tests
 	./hack/tests/integration.sh

hack/lib/common.sh

@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
 
-tmp_root=/tmp
-tmp_sdk_root=$tmp_root/operator-sdk
-
-function log() { printf '%s\n' "$*"; }
-function error() { error_text "ERROR:" $* >&2; }
-function fatal() { error "$@"; exit 1; }
-
+# Skip fetching and untaring the tools by setting the SKIP_FETCH_TOOLS variable
+# in your environment to any value:
+#
+# $ SKIP_FETCH_TOOLS=1 ./test.sh
+#
+# If you skip fetching tools, this script will use the tools already on your
+# machine, but rebuild the operator-sdk binary.
+SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
+# Current version of the 'kind' binary. Update this when a new breaking release
+# is made for a docker.io/kindest/node:${K8S_VERSION} image.
+KIND_VERSION="v0.8.1"
+# ENVTEST_TOOLS_VERSION is the version of k8s server tarballs used for envtest.
+# TODO: use K8S_VERSION once we start building our own server binary tarballs.
+ENVTEST_TOOLS_VERSION="1.16.4"
 # Turn colors in this script off by setting the NO_COLOR variable in your
 # environment to any value:
 NO_COLOR=${NO_COLOR:-""}
@@ -20,6 +27,14 @@ else
   reset_color=''
 fi
 
+# Roots used by tests.
+tmp_root=/tmp
+tmp_sdk_root=$tmp_root/operator-sdk
+
+function log() { printf '%s\n' "$*"; }
+function error() { error_text "ERROR:" $* >&2; }
+function fatal() { error "$@"; exit 1; }
+
 function header_text {
   echo "$header_color$*$reset_color"
 }
@@ -41,15 +56,6 @@ function install_service_monitor_crd {
   kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.35/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
 }
 
-# Skip fetching and untaring the tools by setting the SKIP_FETCH_TOOLS variable
-# in your environment to any value:
-#
-# $ SKIP_FETCH_TOOLS=1 ./test.sh
-#
-# If you skip fetching tools, this script will use the tools already on your
-# machine, but rebuild the operator-sdk binary.
-SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
-
 # prepare the e2e test staging dir, containing test tools (SKIP_FETCH_TOOLS aware).
 function prepare_staging_dir {
 
@@ -83,7 +89,7 @@ function fetch_envtest_tools {
   # curl -fL --retry 3 --keepalive-time 2 "${url}" -o "${tmp_sdk_root}/${server_tar}"
   # tar -zxvf "${tmp_sdk_root}/${server_tar}"
 
-  local tools_archive_name="kubebuilder-tools-1.16.4-$(go env GOOS)-$(go env GOARCH).tar.gz"
+  local tools_archive_name="kubebuilder-tools-${ENVTEST_TOOLS_VERSION}-$(go env GOOS)-$(go env GOARCH).tar.gz"
   local tools_download_url="https://storage.googleapis.com/kubebuilder-tools/$tools_archive_name"
 
   local tools_archive_path="$1/$tools_archive_name"
@@ -114,10 +120,6 @@ function build_sdk {
   mv ./build/operator-sdk "$1"/bin/operator-sdk
 }
 
-# Current version of the 'kind' binary. Update this when a new breaking release
-# is made for a docker.io/kindest/node:${K8S_VERSION} image.
-KIND_VERSION="v0.8.1"
-
 # Install the 'kind' binary at version $KIND_VERSION.
 function install_kind {
 

hack/tests/e2e-go-new.sh

@@ -12,8 +12,6 @@ set -o pipefail
 source ./hack/lib/common.sh
 source ./hack/lib/test_lib.sh
 
-tmp_root=/tmp
-tmp_sdk_root=$tmp_root/operator-sdk
 test_dir=./test
 tests=$test_dir/e2e-new
 
@@ -24,6 +22,8 @@ export GO111MODULE=on
 
 prepare_staging_dir $tmp_sdk_root
 fetch_tools $tmp_sdk_root
+# These envtest environment variables are required for the default unit tests
+# scaffolded in the test operator project. No e2e tests currently use envtest.
 setup_envs $tmp_sdk_root
 build_sdk $tmp_sdk_root