Skip to content

Commit

Permalink
fix(controller): Add matrix tests for node offload disabled. Resolves a…
Browse files Browse the repository at this point in the history
…rgoproj#2333

Signed-off-by: Alex Collins <alex_collins@intuit.com>
  • Loading branch information
alexec committed Jan 12, 2021
1 parent f38c9a2 commit 72164f7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
17 changes: 14 additions & 3 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,16 @@ jobs:
# kubelet is not included because it'd take ages to get it working methinks
test: [ "smoke", "test-e2e", "test-cli", "test-e2e-cron" ]
containerRuntimeExecutor: [ "docker", "k8sapi", "pns" ]
# ok, so we're only running `smoke` for all CREs,
alwaysOffloadNodeStatus: ["true", "false"]
exclude:
# only use alwaysOffloadNodeStatus=true for test-e2e
- test: smoke
alwaysOffloadNodeStatus: "true"
- test: test-cli
alwaysOffloadNodeStatus: "true"
- test: test-e2e-cron
alwaysOffloadNodeStatus: "true"
# only containerRuntimeExecutor=docker for smoke and test-e2e
- test: test-e2e
containerRuntimeExecutor: k8sapi
- test: test-e2e
Expand Down Expand Up @@ -92,15 +100,18 @@ jobs:
- name: Start Argo
env:
GOPATH: /home/runner/go
PROFILE: mysql
PROFILE: minimal
run: |
echo '127.0.0.1 dex' | sudo tee -a /etc/hosts
echo '127.0.0.1 minio' | sudo tee -a /etc/hosts
echo '127.0.0.1 postgres' | sudo tee -a /etc/hosts
echo '127.0.0.1 mysql' | sudo tee -a /etc/hosts
mkdir -p /tmp/log/argo-e2e
git fetch --tags
KUBECONFIG=~/.kube/config make start PROFILE=$PROFILE E2E_EXECUTOR=${{matrix.containerRuntimeExecutor}} DEV_IMAGE=true STATIC_FILES=false 2>&1 > /tmp/log/argo-e2e/argo.log &
if [ ${{matrix.test}} == test-e2e ]; then
PROFILE=mysql
fi
KUBECONFIG=~/.kube/config make start PROFILE=$PROFILE E2E_EXECUTOR=${{matrix.containerRuntimeExecutor}} ALWAYS_OFFLOAD_NODE_STATUS=${{matrix.alwaysOffloadNodeStatus}} DEV_IMAGE=true STATIC_FILES=false 2>&1 > /tmp/log/argo-e2e/argo.log &
- name: Install gotestsum
run: go install gotest.tools/gotestsum
- name: Wait for Argo Server to be ready
Expand Down
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ RUN_MODE := kubernetes
endif

ALWAYS_OFFLOAD_NODE_STATUS := false
ifeq ($(PROFILE),mysql)
ALWAYS_OFFLOAD_NODE_STATUS := true
endif
ifeq ($(PROFILE),postgres)
ALWAYS_OFFLOAD_NODE_STATUS := true
endif

override LDFLAGS += \
-X github.com/argoproj/argo.version=$(VERSION) \
Expand Down

0 comments on commit 72164f7

Please sign in to comment.