Merge "Update Tox JJB Command"

diff --git a/jjb/apex/apex-fetch-logs.sh b/jjb/apex/apex-fetch-logs.sh
new file mode 100755 (executable)
index 0000000..f25f456
--- /dev/null
+++ b/jjb/apex/apex-fetch-logs.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# log info to console
+echo "Fetching logs from overcloud. This could take some time..."
+echo "--------------------------------------------------------"
+echo
+
+if sudo opnfv-pyutil --fetch-logs; then
+  LOG_LOCATION=$(cat apex_util.log | grep 'Log retrieval complete' | grep -Eo '/tmp/.+$')
+  if [ -z "$LOG_LOCATION" ]; then
+      echo "WARNING: Unable to determine log location.  Logs will not be uploaded"
+      exit 0
+  else
+    UPLOAD_LOCATION="${GS_URL}/logs/${JOB_NAME}/${BUILD_NUMBER}/"
+    gsutil cp -r ${LOG_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log
+    echo "Logs available at https://${UPLOAD_LOCATION}/$(basename $LOG_LOCATION)"
+  fi
+else
+  echo "WARNING: Log retrieval failed.  No logs will be uploaded"
+  exit 0
+fi

diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 3a693c8..6f49ffd 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -32,7 +32,7 @@
 - job-template:
     name: 'apex-verify-unit-tests-{stream}'
 
-    node: 'apex-build-{stream}'
+    node: 'apex-build-master'
 
     concurrent: true
 
@@ -358,6 +358,20 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - multijob:
+          name: apex-fetch-logs
+          condition: ALWAYS
+          projects:
+            - name: 'apex-fetch-logs-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
 
 ########################
 # builder macros

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index a4c6860..ed7ba75 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -234,6 +234,35 @@
       - 'pike'
       - 'queens'
       - 'master'
+
+
+# Fetch Logs Job
+- job-template:
+    name: 'apex-fetch-logs-{stream}'
+
+    concurrent: true
+
+    disabled: false
+    scm:
+      - git-scm-gerrit
+    parameters:
+      - '{project}-{platform}-{stream}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+    # yamllint enable rule:line-length
+    properties:
+      - logrotate-default
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
+
+    builders:
+      - 'apex-fetch-logs'
+
 - job-template:
     name: 'apex-runner-cperf-{stream}'
 
@@ -442,6 +471,21 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - multijob:
+          name: apex-fetch-logs
+          condition: ALWAYS
+          projects:
+            - name: 'apex-fetch-logs-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
 
 # Baremetal Deploy and Test
 - job-template:
@@ -512,7 +556,19 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-
+      - multijob:
+          name: apex-fetch-logs
+          condition: ALWAYS
+          projects:
+            - name: 'apex-fetch-logs'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
     publishers:
       - groovy-postbuild:
           script:
@@ -1826,6 +1882,12 @@
       - shell:
           !include-raw: ./apex-deploy.sh
 
+- builder:
+    name: 'apex-fetch-logs'
+    builders:
+      - shell:
+          !include-raw: ./apex-fetch-logs.sh
+
 #######################
 # trigger macros
 ########################

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 25b9cd9..b0fc0d4 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -76,6 +76,35 @@
       - 'pike'
       - 'queens'
       - 'master'
+
+
+# Fetch Logs Job
+- job-template:
+    name: 'apex-fetch-logs-{stream}'
+
+    concurrent: true
+
+    disabled: false
+    scm:
+      - git-scm-gerrit
+    parameters:
+      - '{project}-{platform}-{stream}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - apex-parameter:
+          gs-pathname: '{gs-pathname}'
+    # yamllint enable rule:line-length
+    properties:
+      - logrotate-default
+      - throttle:
+          max-per-node: 1
+          max-total: 10
+          option: 'project'
+
+    builders:
+      - 'apex-fetch-logs'
+
 - job-template:
     name: 'apex-runner-cperf-{stream}'
 
@@ -284,6 +313,21 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - multijob:
+          name: apex-fetch-logs
+          condition: ALWAYS
+          projects:
+            - name: 'apex-fetch-logs-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
 
 # Baremetal Deploy and Test
 - job-template:
@@ -354,7 +398,19 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-
+      - multijob:
+          name: apex-fetch-logs
+          condition: ALWAYS
+          projects:
+            - name: 'apex-fetch-logs'
+              current-parameters: true
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
     publishers:
       - groovy-postbuild:
           script:
@@ -997,6 +1053,12 @@
       - shell:
           !include-raw: ./apex-deploy.sh
 
+- builder:
+    name: 'apex-fetch-logs'
+    builders:
+      - shell:
+          !include-raw: ./apex-fetch-logs.sh
+
 #######################
 # trigger macros
 ########################

diff --git a/jjb/clover/clover-project.yml b/jjb/clover/clover-project.yml
index b31f3de..9744688 100644 (file)
--- a/jjb/clover/clover-project.yml
+++ b/jjb/clover/clover-project.yml
@@ -18,6 +18,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 - job-template:
     name: 'clover-verify-{stream}'
@@ -32,7 +36,8 @@
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - 'opnfv-build-ubuntu-defaults'
 
@@ -133,7 +138,8 @@
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - node:
           name: SLAVE_NAME

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 8c04ffd..eba22dc 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -10,7 +10,7 @@
           gs-pathname: ''
           docker-tag: 'latest'
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           docker-tag: 'stable'

diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index a198751..9c7b5da 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -16,8 +16,8 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
@@ -40,10 +40,10 @@
           <<: *master
       - baremetal:
           slave-label: fuel-baremetal
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
@@ -102,15 +102,11 @@
       - scenario: os-odl_l2-bgpvpn-ha
         stream: master
       - scenario: os-odl_l2-bgpvpn-ha
-        stream: euphrates
+        stream: fraser
       - scenario: os-ovn-nofeature-noha
         stream: danube
-      - scenario: os-ovn-nofeature-noha
-        stream: euphrates
       - scenario: os-ovn-nofeature-ha
         stream: danube
-      - scenario: os-ovn-nofeature-ha
-        stream: euphrates
 
     jobs:
       - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -445,72 +441,80 @@
     triggers:
       - timed: ''
 # ----------------------------------------------
-# Triggers for job running on fuel-baremetal against euphrates branch
+# Triggers for job running on fuel-baremetal against fraser branch
 # ----------------------------------------------
 # HA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 20 * * *'
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 2 * * *'
 - trigger:
-    name: 'fuel-os-onos-sfc-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-onos-sfc-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 5 * * *'
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 8 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 17 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 20 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 12 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 8 * * *'
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-onos-sfc-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-onos-nofeature-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 # ----------------------------------------------
@@ -590,71 +594,79 @@
     triggers:
       - timed: ''  # '30 20 * * *'
 # ----------------------------------------------
-# Triggers for job running on fuel-virtual against euphrates branch
+# Triggers for job running on fuel-virtual against fraser branch
 # ----------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-odl-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-onos-sfc-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-onos-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 13 * * *'
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-odl-nofeature-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 18 * * *'
 - trigger:
-    name: 'fuel-os-onos-sfc-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-fraser-trigger'
+    triggers:
+      - timed: '5 23 * * *'
+- trigger:
+    name: 'fuel-os-onos-sfc-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '30 20 * * *'
 - trigger:
-    name: 'fuel-os-onos-nofeature-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-onos-nofeature-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 23 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '30 6 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 16 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-euphrates-trigger'
+    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 20 * * *'
 # ----------------------------------------------

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 9e890cd..fc49f63 100644 (file)
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -14,7 +14,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index 006b4d8..d81b0ce 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -13,7 +13,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/fuel/fuel-weekly-jobs.yml b/jjb/fuel/fuel-weekly-jobs.yml
index f21c586..459d0d1 100644 (file)
--- a/jjb/fuel/fuel-weekly-jobs.yml
+++ b/jjb/fuel/fuel-weekly-jobs.yml
@@ -16,8 +16,8 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
@@ -35,10 +35,10 @@
           <<: *master
       - baremetal:
           slave-label: fuel-baremetal
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
-          <<: *euphrates
+          <<: *fraser
     # -------------------------------
     #       scenarios
     # -------------------------------

diff --git a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml
index 97d1bae..0316ff7 100644 (file)
--- a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml
+++ b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml
@@ -9,6 +9,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/pharos/check-jinja2.yml b/jjb/pharos/check-jinja2.yml
index 3ef2f04..e3f0df7 100644 (file)
--- a/jjb/pharos/check-jinja2.yml
+++ b/jjb/pharos/check-jinja2.yml
@@ -15,6 +15,9 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           disabled: false

diff --git a/jjb/sfc/sfc-project-jobs.yml b/jjb/sfc/sfc-project-jobs.yml
index 82a2cfb..1fb4d99 100644 (file)
--- a/jjb/sfc/sfc-project-jobs.yml
+++ b/jjb/sfc/sfc-project-jobs.yml
@@ -16,6 +16,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/snaps/snaps-verify-jobs.yml b/jjb/snaps/snaps-verify-jobs.yml
index a6c86c9..44a1fbf 100644 (file)
--- a/jjb/snaps/snaps-verify-jobs.yml
+++ b/jjb/snaps/snaps-verify-jobs.yml
@@ -16,6 +16,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: true
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 - job-template:
     name: 'snaps-verify-{stream}'

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 7fd875b..01a154a 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -15,6 +15,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

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