From e5db6dc409dfc329dfb7238ea42a840452d6a19e Mon Sep 17 00:00:00 2001
From: Erica Portnoy <ebportnoy@gmail.com>
Date: Wed, 22 Jun 2022 16:58:29 -0700
Subject: [PATCH] Use a different timeout for nightly vs daytime (release and
 extended) builds

---
 .azure-pipelines/advanced-test.yml                 | 1 +
 .azure-pipelines/nightly.yml                       | 1 +
 .azure-pipelines/release.yml                       | 1 +
 .azure-pipelines/templates/jobs/packaging-jobs.yml | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/advanced-test.yml b/.azure-pipelines/advanced-test.yml
index e2342630f..9915881ce 100644
--- a/.azure-pipelines/advanced-test.yml
+++ b/.azure-pipelines/advanced-test.yml
@@ -9,6 +9,7 @@ variables:
   # We don't publish our Docker images in this pipeline, but when building them
   # for testing, let's use the nightly tag.
   dockerTag: nightly
+  snapBuildTimeout: 5400
 
 stages:
   - template: templates/stages/test-and-package-stage.yml
diff --git a/.azure-pipelines/nightly.yml b/.azure-pipelines/nightly.yml
index dd2930c41..05534e216 100644
--- a/.azure-pipelines/nightly.yml
+++ b/.azure-pipelines/nightly.yml
@@ -11,6 +11,7 @@ schedules:
 
 variables:
   dockerTag: nightly
+  snapBuildTimeout: 19800
 
 stages:
   - template: templates/stages/test-and-package-stage.yml
diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml
index eaa9be0fd..26639151f 100644
--- a/.azure-pipelines/release.yml
+++ b/.azure-pipelines/release.yml
@@ -8,6 +8,7 @@ pr: none
 
 variables:
   dockerTag: ${{variables['Build.SourceBranchName']}}
+  snapBuildTimeout: 5400
 
 stages:
   - template: templates/stages/test-and-package-stage.yml
diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index f6d79412f..5545e559d 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -149,7 +149,7 @@ jobs:
           git config --global user.name "$(Build.RequestedFor)"
           mkdir -p ~/.local/share/snapcraft/provider/launchpad
           cp $(credentials.secureFilePath) ~/.local/share/snapcraft/provider/launchpad/credentials
-          python3 tools/snap/build_remote.py ALL --archs ${SNAP_ARCH} --timeout 5400
+          python3 tools/snap/build_remote.py ALL --archs ${SNAP_ARCH} --timeout $(snapBuildTimeout)
         displayName: Build snaps
       - script: |
           set -e