CI: fix Concourse template for gpexpand

gpexpand requires centos6, ICW, and CLI jobs to be enabled, but it was
being included in the groups when only a subset of those requirements
was met, so fly refused the pipeline. With this change, centos6/CLI
pipelines should work again.

concourse/pipelines/gpdb_master-generated.yml

@@ -12,7 +12,7 @@
 ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline
 ## using appropriate tool (example: gen_pipeline.py -t prod).
 ## ----------------------------------------------------------------------
-## Generated by gen_pipeline.py at: 2019-04-19 10:07:01.309600
+## Generated by gen_pipeline.py at: 2019-04-22 11:38:41.346707
 ## Template file: gpdb-tpl.yml
 ## OS Types: ['centos6', 'centos7', 'sles', 'win', 'ubuntu16']
 ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'Extensions', 'Gpperfmon']
@@ -42,6 +42,7 @@ groups:
   - icw_gporca_centos6_gpos_memory
   - icw_planner_centos6
   - icw_planner_ictcp_centos6
+  - gpexpand
   - pg_upgrade
   - icw_gporca_centos7
   - icw_planner_centos7
@@ -78,7 +79,6 @@ groups:
   - gpcheckcat
   - gprecoverseg
   - gpaddmirrors
-  - gpexpand
   - check_centos
  ## ---------------------------------------------------------------------
   - icw_extensions_gpcloud_centos6
@@ -183,9 +183,9 @@ groups:
   - gpcheckcat
   - gprecoverseg
   - gpaddmirrors
-  - gpexpand
   - check_centos
   - compile_gpdb_centos6
+  - gpexpand
   - pg_upgrade
 
 

concourse/pipelines/templates/gpdb-tpl.yml

@@ -70,6 +70,7 @@ groups:
   - icw_planner_ictcp_centos6
 {% endif %}
 {% if "centos6" in os_types and "CLI" in test_sections %}
+  - gpexpand
   - pg_upgrade
 {% endif %}
 {% if "centos7" in os_types %}
@@ -122,7 +123,6 @@ groups:
 {% for test in CLI_BEHAVE_TESTS %}
   - [[ test.name ]]
 {% endfor %}
-  - gpexpand
   - check_centos
 {% endif %}
 {% if "AA" in test_sections %}
@@ -285,10 +285,10 @@ groups:
 {% for test in CLI_BEHAVE_TESTS %}
   - [[ test.name ]]
 {% endfor %}
-  - gpexpand
   - check_centos
   - compile_gpdb_centos6
 {% if "centos6" in os_types and "ICW" in test_sections %}
+  - gpexpand
   - pg_upgrade
 {% endif %}