Merge branch '2.7.x' into 3.0.x

Closes gh-36023
1 year ago · 1596f69601
parent 9db3c5a2f7 fff30efed5
commit 1596f69601
1 changed files with 3 additions and 0 deletions
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@ -399,6 +399,7 @@ jobs:
    trigger: false
  - task: stage
    image: ci-image
+    timeout: ((task-timeout))
    file: git-repo/ci/tasks/stage.yml
    params:
      RELEASE_TYPE: M
@ -421,6 +422,7 @@ jobs:
    trigger: false
  - task: stage
    image: ci-image
+    timeout: ((task-timeout))
    file: git-repo/ci/tasks/stage.yml
    params:
      RELEASE_TYPE: RC
@ -443,6 +445,7 @@ jobs:
    trigger: false
  - task: stage
    image: ci-image
+    timeout: ((task-timeout))
    file: git-repo/ci/tasks/stage.yml
    params:
      RELEASE_TYPE: RELEASE