From 387cb70388cddd3ecd71f7b2a396dfdbf0ae0585 Mon Sep 17 00:00:00 2001 From: Ed Espino Date: Wed, 1 Aug 2018 17:15:30 +0000 Subject: [PATCH] Remove nightly triggers Replace trigger conditions so nightly jobs will still trigger Co-authored-by: Jason Vigil Co-authored-by: Kris Macoskey Co-authored-by: Ed Espino --- concourse/pipelines/5X_STABLE-generated.yml | 48 +++++---------------- concourse/pipelines/templates/gpdb-tpl.yml | 48 ++++----------------- 2 files changed, 19 insertions(+), 77 deletions(-) diff --git a/concourse/pipelines/5X_STABLE-generated.yml b/concourse/pipelines/5X_STABLE-generated.yml index c036479159..3e48c6d07e 100644 --- a/concourse/pipelines/5X_STABLE-generated.yml +++ b/concourse/pipelines/5X_STABLE-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: 2018-08-01 16:15:37.402065 +## Generated by gen_pipeline.py at: 2018-08-01 17:14:50.803811 ## Template file: gpdb-tpl.yml ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'] ## Test Sections: ['ICW', 'CS', 'MPP', 'MM', 'DPM', 'UD', 'FileRep', 'AA'] @@ -657,22 +657,6 @@ resources: secret_access_key: {{bucket-secret-access-key}} versioned_file: {{deb_package_ubuntu16_versioned_file}} -- name: nightly-trigger - type: time - source: - location: America/Los_Angeles - days: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday] - start: 6:00 AM - stop: 7:00 AM - -- name: nightly-trigger-aix - type: time - source: - location: America/Los_Angeles - days: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday] - start: 8:00 AM - stop: 9:00 AM - - name: madlib_ci type: git source: @@ -1263,9 +1247,8 @@ jobs: # We need to serialize this job to avoid overwhelming workload # on remote machine. - aggregate: - - get: nightly-trigger-aix - trigger: true - get: gpdb_src + trigger: true passed: [gate_compile_start] - get: gpaddon_src passed: [gate_compile_start] @@ -2830,8 +2813,6 @@ jobs: - name: DPM_backup-restore_ddboost_part1 plan: - - get: nightly-trigger - trigger: true - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2840,6 +2821,7 @@ jobs: tags: ["ddboost"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["ddboost"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2908,8 +2890,6 @@ jobs: - name: DPM_backup-restore_ddboost_part2 plan: - - get: nightly-trigger - trigger: true - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2918,6 +2898,7 @@ jobs: tags: ["ddboost"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["ddboost"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2986,8 +2967,6 @@ jobs: - name: DPM_backup-restore_ddboost_part3 plan: - - get: nightly-trigger - trigger: true - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2996,6 +2975,7 @@ jobs: tags: ["ddboost"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["ddboost"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -3064,9 +3044,6 @@ jobs: - name: DPM_backup-restore_netbackup_part1 plan: - - get: nightly-trigger - tags: ["netbackup"] - trigger: true - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -3075,6 +3052,7 @@ jobs: tags: ["netbackup"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["netbackup"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -3122,9 +3100,6 @@ jobs: - name: DPM_backup-restore_netbackup_part2 plan: - - get: nightly-trigger - tags: ["netbackup"] - trigger: true - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -3133,6 +3108,7 @@ jobs: tags: ["netbackup"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["netbackup"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -3180,9 +3156,6 @@ jobs: - name: DPM_backup-restore_netbackup_part3 plan: - - get: nightly-trigger - tags: ["netbackup"] - trigger: true - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -3191,6 +3164,7 @@ jobs: tags: ["netbackup"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["netbackup"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -3238,8 +3212,6 @@ jobs: - name: DPM_backup_43_restore_5 plan: - - get: nightly-trigger - trigger: true - *ccp_jitter_delay - aggregate: - get: gpdb_src @@ -3248,6 +3220,7 @@ jobs: - gpMgmt/bin/pythonSrc/ext passed: [gate_dpm_start] - get: gpdb_binary + trigger: true resource: bin_gpdb_centos6 passed: [gate_dpm_start] - get: gpdb4_binary @@ -3288,13 +3261,12 @@ jobs: - name: gptransfer-43x-to-5x plan: - - get: nightly-trigger - trigger: true - *ccp_jitter_delay - aggregate: - get: gpdb_src passed: [gate_dpm_start] - get: gpdb_binary + trigger: true resource: bin_gpdb_centos6 passed: [gate_dpm_start] - get: gpdb4_binary diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index 23ca8068e1..d50991aca9 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -691,24 +691,6 @@ resources: secret_access_key: {{bucket-secret-access-key}} versioned_file: {{deb_package_ubuntu16_versioned_file}} -{% if "DPM" in test_sections %} -- name: nightly-trigger - type: time - source: - location: America/Los_Angeles - days: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday] - start: 6:00 AM - stop: 7:00 AM - -{% endif %} -- name: nightly-trigger-aix - type: time - source: - location: America/Los_Angeles - days: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday] - start: 8:00 AM - stop: 9:00 AM - {% if "AA" in test_sections %} - name: madlib_ci type: git @@ -1303,9 +1285,8 @@ jobs: # We need to serialize this job to avoid overwhelming workload # on remote machine. - aggregate: - - get: nightly-trigger-aix - trigger: true - get: gpdb_src + trigger: true passed: [gate_compile_start] - get: gpaddon_src passed: [gate_compile_start] @@ -2489,8 +2470,6 @@ jobs: - name: DPM_backup-restore_ddboost_part1 plan: - - get: nightly-trigger - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2499,6 +2478,7 @@ jobs: tags: ["ddboost"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["ddboost"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2567,8 +2547,6 @@ jobs: - name: DPM_backup-restore_ddboost_part2 plan: - - get: nightly-trigger - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2577,6 +2555,7 @@ jobs: tags: ["ddboost"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["ddboost"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2645,8 +2624,6 @@ jobs: - name: DPM_backup-restore_ddboost_part3 plan: - - get: nightly-trigger - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2655,6 +2632,7 @@ jobs: tags: ["ddboost"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["ddboost"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2723,9 +2701,6 @@ jobs: - name: DPM_backup-restore_netbackup_part1 plan: - - get: nightly-trigger - tags: ["netbackup"] - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2734,6 +2709,7 @@ jobs: tags: ["netbackup"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["netbackup"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2781,9 +2757,6 @@ jobs: - name: DPM_backup-restore_netbackup_part2 plan: - - get: nightly-trigger - tags: ["netbackup"] - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2792,6 +2765,7 @@ jobs: tags: ["netbackup"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["netbackup"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2839,9 +2813,6 @@ jobs: - name: DPM_backup-restore_netbackup_part3 plan: - - get: nightly-trigger - tags: ["netbackup"] - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: ccp_src @@ -2850,6 +2821,7 @@ jobs: tags: ["netbackup"] passed: [gate_dpm_start] - get: gpdb_binary + trigger: true tags: ["netbackup"] resource: bin_gpdb_centos6 passed: [gate_dpm_start] @@ -2897,8 +2869,6 @@ jobs: - name: DPM_backup_43_restore_5 plan: - - get: nightly-trigger - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: gpdb_src @@ -2907,6 +2877,7 @@ jobs: - gpMgmt/bin/pythonSrc/ext passed: [gate_dpm_start] - get: gpdb_binary + trigger: true resource: bin_gpdb_centos6 passed: [gate_dpm_start] - get: gpdb4_binary @@ -2947,13 +2918,12 @@ jobs: - name: gptransfer-43x-to-5x plan: - - get: nightly-trigger - trigger: [[ test_trigger ]] - *ccp_jitter_delay - aggregate: - get: gpdb_src passed: [gate_dpm_start] - get: gpdb_binary + trigger: true resource: bin_gpdb_centos6 passed: [gate_dpm_start] - get: gpdb4_binary -- GitLab