From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Tue, 16 Feb 2016 15:38:53 +0000 (+0000)
Subject: Merge "Add hardcoded list of CI PODs to avoid pushing logs from non-CI PODs"
X-Git-Tag: brahmaputra.1.0~34
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2c249637b266192c0375062b3af2a163cf434965;hp=eb74d4bec5e068f40b09b33c60fd3b55501d5bff;p=releng.git

Merge "Add hardcoded list of CI PODs to avoid pushing logs from non-CI PODs"
---

diff --git a/INFO b/INFO
index 5cb6782a1..768551d6a 100644
--- a/INFO
+++ b/INFO
@@ -15,7 +15,6 @@ Fatih Degirmenci (Ericsson, fatih.degirmenci@ericsson.com)
 Aric Gardner (Linux Foundation, agardner@linuxfoundation.org)
 Tim Rozet (Red Hat, trozet@redhat.com)
 Morgan Richomme (Orange, morgan.richomme@orange.com)
-Victor Laza (CloudBase Solutions, vlaza@cloudbasesolutions.com)
 Matthew Lijun (Huawei, matthew.lijun@huawei.com)
 Peter Bandzi (Cisco, pbandzi@cisco.com)
 Jose Lausuch (Ericsson, jose.lausuch@ericsson.com)
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index ef5bd41b8..1080cd278 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -367,7 +367,7 @@
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 10 * * *'
+        - timed: '0 10 * * */4'
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -391,7 +391,7 @@
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 10 * * *'
+        - timed: '0 10 * * */4'
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 9b04b048a..9765eb076 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -112,7 +112,7 @@
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: $JOB_TIMEOUT
+            timeout: 400
             abort: true
 
     parameters:
@@ -126,10 +126,6 @@
             default: 'os-odl_l2-nofeature-ha'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
-        - string:
-            name: JOB_TIMEOUT
-            default: '210'
-            description: "Job build timeout"
 
     scm:
         - git-scm:
diff --git a/utils/docs-build.sh b/utils/docs-build.sh
index 3c0e8bd80..4d95836d5 100755
--- a/utils/docs-build.sh
+++ b/utils/docs-build.sh
@@ -41,7 +41,7 @@ revision="$(git rev-parse --short HEAD)"
 rev_full="$(git rev-parse HEAD)"
 version="$(git describe --abbrev=0 2> /dev/null || echo draft) ($revision)"
 project="$(basename $(git rev-parse --show-toplevel))"
-html_notes="    Revision: $rev_full\n    Build date: |today|"
+html_notes="    Revision: $rev_full\n    Build date: $(date -u +'%Y-%m-%d')"
 default_conf='releng/docs/etc/conf.py'
 opnfv_logo='releng/docs/etc/opnfv-logo.png'