From 622624e817705b06d5cb135388063762dd3d8b4f Mon Sep 17 00:00:00 2001
From: Alex Collins <alexec@users.noreply.github.com>
Date: Tue, 12 Jan 2021 11:45:01 -0800
Subject: [PATCH] fix(controller): Add matrix tests for node offload disabled.
 Resolves #2333 (#4864)

Signed-off-by: Alex Collins <alex_collins@intuit.com>
---
 .github/workflows/ci-build.yaml | 17 ++++++++++++++---
 Makefile                        |  6 ------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index f54c9e4d1008..1af64fa79042 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -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
@@ -92,7 +100,7 @@ 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
@@ -100,7 +108,10 @@ jobs:
           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
diff --git a/Makefile b/Makefile
index 041ecd0c9be4..161ad2d14c31 100644
--- a/Makefile
+++ b/Makefile
@@ -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) \