gpcheck: split tests into local and remote

Tag existing tests with @demo_cluster and @concourse_cluster
annotations. The @demo_cluster tag denotes the scenario can run
locally. The @concourse_cluster tag denotes the scenario that requires
a remote cluster.
Co-authored-by: NJamie McAtamney <jmcatamney@pivotal.io>
Authored-by: NKalen Krempely <kkrempely@pivotal.io>

concourse/pipelines/templates/gpdb-tpl.yml

@@ -10,7 +10,9 @@
 {% set CLI_TESTS = [
                       {'name': 'gpmovemirrors',
                        'use_concourse_cluster': true,
-                       'additional_ccp_vars': 'number_of_nodes: 4'}
+                       'additional_ccp_vars': 'number_of_nodes: 4'},
+                      {'name': 'gpcheck',
+                       'use_concourse_cluster': false}
                     ] %}
 
 ## ======================================================================
@@ -110,7 +112,6 @@ groups:
 {% endfor %}
   - gpaddmirrors
   - gpexpand
-  - gpcheck
   - gppkg
   - check_centos
 {% endif %}
@@ -291,7 +292,6 @@ groups:
 {% endfor %}
   - gpaddmirrors
   - gpexpand
-  - gpcheck
   - gppkg
   - check_centos
   - compile_gpdb_centos6
@@ -1895,30 +1895,21 @@ jobs:
     <<: *set_failed
 
 {% endfor %}
-- name: gpcheck
+
+{% for test_name in CLI_2_suites %}
+- name: [[ test_name ]]
   plan:
-  - aggregate: &gets_for_behave
+  - aggregate:
     - get: gpdb_src
       params:
         submodules:
-        - gpMgmt/bin/pythonSrc/ext
+          - gpMgmt/bin/pythonSrc/ext
       passed: [gate_cli_start]
     - get: bin_gpdb
       resource: bin_gpdb_centos6
       passed: [gate_cli_start]
       trigger: [[ test_trigger ]]
     - get: gpdb6-centos6-test
-  - task: gpcheck_as_gpadmin
-    file: gpdb_src/concourse/tasks/behave_gpdb.yml
-    image: gpdb6-centos6-test
-    params:
-      BEHAVE_TAGS: gpcheck_as_gpadmin
-      GPCHECK_SETUP: true
-
-{% for test_name in CLI_2_suites %}
-- name: [[ test_name ]]
-  plan:
-  - aggregate: *gets_for_behave
   - task: [[ test_name ]]
     file: gpdb_src/concourse/tasks/behave_gpdb.yml
     image: gpdb6-centos6-test
@@ -2326,7 +2317,6 @@ jobs:
       - pg_upgrade
       - gpaddmirrors
       - gpexpand
-      - gpcheck
       - gppkg
       - check_centos
       - interconnect
@@ -2350,7 +2340,6 @@ jobs:
  ##     - MADlib_Test_orca_centos6
  ##     - MADlib_Test_planner_centos6
       - gpexpand
-      - gpcheck
       - gppkg
       - check_centos
       - interconnect

concourse/scripts/behave_gpdb.bash

@@ -73,7 +73,7 @@ function _main() {
 
     time gen_env
 
-    if [ "$GPCHECK_SETUP" = "true" ]; then
+    if echo "$BEHAVE_TAGS" "$BEHAVE_FLAGS" | grep -q "gpcheck\b"; then
         time gpcheck_setup
     fi
 

concourse/tasks/behave_gpdb.yml

@@ -9,6 +9,5 @@ params:
   BEHAVE_TAGS: ""
   BEHAVE_FLAGS: ""
   BLDWRAP_POSTGRES_CONF_ADDONS: ""
-  GPCHECK_SETUP: false
 run:
   path: gpdb_src/concourse/scripts/behave_gpdb.bash

gpMgmt/test/behave/mgmt_utils/gpcheck.feature

 @gpcheck
 Feature: Test gpcheck
-    @gpcheck_as_gpadmin
+
+########################### @demo_cluster tests ###########################
+# The @demo_cluster tag denotes the scenario can run locally
+
+    @demo_cluster
     Scenario: Run gpcheck --local as non-root without ssh permission
         Given user does not have ssh permissions
         When the user runs "gpcheck --local"
@@ -8,14 +12,14 @@ Feature: Test gpcheck
         And gpcheck should print "gpcheck completing" to stdout
         And user has ssh permissions
 
-    @gpcheck_as_gpadmin
+    @demo_cluster
     Scenario: Run gpcheck --host as non root with ssh permissions
         Given we have exchanged keys with the cluster 
         When the user runs "gpcheck --host localhost" 
         Then gpcheck should return a return code of 0
         And gpcheck should print "gpcheck completing" to stdout
 
-    @gpcheck_as_gpadmin
+    @demo_cluster
     Scenario: Negative tests cases command line options with --local
         When the user runs "gpcheck --local --host foo"
         Then gpcheck should return a return code of 0