[armband] Cleanup Fraser jobs, sync with Fuel

[releng.git] / jjb / auto / auto.yaml

diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index 62f6ec2..3b47c47 100644 (file)
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -12,7 +12,11 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser: &fraser
+      - gambia:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -39,8 +43,9 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-      - '{installer}-{scenario}-{pod}-auto-daily-{stream}'
-      - '{installer}-deploy-{pod}-daily-{stream}'
+      - 'fuel-{scenario}-{pod}-auto-daily-{stream}'
+      - 'fuel-deploy-{pod}-daily-{stream}'
+      - 'auto-daily-{stream}'
       - 'auto-verify-{stream}'
       - 'auto-merge-{stream}'
 
@@ -48,7 +53,7 @@
 # job templates
 ########################
 - job-template:
-    name: '{installer}-{scenario}-{pod}-auto-daily-{stream}'
+    name: 'fuel-{scenario}-{pod}-auto-daily-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -64,8 +69,8 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '{installer}-os-.*?-{pod}-auto-daily-.*'
-          block-level: 'NODE'
+            - 'fuel-os-.*?-{pod}-auto-daily-.*'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -88,7 +93,7 @@
 
     builders:
       - trigger-builds:
-          - project: '{installer}-deploy-{pod}-daily-{stream}'
+          - project: 'fuel-deploy-{pod}-daily-{stream}'
             current-parameters: false
             predefined-parameters: |
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
@@ -96,6 +101,36 @@
             same-node: true
             block: true
 
+- job-template:
+    name: 'auto-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'auto-daily-.*'
+          blocking-level: 'NODE'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'intel-pod18-defaults'
+
+    scm:
+      - git-scm
+
+    triggers:
+      - timed: '0 16 * * *'
+
+    builders:
+      - shell: |
+          pwd
+          ./ci/build-auto.sh daily
+
 - job-template:
     name: 'auto-verify-{stream}'
 
@@ -206,3 +241,10 @@
     name: 'fuel-os-nosdn-onap-ha-auto-baremetal-fraser-trigger'
     triggers:
       - timed: ''
+# ---------------------------------------------------------------------
+# Auto CI Baremetal Triggers running against gambia branch
+# ---------------------------------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-onap-ha-auto-baremetal-gambia-trigger'
+    triggers:
+      - timed: ''