Merge branch '3.0.x' into 3.1.x

Closes gh-36025
2023-06-22 10:04:11 +01:00
parent 31f218c4e0 1596f69601
commit 5c53bda650
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