From 722da0a2d498bcb04c909db45a888887cbb588bc Mon Sep 17 00:00:00 2001 From: Jesse Zhang Date: Mon, 16 Nov 2020 08:17:10 -0800 Subject: [PATCH] Fix up CI unit_tests_gporca job reference, take two Commit de7eaa9d595fa3a7 erroneously added as a passing condition the new job "unit_tests_gporca" to the compiled binary bin_gpdb_*. This led to a pipeline validation failure because the orca unit test job does not really do anything to the compiled binary. Commit 1bc0a5483a4249e0 attempted to fix that by doubling down on pretending the unit test job *does* depend on the binary as an input. But it changed only the generated pipeline YAML, not the template. This patch fixes the pipeline validation with the right fix: we only need the unit tests job as a passing condition for the GPDB source code resource, not the binary. --- concourse/pipelines/gpdb_master-generated.yml | 10 ++-------- concourse/pipelines/templates/gpdb-tpl.yml | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/concourse/pipelines/gpdb_master-generated.yml b/concourse/pipelines/gpdb_master-generated.yml index a98901b994..7acd671ca1 100644 --- a/concourse/pipelines/gpdb_master-generated.yml +++ b/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: 2020-11-11 15:30:14.058027 +## Generated by gen_pipeline.py at: 2020-11-16 08:15:16.015495 ## Template file: gpdb-tpl.yml ## OS Types: ['centos6', 'centos7', 'ubuntu18.04', 'win'] ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'Extensions'] @@ -858,10 +858,6 @@ jobs: - get: gpdb_src passed: [compile_gpdb_centos7] trigger: true - - get: bin_gpdb - resource: bin_gpdb_centos7 - passed: [compile_gpdb_centos7] - trigger: true - get: gpdb7-centos7-build - task: unit_tests_gporca file: gpdb_src/concourse/tasks/unit_tests_gporca.yml @@ -958,7 +954,6 @@ jobs: - icw_gporca_icproxy_centos7 - icw_planner_icproxy_centos7 - icw_gporca_ictcp_centos7 - - unit_tests_gporca_centos7 - icw_extensions_gpcloud_centos7 - get: icw_planner_centos7_dump passed: @@ -3333,7 +3328,6 @@ jobs: - icw_extensions_gpcloud_centos7 - resource_group_centos7 - cli_cross_subnet - - unit_tests_gporca_centos7 - gpmovemirrors - gppkg - analyzedb @@ -3468,7 +3462,7 @@ jobs: - get: greenplum-database-release - get: license_file - task: create_gpdb_rpm_package_centos7 - file: greenplum-database-release/ci/concourse/tasks/build_gpdb_rpm.yml + file: greenplum-database-release/ci/concourse/tasks/build-gpdb-rpm.yml image: gpdb7-centos7-build input_mapping: bin_gpdb: bin_gpdb_centos7 diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index fb4941ee8a..6e98d7b766 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -1112,7 +1112,6 @@ jobs: - icw_gporca_icproxy_centos7 - icw_planner_icproxy_centos7 - icw_gporca_ictcp_centos7 - - unit_tests_gporca_centos7 {% if "Extensions" in test_sections %} - icw_extensions_gpcloud_centos7 {% endif %} @@ -1863,7 +1862,6 @@ jobs: - icw_extensions_gpcloud_centos7 - resource_group_centos7 - cli_cross_subnet - - unit_tests_gporca_centos7 {% for test in CLI_BEHAVE_TESTS %} - [[ test.name ]] {% endfor %} -- GitLab