diff --git a/gocd/slfo-stagings.gocd.yaml b/gocd/slfo-stagings.gocd.yaml index 4f9c448a4..b4cfdc837 100644 --- a/gocd/slfo-stagings.gocd.yaml +++ b/gocd/slfo-stagings.gocd.yaml @@ -9,7 +9,7 @@ pipelines: group: SLFO.Stagings lock_behavior: unlockWhenFinished timer: - spec: "0 0 * 0-23 * SUN" + spec: "0 0 0-23 ? * SUN" materials: scripts: auto_update: true @@ -30,7 +30,7 @@ pipelines: sleep 60 done - Freeze.stagings: - # 6 hours (at most 30 minutes per staging) + ## 6 hours (at most 30 minutes per staging) timeout: 360 resources: - staging-bot @@ -39,7 +39,7 @@ pipelines: set -eu export PYTHONPATH=$PWD/scripts for letter in A B C D E F G H S V Y ; do - # if the staging was frozen today, skip it + ## if the staging was frozen today, skip it if ! osc -A $STAGING_API meta attribute "${SLFO_PROJECT}:Staging:${letter}" --attribute OSRT:FreezeTime | grep $(date +%Y-%m-%d); then osc -A $STAGING_API staging freeze -p $SLFO_PROJECT $letter else diff --git a/gocd/slfo-stagings.gocd.yaml.erb b/gocd/slfo-stagings.gocd.yaml.erb index d86215a55..a65beb225 100644 --- a/gocd/slfo-stagings.gocd.yaml.erb +++ b/gocd/slfo-stagings.gocd.yaml.erb @@ -10,7 +10,7 @@ pipelines: group: SLFO.Stagings lock_behavior: unlockWhenFinished timer: - spec: "0 0 * 0-23 * SUN" + spec: "0 0 0-23 ? * SUN" materials: scripts: auto_update: true @@ -31,7 +31,7 @@ pipelines: sleep 60 done - Freeze.stagings: - # 6 hours (at most 30 minutes per staging) + ## 6 hours (at most 30 minutes per staging) timeout: 360 resources: - staging-bot @@ -40,7 +40,7 @@ pipelines: set -eu export PYTHONPATH=$PWD/scripts for letter in <% stagings.each do |letter| %><%= letter %> <% end -%>; do - # if the staging was frozen today, skip it + ## if the staging was frozen today, skip it if ! osc -A $STAGING_API meta attribute "${SLFO_PROJECT}:Staging:${letter}" --attribute OSRT:FreezeTime | grep $(date +%Y-%m-%d); then osc -A $STAGING_API staging freeze -p $SLFO_PROJECT $letter else