diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index e8688447..529ae43c 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -33,8 +33,11 @@ jobs: # Only run integration tests for main branch if: github.ref == 'refs/heads/main' run: | - echo 'GO_TEST_ARGS="-tags integration"' >> $GITHUB_ENV + echo 'GO_TAGS=integration' >> $GITHUB_ENV - name: Run tests + env: + TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }} + TEST_AZURE_ACCOUNT_KEY: ${{ secrets.TEST_AZURE_ACCOUNT_KEY }} run: make test - name: Setup Kubernetes uses: engineerd/setup-kind@v0.5.0 @@ -65,8 +68,11 @@ jobs: # Only run integration tests for main branch if: github.ref == 'refs/heads/main' run: | - echo 'GO_TEST_ARGS="-tags integration"' >> $GITHUB_ENV + echo 'GO_TAGS=integration' >> $GITHUB_ENV - name: Run tests + env: + TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }} + TEST_AZURE_ACCOUNT_KEY: ${{ secrets.TEST_AZURE_ACCOUNT_KEY }} run: make test - name: Prepare id: prep diff --git a/Makefile b/Makefile index 7d574630..da627197 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ BUILD_ARGS ?= # Architectures to build images for BUILD_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v7 -# Go test arguments, e.g. '-tags=integration' -GO_TEST_ARGS ?= +# Go additional tag arguments, e.g. 'integration' +GO_TAGS ?= # Produce CRDs that work back to Kubernetes 1.16 CRD_OPTIONS ?= crd:crdVersions=v1 @@ -41,7 +41,7 @@ export CGO_CFLAGS=-I$(LIBGIT2_PATH)/include -I$(LIBGIT2_PATH)/include/openssl # The pkg-config command will yield warning messages until libgit2 is downloaded. ifeq ($(shell uname -s),Darwin) export CGO_LDFLAGS=$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs --static --cflags libssh2 openssl libgit2 2>/dev/null) -GO_STATIC_FLAGS=-ldflags "-s -w" -tags 'netgo,osusergo,static_build' +GO_STATIC_FLAGS=-ldflags "-s -w" -tags 'netgo,osusergo,static_build$(addprefix ,,$(GO_TAGS))' else export PKG_CONFIG_PATH:=$(PKG_CONFIG_PATH):$(LIBGIT2_LIB64_PATH)/pkgconfig export LIBRARY_PATH:=$(LIBRARY_PATH):$(LIBGIT2_LIB64_PATH) @@ -53,14 +53,14 @@ ifeq ($(shell uname -s),Linux) ifeq ($(shell uname -m),x86_64) # Linux x86_64 seem to be able to cope with the static libraries # by having only musl-dev installed, without the need of using musl toolchain. - GO_STATIC_FLAGS=-ldflags "-s -w" -tags 'netgo,osusergo,static_build' + GO_STATIC_FLAGS=-ldflags "-s -w" -tags 'netgo,osusergo,static_build$(addprefix ,,$(GO_TAGS))' else MUSL-PREFIX=$(BUILD_DIR)/musl/$(shell uname -m)-linux-musl-native/bin/$(shell uname -m)-linux-musl MUSL-CC=$(MUSL-PREFIX)-gcc export CC=$(MUSL-PREFIX)-gcc export CXX=$(MUSL-PREFIX)-g++ export AR=$(MUSL-PREFIX)-ar - GO_STATIC_FLAGS=-ldflags "-s -w -extldflags \"-static\"" -tags 'netgo,osusergo,static_build' + GO_STATIC_FLAGS=-ldflags "-s -w -extldflags \"-static\"" -tags 'netgo,osusergo,static_build$(addprefix ,,$(GO_TAGS))' endif endif @@ -96,7 +96,7 @@ build: check-deps $(LIBGIT2) ## Build manager binary KUBEBUILDER_ASSETS?="$(shell $(ENVTEST) --arch=$(ENVTEST_ARCH) use -i $(ENVTEST_KUBERNETES_VERSION) --bin-dir=$(ENVTEST_ASSETS_DIR) -p path)" test: $(LIBGIT2) install-envtest test-api check-deps ## Run tests KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) \ - go test $(GO_STATIC_FLAGS) $(GO_TEST_ARGS) ./... -coverprofile cover.out + go test $(GO_STATIC_FLAGS) ./... -coverprofile cover.out check-deps: ifeq ($(shell uname -s),Darwin) diff --git a/pkg/azure/blob_integration_test.go b/pkg/azure/blob_integration_test.go index 08c3ef7a..20b28c99 100644 --- a/pkg/azure/blob_integration_test.go +++ b/pkg/azure/blob_integration_test.go @@ -40,7 +40,7 @@ import ( ) var ( - testTimeout = time.Second * 5 + testTimeout = time.Second * 10 ) var (