Merge "Create Stable Branch Jobs for opnfvdocs"

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index ba0e8ce..fb0dae1 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -2021,12 +2021,12 @@
 - trigger:
     name: 'master-master'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'master-rocky'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'master-queens'
@@ -2046,7 +2046,7 @@
 - trigger:
     name: 'gambia-queens'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'fraser-master'

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index b85356e..4d77f4a 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -1203,12 +1203,12 @@
 - trigger:
     name: 'master-master'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'master-rocky'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'master-queens'
@@ -1228,7 +1228,7 @@
 - trigger:
     name: 'gambia-queens'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'fraser-master'

diff --git a/jjb/storperf/storperf-daily-jobs.yaml b/jjb/storperf/storperf-daily-jobs.yaml
index fe6aebb..65e1d32 100644 (file)
--- a/jjb/storperf/storperf-daily-jobs.yaml
+++ b/jjb/storperf/storperf-daily-jobs.yaml
@@ -15,8 +15,8 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    fraser: &fraser
-      stream: fraser
+    gambia: &gambia
+      stream: gambia
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: false
@@ -69,7 +69,7 @@
       - baremetal:
           slave-label: apex-baremetal-master
           installer: apex
-          <<: *fraser
+          <<: *gambia
     ## armband CI PODs
     # - armband-baremetal:
     #     slave-label: armband-baremetal

diff --git a/jjb/storperf/storperf-verify-jobs.yaml b/jjb/storperf/storperf-verify-jobs.yaml
index 4d6b174..2acedd7 100644 (file)
--- a/jjb/storperf/storperf-verify-jobs.yaml
+++ b/jjb/storperf/storperf-verify-jobs.yaml
@@ -13,7 +13,7 @@
           gs-pathname: ''
           disabled: false
           docker-tag: 'latest'
-      - fraser: &fraser
+      - gambia: &gambia
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/storperf/storperf.yaml b/jjb/storperf/storperf.yaml
index fe57847..993094c 100644 (file)
--- a/jjb/storperf/storperf.yaml
+++ b/jjb/storperf/storperf.yaml
@@ -13,7 +13,7 @@
           gs-pathname: ''
           disabled: false
           docker-tag: 'latest'
-      - fraser: &fraser
+      - gambia: &gambia
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false