From 98990a6aef330a98ca5445fff45146923934e306 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 31 Mar 2020 07:04:21 +0000
Subject: [PATCH] engine: Enable build timeouts

Change-Id: I05fa038ab640f8e536e0554f169ba2a843ad8c4f
---
 .../engine-periodic-offline-deploy-test.yaml   | 18 ++++++++++--------
 .../engine-periodic-release-jobs.yaml          | 12 ++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
index 39c575d8..5dd5fcf1 100644
--- a/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
+++ b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
@@ -51,11 +51,11 @@
 
     phase:
       - deploy:
-          build-timeout: 90
+          build-timeout: 60
       - functest:
-          build-timeout: 240
+          build-timeout: 210
       - yardstick:
-          build-timeout: 120
+          build-timeout: 30
 
     jobs:
       - '{deploy-scenario}-{environment-type}-{distro}-{type}-periodic'
@@ -104,14 +104,14 @@
           option: project
 
     wrappers:
-#      - build-timeout:
-#          timeout: 550
+      - build-timeout:
+          timeout: 300
       - mask-passwords
       - fix-workspace-permissions
 
     builders:
       - description-setter:
-          description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
+          description: $DEPLOY_SCENARIO | $PROVISIONER_TYPE | $INSTALLER_TYPE
       - 'download-artifact-macro'
       - multijob:
           name: "Offline Deployment on {type}"
@@ -173,10 +173,12 @@
           option: project
 
     wrappers:
-#      - build-timeout:
-#          timeout: '{build-timeout}'
+      - build-timeout:
+          timeout: '{build-timeout}'
       - mask-passwords
       - fix-workspace-permissions
 
     builders:
+      - description-setter:
+          description: $DEPLOY_SCENARIO | $PROVISIONER_TYPE | $INSTALLER_TYPE
       - '{phase}-macro'
diff --git a/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml b/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
index f4c3bfef..b532b120 100644
--- a/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
+++ b/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
@@ -106,8 +106,8 @@
       - logrotate
 
     wrappers:
-#      - build-timeout:
-#          timeout: 180
+      - build-timeout:
+          timeout: 600
       - mask-passwords
       - fix-workspace-permissions
 
@@ -197,8 +197,8 @@
       - logrotate
 
     wrappers:
-#      - build-timeout:
-#          timeout: 70
+      - build-timeout:
+          timeout: 70
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
@@ -230,8 +230,8 @@
       - logrotate
 
     wrappers:
-#      - build-timeout:
-#          timeout: 70
+      - build-timeout:
+          timeout: 30
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
-- 
2.25.1