Merge "[daisy] Stable branch creation for fraser"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 44cb84d..0d5f92c 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -14,13 +14,13 @@
       ppa-pathname: '/{stream}'
       disabled: false
       openstack-version: pike
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
       ppa-pathname: '/{stream}'
-      openstack-version: ocata
+      openstack-version: pike
     danube: &danube
       stream: danube
       branch: 'stable/{stream}'
@@ -45,11 +45,11 @@
       - baremetal:
           slave-label: compass-baremetal-branch
           os-version: 'xenial'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual-branch
           os-version: 'xenial'
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        master
       # -------------------------------
@@ -69,9 +69,6 @@
       - 'os-nosdn-nofeature-ha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-      - 'os-odl_l2-nofeature-ha':
-          disabled: false
-          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl_l3-nofeature-ha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
@@ -386,7 +383,7 @@
                 !include-raw-escape: ./compass-deploy.sh
       - conditional-step:
           condition-kind: regex-match
-          regex: (danube|euphrates)
+          regex: (danube|fraser)
           label: '{stream}'
           steps:
             - shell:
@@ -485,10 +482,6 @@
     name: 'compass-os-nosdn-openo-ha-baremetal-centos-master-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
@@ -582,10 +575,6 @@
     name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger'
-    triggers:
-      - timed: ''  # '0 21 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
@@ -678,10 +667,6 @@
     name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
@@ -701,7 +686,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 12 2-30/2 * *'
+      - timed: ''  # '0 12 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
@@ -764,98 +749,94 @@
       - timed: ''
 
 # -------------------
-# ha-baremetal-euphrates
+# ha-baremetal-fraser
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 1 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: '0 5 1-29/2 * *'
+      - timed: ''  # '0 5 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 13 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 9 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 21 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 
 # ---------------------
-# noha-baremetal-euphrates
+# noha-baremetal-fraser
 # ---------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 
@@ -870,10 +851,6 @@
     name: 'compass-os-nosdn-openo-ha-virtual-master-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -893,7 +870,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-      - timed: '30 12 1-29/2 * *'
+      - timed: ''  # '30 12 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
@@ -937,7 +914,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 18 2-30/2 * *'
+      - timed: ''  # '0 18 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
     triggers:
@@ -956,97 +933,93 @@
       - timed: '0 10 2-30/2 * *'
 
 # -----------------
-# ha-virtual-euphrates
+# ha-virtual-fraser
 # -----------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 22 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 20 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 16 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 14 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 18 2-30/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '5 1 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger'
     triggers:
-      - timed: ''  # '0 14 1-29/2 * *'
+      - timed: '0 15 1-29/2 * *'
 
 # -------------------
-# noha-virtual-euphrates
+# noha-virtual-fraser
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 15 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 12 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 12 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger'
     triggers:
-      - timed: ''  # '0 12 2-30/2 * *'
+      - timed: '0 13 2-30/2 * *'

diff --git a/jjb/functest/functest-kubernetes-project-jobs.yml b/jjb/functest/functest-kubernetes-project-jobs.yml
index 3eba5d1..5599906 100644 (file)
--- a/jjb/functest/functest-kubernetes-project-jobs.yml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yml
@@ -18,6 +18,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index e068a4f..b3ab3ca 100644 (file)
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -18,6 +18,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/releng/releng-release-create-branch.sh b/jjb/releng/releng-release-create-branch.sh
index 8375560..92be0e6 100644 (file)
--- a/jjb/releng/releng-release-create-branch.sh
+++ b/jjb/releng/releng-release-create-branch.sh
@@ -31,7 +31,7 @@ for release_file in $RELEASE_FILES; do
     NEW_FILES=$(git status --porcelain --untracked=no | cut -c4-)
     if [ -n "$NEW_FILES" ]; then
       git add $NEW_FILES
-      git commit -m "Create Stable Branch Jobs for $(basename $release_file .yaml)"
+      git commit -sm "Create Stable Branch Jobs for $(basename $release_file .yaml)"
       git push origin HEAD:refs/for/master
     fi
 done

diff --git a/releases/fraser/armband.yml b/releases/fraser/armband.yml
new file mode 100644 (file)
index 0000000..ae2e44d
--- /dev/null
+++ b/releases/fraser/armband.yml
@@ -0,0 +1,9 @@
+---
+project: armband
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      armband: 46040c0ab85aeba942b7ec7897b32243f859aac0

diff --git a/releases/fraser/barometer.yaml b/releases/fraser/barometer.yaml
new file mode 100644 (file)
index 0000000..1ff9085
--- /dev/null
+++ b/releases/fraser/barometer.yaml
@@ -0,0 +1,9 @@
+---
+project: barometer
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      barometer: 2d98d11d981dc9e6597532f130a241cd20cc963d

diff --git a/releases/fraser/clover.yaml b/releases/fraser/clover.yaml
new file mode 100644 (file)
index 0000000..91758cd
--- /dev/null
+++ b/releases/fraser/clover.yaml
@@ -0,0 +1,9 @@
+---
+project: clover
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      clover: 67b7fb49e6ea6ac9c2547af263355e5f1aeade42

diff --git a/releases/fraser/doctor.yaml b/releases/fraser/doctor.yaml
new file mode 100644 (file)
index 0000000..bc74a03
--- /dev/null
+++ b/releases/fraser/doctor.yaml
@@ -0,0 +1,9 @@
+---
+project: doctor
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      doctor: 06980156b3eed6a6e456d3105c70b68386c1dfb7

diff --git a/releases/fraser/fuel.yaml b/releases/fraser/fuel.yaml
new file mode 100644 (file)
index 0000000..d0b7b19
--- /dev/null
+++ b/releases/fraser/fuel.yaml
@@ -0,0 +1,9 @@
+---
+project: fuel
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      fuel: e083cf6350a227da161b07d2c68d9aa200611b32

diff --git a/releases/fraser/nfvbench.yaml b/releases/fraser/nfvbench.yaml
new file mode 100644 (file)
index 0000000..e573a8b
--- /dev/null
+++ b/releases/fraser/nfvbench.yaml
@@ -0,0 +1,9 @@
+---
+project: nfvbench
+project-type: tools
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      nfvbench: 34c00544f7f7dbfa49bbdcd83eca2936b60826c7

diff --git a/releases/fraser/sfc.yaml b/releases/fraser/sfc.yaml
new file mode 100644 (file)
index 0000000..d423020
--- /dev/null
+++ b/releases/fraser/sfc.yaml
@@ -0,0 +1,9 @@
+---
+project: sfc
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      sfc: 9dda531e8e9be93b930b89d45a395085fbcb61cc

diff --git a/releases/fraser/yardstick.yaml b/releases/fraser/yardstick.yaml
new file mode 100644 (file)
index 0000000..53bcfa6
--- /dev/null
+++ b/releases/fraser/yardstick.yaml
@@ -0,0 +1,9 @@
+---
+project: yardstick
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      yardstick: f19016b39b828f648a66adc305cce17f5146e922