Merge "Doctor stable/iruya"

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 9a8d809..8aa2936 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -17,8 +17,8 @@
       disabled: false
       gs-pathname: ''
       functest_docker_tag: iruya
-    hunter: &hunter
-      stream: hunter
+    iruya: &iruya
+      stream: iruya
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
@@ -37,10 +37,10 @@
           <<: *master
       - baremetal:
           slave-label: fuel-baremetal
-          <<: *hunter
+          <<: *iruya
       - virtual:
           slave-label: fuel-virtual
-          <<: *hunter
+          <<: *iruya
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
@@ -403,64 +403,64 @@
     triggers:
       - timed: ''
 # ----------------------------------------------
-# Triggers for job running on fuel-baremetal against hunter branch
+# Triggers for job running on fuel-baremetal against iruya branch
 # ----------------------------------------------
 # HA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 1,4,7'
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 5 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-sfc-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-sfc-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 6'
 - trigger:
-    name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-ovs-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 2'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 3,5'
 - trigger:
-    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 # ----------------------------------------------
@@ -524,63 +524,63 @@
     triggers:
       - timed: '5 16 * * *'
 # ----------------------------------------------
-# Triggers for job running on fuel-virtual against hunter branch
+# Triggers for job running on fuel-virtual against iruya branch
 # ----------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 13 * * *'
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 18 * * *'
 - trigger:
-    name: 'fuel-os-odl-sfc-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-sfc-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 4 * * 1,4'
 - trigger:
-    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 7 * * 2,5'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 23 * * *'
 - trigger:
-    name: 'fuel-os-odl-ovs-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-ovs-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 13 * * 6,7'
 - trigger:
-    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '5 13 * * 6,7'
 # ----------------------------------------------

diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml
index 5149038..a78bb1c 100644 (file)
--- a/jjb/fuel/fuel-docker-jobs.yaml
+++ b/jjb/fuel/fuel-docker-jobs.yaml
@@ -12,7 +12,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
 

diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml
index 3775be8..2a7cc5b 100644 (file)
--- a/jjb/fuel/fuel-rtd-jobs.yaml
+++ b/jjb/fuel/fuel-rtd-jobs.yaml
@@ -12,7 +12,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
 

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 0248907..dcc8b30 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -14,7 +14,7 @@
           gs-pathname: ''
           disabled: false
           functest_docker_tag: iruya
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/releases/iruya/fuel.yaml b/releases/iruya/fuel.yaml
new file mode 100644 (file)
index 0000000..fc8101c
--- /dev/null
+++ b/releases/iruya/fuel.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: fuel
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      fuel: d8f0a6b4fd9c3cb10780abcbd9b446c48b08cced