Move timestamps for cron scheduler to the project.yaml
Move 'disabled' option to the project.yaml
Change-Id: I32a0aa37503a266e58dcdcb45a1dc6a93788c872
Related-Prod: #PROD-34955
diff --git a/jobs/project.yaml b/jobs/project.yaml
index 84dd470..9956bf4 100644
--- a/jobs/project.yaml
+++ b/jobs/project.yaml
@@ -3,26 +3,42 @@
- project:
name: sre
jobs:
- - heat-cicd-pike-dvr-sl
- - heat-cicd-queens-contrail41-sl
- - heat-cicd-queens-dvr-sl
+ - heat-cicd-pike-dvr-sl:
+ disabled: false
+ trigger_time: H(5-30) 22 * * 1-7
+ - heat-cicd-queens-contrail41-sl:
+ disabled: false
+ trigger_time: H(5-30) 23 * * 1-7
+ - heat-cicd-queens-dvr-sl:
+ disabled: false
+ trigger_time: H(5-30) 21 * * 1-7
# ------- BM jobs -------
- - deploy_bm
+ - deploy_bm:
+ disabled: false
+ trigger_time: H(40-59) 0 * * 1-5
- bm-cicd-pike-ovs-maas
- bm-cicd-queens-ovs-maas
- heat-bm-cicd-pike-contrail-sl
- heat-bm-cicd-queens-contrail-sl
- released-bm-pike-ovs
# --- Released envs ------
- - deploy-released
+ - deploy-released:
+ disabled: false
+ trigger_time: H(20-30) 1 * * 1-5
- released-heat-cicd-pike-dvr-sl
- released-heat-cicd-pike-contrail41-sl
- released-heat-cicd-queens-dvr-sl
- released-heat-cicd-queens-contrail41-sl
# ----- Release Artifacts jobs ---
- - 2019.2.0-heat-cicd-pike-dvr-sl
- - 2019.2.0-heat-cicd-queens-contrail41-sl
- - 2019.2.0-heat-cicd-queens-dvr-sl
+ - 2019.2.0-heat-cicd-pike-dvr-sl:
+ disabled: true
+ trigger_time: H(5-30) 22 * * 1-7
+ - 2019.2.0-heat-cicd-queens-contrail41-sl:
+ disabled: true
+ trigger_time: H(5-30) 23 * * 1-7
+ - 2019.2.0-heat-cicd-queens-dvr-sl:
+ disabled: true
+ trigger_time: H(5-30) 21 * * 1-7
# - show_networks_used_by_libvirt - can't moved to JJB, node parameter is not supported
- maintenance-heat-cicd-pike-dvr-sl
- download-config-drive
diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index 8cd319c..d32fc93 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -2,10 +2,11 @@
project-type: pipeline
description: '{job-description}'
concurrent: false
- disabled: false
name: 2019.2.0-heat-cicd-pike-dvr-sl
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(5-30) 22 * * 1-7
+ - timed: '{obj:trigger_time}'
parameters:
- string:
default: heat-cicd-pike-dvr-sl
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index f5cd494..8e04a6b 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -2,10 +2,11 @@
project-type: pipeline
description: '{job-description}'
concurrent: false
- disabled: false
name: 2019.2.0-heat-cicd-queens-contrail41-sl
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(5-30) 23 * * 1-7
+ - timed: '{obj:trigger_time}'
parameters:
- string:
default: heat-cicd-queens-contrail41-sl
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index f24c3f0..e092203 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -2,10 +2,11 @@
project-type: pipeline
description: '{job-description}'
concurrent: false
- disabled: true
name: 2019.2.0-heat-cicd-queens-dvr-sl
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(5-30) 21 * * 1-7
+ - timed: '{obj:trigger_time}'
parameters:
- string:
default: heat-cicd-queens-dvr-sl
diff --git a/jobs/templates/deploy-released.yml b/jobs/templates/deploy-released.yml
index 2d809d9..ac17ec2 100644
--- a/jobs/templates/deploy-released.yml
+++ b/jobs/templates/deploy-released.yml
@@ -2,10 +2,11 @@
project-type: pipeline
description: '{job-description}'
concurrent: false
- disabled: false
sandbox: true
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(20-30) 1 * * 1-5
+ - timed: '{obj:trigger_time}'
name: deploy-released
parameters:
- text:
diff --git a/jobs/templates/deploy_bm.yml b/jobs/templates/deploy_bm.yml
index 6814972..94a406c 100644
--- a/jobs/templates/deploy_bm.yml
+++ b/jobs/templates/deploy_bm.yml
@@ -2,10 +2,11 @@
project-type: pipeline
description: '{job-description}'
concurrent: false
- disabled: false
sandbox: true
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(40-59) 0 * * 1-5
+ - timed: '{obj:trigger_time}'
name: deploy_bm
parameters:
- string:
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index b023fc1..5d02cdf 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -2,11 +2,12 @@
- job-template:
project-type: pipeline
concurrent: true
- disabled: true
description: '{job-description}'
name: heat-cicd-pike-dvr-sl
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(5-30) 22 * * 1-7
+ - timed: '{obj:trigger_time}'
properties:
- build-discarder:
days-to-keep: 60
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index a12cc74..9aa9c40 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -3,10 +3,11 @@
project-type: pipeline
description: '{job-description}'
concurrent: true
- disabled: true
name: heat-cicd-queens-contrail41-sl
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(5-30) 23 * * 1-7
+ - timed: '{obj:trigger_time}'
parameters:
- string:
default: heat-cicd-queens-contrail41-sl
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index eb1d853..44c352e 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -2,11 +2,12 @@
- job-template:
project-type: pipeline
concurrent: true
- disabled: true
name: heat-cicd-queens-dvr-sl
description: '{job-description}'
+ # 'disabled' and 'timed' option are defined in the project.yaml
+ disabled: '{obj:disabled}'
triggers:
- - timed: H(5-30) 21 * * 1-7
+ - timed: '{obj:trigger_time}'
parameters:
- string:
default: heat-cicd-queens-dvr-sl