From 876296dc0fb976f99291a74084916224210b8e50 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 19 Nov 2018 10:46:21 +0800
Subject: [PATCH] Update to global-jjb v0.27.0

Change-Id: I4720b20c6262a02eb305ef13c8839bcf2d51d8b3
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 global-jjb                                 |   2 +-
 jjb/autorelease/autorelease-templates.yaml |   5 +
 jjb/integration/integration-test-jobs.yaml |   2 +
 jjb/releng-view-templates.yaml             | 116 ---------------------
 4 files changed, 8 insertions(+), 117 deletions(-)
 delete mode 100644 jjb/releng-view-templates.yaml

diff --git a/global-jjb b/global-jjb
index 5d1ddb578..8b56734ea 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 5d1ddb578a5253fc360a73be6ceea89d65af043e
+Subproject commit 8b56734eada742094399d6e52cbc2ddef7b39b2c
diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 69c2e09d6..4a320b8ca 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -38,6 +38,7 @@
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -240,6 +241,7 @@
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -302,6 +304,7 @@
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     triggers:
@@ -389,6 +392,7 @@
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -452,6 +456,7 @@
           refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index c08b32611..3ae1fb43d 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -513,6 +513,7 @@
 
     git-url: '$GIT_URL/$PROJECT'
     submodule-recursive: true
+    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -543,6 +544,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     wrappers:
diff --git a/jjb/releng-view-templates.yaml b/jjb/releng-view-templates.yaml
deleted file mode 100644
index d19b1b1e6..000000000
--- a/jjb/releng-view-templates.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
----
-# TODO: Remove this files after the next global-jjb 2.6.x release
-# which supports the view-templates.
-# This file is temporariy added here from the below changes from global-jjb.
-# This file is included here to avoid rebases.
-# https://gerrit.linuxfoundation.org/infra/#/c/13268
-# https://gerrit.linuxfoundation.org/infra/#/c/12989
-
-########################
-# common view template #
-########################
-
-- lf_view_common_columns: &lf_view_common_columns
-    name: lf-view-common-columns
-
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - jacoco
-      - find-bugs
-
-- view-template:
-    id: 'common-view'
-    name: '{view-name}'
-
-    ######################
-    # Default parameters #
-    ######################
-
-    view-description: 'View using common-view template.'
-    view-filter-executors: false
-    view-filter-queue: false
-    view-recurse: false
-
-    ######################
-    # view Configuration #
-    ######################
-
-    view-type: list
-    description: '{view-description}'
-    filter-executors: '{view-filter-executors}'
-    filter-queue: '{view-filter-queue}'
-    recurse: '{view-recurse}'
-    regex: '{view-regex}'
-    <<: *lf_view_common_columns
-
-######################
-# CSIT view template #
-######################
-
-- view-template:
-    id: 'csit-view'
-    name: '{view-name}'
-
-    ######################
-    # Default parameters #
-    ######################
-
-    view-description: 'CSIT jobs.'
-    view-filter-executors: false
-    view-filter-queue: false
-    view-recurse: false
-
-    ######################
-    # view Configuration #
-    ######################
-
-    view-type: list
-    description: '{view-description}'
-    filter-executors: '{view-filter-executors}'
-    filter-queue: '{view-filter-queue}'
-    recurse: '{view-recurse}'
-    regex: '{view-regex}'
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - robot-list
-
-#########################
-# project view template #
-#########################
-
-- view-template:
-    id: 'project-view'
-    name: '{project-name}'
-
-    ######################
-    # Default parameters #
-    ######################
-
-    view-filter-executors: false
-    view-filter-queue: false
-    view-recurse: false
-
-    ######################
-    # view Configuration #
-    ######################
-
-    view-type: list
-    description: 'List of jobs for {project-name}.'
-    filter-executors: '{view-filter-executors}'
-    filter-queue: '{view-filter-queue}'
-    recurse: '{view-recurse}'
-    regex: '^{project-name}-.*'
-    <<: *lf_view_common_columns
-
-- 
2.36.6