Merge "Add parser branch file"

diff --git a/jjb/apex/apex-project-jobs.yml b/jjb/apex/apex-project-jobs.yml
index 5807286..700ff60 100644 (file)
--- a/jjb/apex/apex-project-jobs.yml
+++ b/jjb/apex/apex-project-jobs.yml
@@ -9,6 +9,11 @@
           gs-pathname: ''
           concurrent-builds: 3
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          concurrent-builds: 3
+          disabled: false
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'

diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 3029322..3a693c8 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -12,6 +12,11 @@
           gs-pathname: ''
           verify-scenario: 'os-odl-nofeature-ha'
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          verify-scenario: 'os-odl-nofeature-ha'
+          disabled: false
       - danube: &danube
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4288356..a4c6860 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -28,6 +28,16 @@
           scenario_stream: 'master'
           disable_daily: false
           disable_promote: false
+      - fraser: &fraser
+          branch: 'stable/fraser'
+          gs-pathname: '/fraser'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-odl-nofeature-ha'
+          scenario_stream: 'fraser'
+          disable_daily: true
+          disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'
@@ -51,6 +61,42 @@
           disable_promote: true
 
     scenario:
+      - 'os-nosdn-nofeature-noha':
+          <<: *fraser
+      - 'os-nosdn-nofeature-ha':
+          <<: *fraser
+      - 'os-odl-nofeature-ha':
+          <<: *fraser
+      - 'os-odl-nofeature-noha':
+          <<: *fraser
+      - 'os-odl-bgpvpn-ha':
+          <<: *fraser
+      - 'os-ovn-nofeature-noha':
+          <<: *fraser
+      - 'os-nosdn-fdio-noha':
+          <<: *fraser
+      - 'os-nosdn-fdio-ha':
+          <<: *fraser
+      - 'os-nosdn-bar-ha':
+          <<: *fraser
+      - 'os-nosdn-bar-noha':
+          <<: *fraser
+      - 'os-nosdn-nofeature-ha-ipv6':
+          <<: *fraser
+      - 'os-nosdn-ovs_dpdk-noha':
+          <<: *fraser
+      - 'os-nosdn-ovs_dpdk-ha':
+          <<: *fraser
+      - 'os-nosdn-kvm_ovs_dpdk-noha':
+          <<: *fraser
+      - 'os-nosdn-kvm_ovs_dpdk-ha':
+          <<: *fraser
+      - 'os-odl-sfc-noha':
+          <<: *fraser
+      - 'os-odl-sfc-ha':
+          <<: *fraser
+      - 'os-nosdn-calipso-noha':
+          <<: *fraser
       - 'os-nosdn-nofeature-noha':
           <<: *danube
       - 'os-nosdn-nofeature-ha':
@@ -1071,6 +1117,159 @@
 # builder macros
 ########################
 
+# fraser Builder
+- builder:
+    name: apex-builder-fraser
+    builders:
+      - multijob:
+          name: Baremetal Deploy and Test Phase
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-odl-nofeature-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-odl-nofeature-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-ovn-nofeature-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-fdio-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-fdio-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-bar-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-bar-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-odl-sfc-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-odl-sfc-ha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-os-nosdn-calipso-noha-baremetal-fraser'
+              node-parameters: false
+              current-parameters: false
+              predefined-parameters: |
+                OPNFV_CLEAN=yes
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+
 # danube Builder
 - builder:
     name: apex-builder-danube
@@ -1635,6 +1834,11 @@
     triggers:
       - timed: '0 0 1-31/2 * *'
 
+- trigger:
+    name: 'apex-fraser'
+    triggers:
+      - timed: '0 0 2-30/2 * *'
+
 - trigger:
     name: 'apex-euphrates'
     triggers:

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 0bedd35..25b9cd9 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -28,6 +28,16 @@
           scenario_stream: 'master'
           disable_daily: false
           disable_promote: false
+      - fraser: &fraser
+          branch: 'stable/fraser'
+          gs-pathname: '/fraser'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-odl-nofeature-ha'
+          scenario_stream: 'fraser'
+          disable_daily: true
+          disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'
@@ -995,6 +1005,11 @@
     triggers:
       - timed: '0 0 1-31/2 * *'
 
+- trigger:
+    name: 'apex-fraser'
+    triggers:
+      - timed: '0 0 2-30/2 * *'
+
 - trigger:
     name: 'apex-euphrates'
     triggers:

diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 93ce931..58f1c64 100644 (file)
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -19,6 +19,25 @@ master:
   - 'os-odl-sfc-noha'
   - 'os-odl-sfc-ha'
   - 'os-nosdn-calipso-noha'
+fraser:
+  - 'os-nosdn-nofeature-noha'
+  - 'os-nosdn-nofeature-ha'
+  - 'os-odl-nofeature-ha'
+  - 'os-odl-nofeature-noha'
+  - 'os-odl-bgpvpn-ha'
+  - 'os-ovn-nofeature-noha'
+  - 'os-nosdn-fdio-noha'
+  - 'os-nosdn-fdio-ha'
+  - 'os-nosdn-bar-ha'
+  - 'os-nosdn-bar-noha'
+  - 'os-nosdn-nofeature-ha-ipv6'
+  - 'os-nosdn-ovs_dpdk-noha'
+  - 'os-nosdn-ovs_dpdk-ha'
+  - 'os-nosdn-kvm_ovs_dpdk-noha'
+  - 'os-nosdn-kvm_ovs_dpdk-ha'
+  - 'os-odl-sfc-noha'
+  - 'os-odl-sfc-ha'
+  - 'os-nosdn-calipso-noha'
 euphrates:
   - 'os-nosdn-nofeature-noha'
   - 'os-nosdn-nofeature-ha'

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index cc2dc5a..2eb27a6 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -20,8 +20,8 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: false
@@ -29,21 +29,22 @@
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
-    #        CI PODs
-    # -------------------------------
     pod:
+      # -------------------------------
+      #        CI PODs
+      # -------------------------------
       - baremetal:
           slave-label: daisy-baremetal
           <<: *master
       - virtual:
           slave-label: daisy-virtual
           <<: *master
-      # - baremetal:
-      #     slave-label: daisy-baremetal
-      #     <<: *euphrates
-      # - virtual:
-      #     slave-label: daisy-virtual
-      #     <<: *euphrates
+      - baremetal:
+          slave-label: daisy-baremetal
+          <<: *fraser
+      - virtual:
+          slave-label: daisy-virtual
+          <<: *fraser
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
@@ -53,9 +54,9 @@
       - zte-pod9:
           slave-label: zte-pod9
           <<: *master
-    # -------------------------------
-    #        None-CI PODs
-    # -------------------------------
+      - zte-pod9:
+          slave-label: zte-pod9
+          <<: *fraser
 
     # -------------------------------
     #       scenarios
@@ -191,9 +192,9 @@
           use-build-blocker: true
           blocking-jobs:
             - 'daisy-kolla-build-.*'
-            - '{installer}-(build|deploy|test)-daily-(euphrates|master)'
-            - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+            - '{installer}-(build|deploy|test)-daily-(fraser|master)'
+            - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
           block-level: 'NODE'
 
     parameters:
@@ -281,50 +282,50 @@
       - timed: ''
 
 # ----------------------------------------------
-# Triggers for job running on daisy-baremetal against euphrates branch
+# Triggers for job running on daisy-baremetal against fraser branch
 # ----------------------------------------------
 # Basic HA Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: '0 0 * * *'
 # Basic NOHA Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 # ODL Scenarios
 - trigger:
-    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
+    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: '0 20 * * *'
 # ovs_dpdk Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 
 # ----------------------------------------------
-# Triggers for job running on daisy-virtual against euphrates branch
+# Triggers for job running on daisy-virtual against fraser branch
 # ----------------------------------------------
 # Basic HA Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: '0 0 * * *'
 # Basic NOHA Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 # ODL Scenarios
 - trigger:
-    name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-odl-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: '0 20 * * *'
 # ovs_dpdk Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 
@@ -335,7 +336,7 @@
 - trigger:
     name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
     triggers:
-      - timed: '0 10,20 * * *'
+      - timed: '0 20 * * *'
 # Basic HA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'
@@ -351,3 +352,27 @@
     name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-master-trigger'
     triggers:
       - timed: ''
+
+# ----------------------------------------------
+# ZTE POD9 Triggers running against fraser branch
+# ----------------------------------------------
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: '0 10 * * *'
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: ''

diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index f729c38..ea57ab1 100755 (executable)
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -27,6 +27,12 @@ else
     CONFIG_REPO_NAME=pharos
 fi
 
+if [[  "$BRANCH" =~ "master" ]]; then
+    DOCTOR_OPT="-d 1"
+else
+    DOCTOR_OPT=""
+fi
+
 LABS_DIR=/var/tmp/opnfv-${CONFIG_REPO_NAME}
 
 echo "Cloning ${CONFIG_REPO_NAME} repo $BRANCH to $LABS_DIR"
@@ -35,7 +41,8 @@ git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/${CONFIG_REPO_NAME} \
     --quiet --branch $BRANCH $LABS_DIR
 
 DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $LABS_DIR \
-                -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO"
+                -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO \
+                $DOCTOR_OPT"
 
 # log info to console
 echo """

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index c4edd77..3ea74a9 100644 (file)
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -21,7 +21,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -94,7 +94,7 @@
       - email-jenkins-admins-on-failure
 
 - trigger:
-    name: 'daisy-kolla-build-euphrates-trigger'
+    name: 'daisy-kolla-build-fraser-trigger'
     triggers:
       - timed: '0 0 * * 0'
 
@@ -218,9 +218,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '{installer}-daily-(build|deploy|test)-(euphrates|master)'
-            - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+            - '{installer}-daily-(build|deploy|test)-(fraser|master)'
+            - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
           block-level: 'NODE'
 
     scm:

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index f304d0b..3a0a59f 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -19,7 +19,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -60,7 +60,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '{alias}-merge-(master|euphrates)'
+            - '{alias}-merge-(master|fraser)'
           block-level: 'NODE'
 
     scm:

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index 4100990..777b677 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -16,7 +16,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/functest/functest-docker.yml b/jjb/functest/functest-docker.yml
index 909c7b0..43fb4f0 100644 (file)
--- a/jjb/functest/functest-docker.yml
+++ b/jjb/functest/functest-docker.yml
@@ -12,6 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           disabled: false

diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh
index 4738121..323b325 100755 (executable)
--- a/jjb/functest/functest-env-presetup.sh
+++ b/jjb/functest/functest-env-presetup.sh
@@ -49,7 +49,7 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then
 elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
     if [[ ! "${BRANCH}" =~ "danube" ]]; then
         echo "Map mcp ssh_key"
-        export sshkey_vol="-v ${SSH_KEY}:/root/.ssh/id_rsa"
+        export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa"
     fi
 fi
 

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 6171a6a..628c13f 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -19,6 +19,21 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-baremetal-fraser-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-baremetal-master'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
+
 - parameter:
     name: 'apex-baremetal-euphrates-defaults'
     parameters:
@@ -65,6 +80,21 @@
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-virtual-fraser-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-virtual-master'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
+
 - parameter:
     name: 'apex-virtual-euphrates-defaults'
     parameters:

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 947b2f1..1e92fbf 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -13,8 +13,8 @@
     # -------------------------------
     # BRANCH ANCHORS
     # -------------------------------
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
@@ -31,7 +31,7 @@
     pod:
       - baremetal:
           slave-label: joid-baremetal
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
           slave-label: joid-baremetal
           <<: *master
@@ -232,9 +232,9 @@
 ########################
 # trigger macros
 ########################
-# os-nosdn-nofeature-ha trigger - branch: euphrates
+# os-nosdn-nofeature-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 2 * * *'
 # os-nosdn-nofeature-ha trigger - branch: master
@@ -242,9 +242,9 @@
     name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
       - timed: '5 2 * * *'
-# os-odl_l2-nofeature-ha trigger - branch: euphrates
+# os-odl_l2-nofeature-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 7 * * *'
 # os-odl_l2-nofeature-ha trigger - branch: master
@@ -252,9 +252,9 @@
     name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
       - timed: '5 7 * * *'
-# os-nosdn-lxd-noha trigger - branch: euphrates
+# os-nosdn-lxd-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 22 * * *'
 # os-nosdn-lxd-noha trigger - branch: master
@@ -262,9 +262,9 @@
     name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 22 * * *'
-# os-nosdn-lxd-ha trigger - branch: euphrates
+# os-nosdn-lxd-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 10 * * *'
 # os-nosdn-lxd-ha trigger - branch: master
@@ -272,9 +272,9 @@
     name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
     triggers:
       - timed: '5 10 * * *'
-# os-nosdn-nofeature-noha trigger - branch: euphrates
+# os-nosdn-nofeature-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 4 * * *'
 # os-nosdn-nofeature-noha trigger - branch: master
@@ -282,9 +282,9 @@
     name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 4 * * *'
-# k8-nosdn-nofeature-noha trigger - branch: euphrates
+# k8-nosdn-nofeature-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 15 * * *'
 # k8-nosdn-nofeature-noha trigger - branch: master
@@ -292,9 +292,9 @@
     name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 15 * * *'
-# k8-nosdn-lb-noha trigger - branch: euphrates
+# k8-nosdn-lb-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 20 * * *'
 # k8-nosdn-lb-noha trigger - branch: master
@@ -302,9 +302,9 @@
     name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 20 * * *'
-# k8-ovn-lb-noha trigger - branch: euphrates
+# k8-ovn-lb-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 17 * * *'
 # k8-ovn-lb-noha trigger - branch: master
@@ -312,9 +312,9 @@
     name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 17 * * *'
-# os-nosdn-openbaton-ha trigger - branch: euphrates
+# os-nosdn-openbaton-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 23 * * *'
 # os-nosdn-openbaton-ha trigger - branch: master
@@ -322,9 +322,9 @@
     name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
     triggers:
       - timed: '5 23 * * *'
-# os-ocl-nofeature-ha trigger - branch: euphrates
+# os-ocl-nofeature-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 13 * * *'
 # os-ocl-nofeature-ha trigger - branch: master
@@ -332,9 +332,9 @@
     name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger'
     triggers:
       - timed: '5 13 * * *'
-# os-ocl-nofeature-noha trigger - branch: euphrates
+# os-ocl-nofeature-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 16 * * *'
 # os-ocl-nofeature-noha trigger - branch: master
@@ -342,9 +342,9 @@
     name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 16 * * *'
-# k8-canal-lb-noha trigger - branch: euphrates
+# k8-canal-lb-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-k8-canal-lb-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 14 * * *'
 # k8-canal-lb-noha trigger - branch: master
@@ -352,9 +352,9 @@
     name: 'joid-k8-canal-lb-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 14 * * *'
-# k8-multus-lb-noha trigger - branch: euphrates
+# k8-multus-lb-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-k8-multus-lb-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 18 * * *'
 # k8-multus-lb-noha trigger - branch: master
@@ -362,9 +362,9 @@
     name: 'joid-k8-multus-lb-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 18 * * *'
-# k8-nosdn-lb_ceph-noha trigger - branch: euphrates
+# k8-nosdn-lb_ceph-noha trigger - branch: fraser
 - trigger:
-    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-euphrates-trigger'
+    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 18 * * *'
 # k8-nosdn-lb_ceph-noha trigger - branch: master
@@ -372,9 +372,9 @@
     name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger'
     triggers:
       - timed: '5 18 * * *'
-# os-ovn-nofeature-ha trigger - branch: euphrates
+# os-ovn-nofeature-ha trigger - branch: fraser
 - trigger:
-    name: 'joid-os-ovn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '5 19 * * *'
 # os-ovn-nofeature-ha trigger - branch: master

diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml
index 53bc3f3..2d1c7c9 100644 (file)
--- a/jjb/joid/joid-verify-jobs.yml
+++ b/jjb/joid/joid-verify-jobs.yml
@@ -13,7 +13,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index c5bf583..b0822cf 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -94,7 +94,7 @@
 
     wrappers:
       - timeout:
-          timeout: 30
+          timeout: 120
           abort: true
       - timestamps
 

diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 0ac5520..80893de 100644 (file)
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -11,12 +11,17 @@
     jobs:
       - 'opnfv-lint-verify-{stream}'
       - 'opnfv-yamllint-verify-{stream}'
+      - 'opnfv-pylint-verify-{stream}'
 
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - danube:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/releases/fraser/apex.yaml b/releases/fraser/apex.yaml
new file mode 100644 (file)
index 0000000..70f34fa
--- /dev/null
+++ b/releases/fraser/apex.yaml
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 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: apex
+project-type: installer
+release-model: stable
+upstream: https://wiki.openstack.org/wiki/TripleO
+
+branches:
+  - name: stable/fraser
+    location:
+      apex: b047099b609eac330486f23913e8046d0f22c1ab
+  - name: stable/fraser
+    location:
+      apex-tripleo-heat-templates: 01db62fd83df2af8b7d87280919a435ee43dc40f
+  - name: stable/fraser
+    location:
+      apex-puppet-tripleo: 7e42851739337960ff1255f9c84773aa13d47bc0
+  - name: stable/fraser
+    location:
+      apex-os-net-config: a301f9f0fff8b227562fdec639e66d76dafb4634
+
+release-notes: http://docs.opnfv.org/en/stable-euphrates/submodules/apex/docs/release/release-notes/release-notes.html

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

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

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

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

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

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

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