# This is a combination of 10 commits.

# This is the 1st commit message:

Containerize tests - test cycle

# This is the commit message #2:

adapt working directory

# This is the commit message #3:

Build before running tests (so we might have a cache)

# This is the commit message #4:

Test limiting parallelism

# This is the commit message #5:

Remove unbound variable

# This is the commit message #6:

Decrease parallelism to find out limit

# This is the commit message #7:

Use correct flag

# This is the commit message #8:

Update Docker image

# This is the commit message #9:

Remove build phase and increase parallelism

# This is the commit message #10:

Further increase parallelism

Author: jannfis

.circleci/config.yml

@@ -77,24 +77,18 @@ jobs:
           path: codegen.patch
           destination: .
   test:
-    working_directory: /home/circleci/.go_workspace/src/github.com/argoproj/argo-cd
-    machine:
-      image: circleci/classic:201808-01
+    working_directory: /go/src/github.com/argoproj/argo-cd
+    docker:
+      - image: jannfis/argocd-test-utils:0.0.3
     steps:
       - restore_go_cache
-      - install_golang
       - checkout
       - restore_cache:
           key: test-dl-v2
-      - run: sudo ./hack/install.sh kubectl-linux kubectx-linux dep-linux ksonnet-linux helm-linux helm2-linux kustomize-linux
-      - save_cache:
-          key: test-dl-v2
-          paths: [/tmp/dl]
       - configure_git
-      - run: go get github.com/jstemmer/go-junit-report
       - restore_vendor
       - run: dep ensure -v
-      - run: make test
+      - run: make test-local
       - save_vendor
       - save_go_cache
       - run:
@@ -214,4 +208,4 @@ workflows:
       - ui:
           requires:
             - codegen
-      - e2e
+      - e2e

Makefile

@@ -12,7 +12,7 @@ PACKR_CMD=$(shell if [ "`which packr`" ]; then echo "packr"; else echo "go run v
 VOLUME_MOUNT=$(shell if [[ selinuxenabled -eq 0 ]]; then echo ":Z"; elif [[ $(go env GOOS)=="darwin" ]]; then echo ":delegated"; else echo ""; fi)
 
 define run-in-dev-tool
-    docker run --rm -it -u $(shell id -u) -e HOME=/home/user -v ${CURRENT_DIR}:/go/src/github.com/argoproj/argo-cd${VOLUME_MOUNT} -w /go/src/github.com/argoproj/argo-cd argocd-dev-tools bash -c "GOPATH=/go $(1)"
+    docker run --rm -it -u $(shell id -u) -e HOME=/home/user -v ${HOME}/go/src:/go/src${VOLUME_MOUNT} -w /go/src/github.com/argoproj/argo-cd argocd-dev-tools bash -c "GOPATH=/go $(1)"
 endef
 
 PATH:=$(PATH):$(PWD)/hack
@@ -175,7 +175,11 @@ build:
 	go build -v `go list ./... | grep -v 'resource_customizations\|test/e2e'`
 
 .PHONY: test
-test:
+test: dev-tools-image
+	$(call run-in-dev-tool,make test-local)
+
+.PHONY: test-local
+test-local:
 	./hack/test.sh -coverprofile=coverage.out `go list ./... | grep -v 'test/e2e'`
 
 .PHONY: test-e2e

hack/Dockerfile.dev-tools

@@ -1,16 +1,43 @@
 FROM golang:1.14.0 as builder
 
-RUN apt-get update && apt-get install -y zip
+RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list
+
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    openssh-server \
+    nginx \
+    fcgiwrap \
+    git \
+    git-lfs \
+    gpg \
+    make \
+    wget \
+    gcc \
+    zip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 
 ADD install.sh .
 ADD installers installers
 
+RUN ./install.sh dep-linux
+RUN ./install.sh packr-linux
+RUN ./install.sh kubectl-linux
+RUN ./install.sh ksonnet-linux
+RUN ./install.sh helm2-linux
+RUN ./install.sh helm-linux
+RUN ./install.sh kustomize-linux
+
 RUN ./install.sh codegen-tools
 RUN ./install.sh codegen-go-tools
 
 RUN mkdir -p /home/user && chmod 777 /home/user
 RUN HELM_HOME=/home/user/.helm helm2 init --client-only
 
+RUN git config --system user.name "ArgoCD Test User"
+RUN git config --system user.email "noreply@example.com"
+
 RUN mkdir -p /go/pkg && chmod 777 /go/pkg
 
 RUN apt-get clean && \

hack/test.sh

@@ -3,6 +3,7 @@ set -eux -o pipefail
 
 # make sure apiclient does not depend on packr
 which godepgraph || go get github.com/kisielk/godepgraph
+which go-junit-report || go get github.com/jstemmer/go-junit-report
 if godepgraph -s github.com/argoproj/argo-cd/pkg/apiclient | grep packr; then
   echo apiclient package should not depend on packr
   exit 1
@@ -20,4 +21,4 @@ report() {
 
 trap 'report' EXIT
 
-go test -failfast $* 2>&1 | tee $TEST_RESULTS/test.out
+go test -p 8 -failfast $* 2>&1 | tee $TEST_RESULTS/test.out