Merge "[calipso] Create stable/fraser branch"

diff --git a/docs/infra/jenkins/jjb-usage.rst b/docs/infra/jenkins/jjb-usage.rst
index 2be2598..6712781 100644 (file)
--- a/docs/infra/jenkins/jjb-usage.rst
+++ b/docs/infra/jenkins/jjb-usage.rst
@@ -31,6 +31,12 @@ Test with tox::
 
     tox -v -ejjb
 
+.. note:: You can also test the jobs under a single jjb directory by
+    specifying the directory. For example to test only the releng jobs, you
+    could run:
+
+     tox -v -e jjb -- jjb/releng
+
 Submit the change to gerrit::
 
     git review -v

diff --git a/jjb/apex/apex-fetch-logs.sh b/jjb/apex/apex-fetch-logs.sh
new file mode 100755 (executable)
index 0000000..bdb2252
--- /dev/null
+++ b/jjb/apex/apex-fetch-logs.sh
@@ -0,0 +1,25 @@
+#!/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
+    sudo chmod 777 ${LOG_LOCATION}
+    UPLOAD_LOCATION="${GS_URL}/logs/${JOB_NAME}/${BUILD_NUMBER}/"
+    gsutil -m cp -r ${LOG_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log
+    echo -e "Logs available at: \n$(find ${LOG_LOCATION} -type f | sed -n 's#^/tmp/#http://'$UPLOAD_LOCATION'#p')"
+  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..79b3588 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
 
@@ -342,7 +342,7 @@
           properties-file: detected_scenario
       - multijob:
           name: functest-smoke
-          condition: SUCCESSFUL
+          condition: ALWAYS
           projects:
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
@@ -358,6 +358,19 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - multijob:
+          name: apex-fetch-logs
+          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..80ba50b 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -3,6 +3,7 @@
     name: 'apex'
     project: 'apex'
     jobs:
+      - 'apex-fetch-logs-{stream}'
       - 'apex-runner-cperf-{stream}'
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
@@ -234,6 +235,34 @@
       - 'pike'
       - 'queens'
       - 'master'
+
+
+# Fetch Logs Job
+- job-template:
+    name: 'apex-fetch-logs-{stream}'
+
+    concurrent: true
+
+    disabled: false
+    scm:
+      - git-scm-gerrit
+    parameters:
+      - 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}'
 
@@ -427,7 +456,7 @@
               git-revision: true
       - multijob:
           name: functest-smoke
-          condition: SUCCESSFUL
+          condition: ALWAYS
           projects:
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
@@ -442,6 +471,20 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - multijob:
+          name: apex-fetch-logs
+          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:
@@ -503,6 +546,7 @@
               git-revision: false
       - multijob:
           name: 'OPNFV Test Suite'
+          condition: ALWAYS
           projects:
             - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
               node-parameters: true
@@ -512,7 +556,18 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-
+      - multijob:
+          name: apex-fetch-logs
+          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 +1881,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..29a93b4 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -3,6 +3,7 @@
     name: 'apex'
     project: 'apex'
     jobs:
+      - 'apex-fetch-logs-{stream}'
       - 'apex-runner-cperf-{stream}'
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
@@ -76,6 +77,34 @@
       - 'pike'
       - 'queens'
       - 'master'
+
+
+# Fetch Logs Job
+- job-template:
+    name: 'apex-fetch-logs-{stream}'
+
+    concurrent: true
+
+    disabled: false
+    scm:
+      - git-scm-gerrit
+    parameters:
+      - 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}'
 
@@ -269,7 +298,7 @@
               git-revision: true
       - multijob:
           name: functest-smoke
-          condition: SUCCESSFUL
+          condition: ALWAYS
           projects:
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
@@ -284,6 +313,20 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
+      - multijob:
+          name: apex-fetch-logs
+          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:
@@ -345,6 +388,7 @@
               git-revision: false
       - multijob:
           name: 'OPNFV Test Suite'
+          condition: ALWAYS
           projects:
             - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
               node-parameters: true
@@ -354,7 +398,18 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-
+      - multijob:
+          name: apex-fetch-logs
+          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 +1052,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/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 1c5f148..c74e3c8 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -12,8 +12,8 @@
       branch: '{stream}'
       gs-pathname: ''
       disabled: false
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: false
@@ -33,16 +33,16 @@
     # -------------------------------
     # CI POD's
     # -------------------------------
-    #        euphrates
+    #        fraser
     # -------------------------------
     pod:
       # yamllint disable rule:key-duplicates
       - armband-baremetal:
           <<: *baremetal
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           <<: *virtual
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        master
       # -------------------------------
@@ -71,10 +71,6 @@
       - 'os-nosdn-nofeature-noha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
-    exclude:
-      - scenario: os-ovn-nofeature-ha
-        stream: euphrates
-
     jobs:
       - '{installer}-{scenario}-{pod}-daily-{stream}'
       - '{installer}-deploy-{pod}-daily-{stream}'
@@ -302,24 +298,28 @@
     triggers:
       - timed: '0 1 * * 1,3'
 # ---------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against euphrates branch
+# Enea Armband CI Baremetal Triggers running against fraser branch
 # ---------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 1 * * 4,6'
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 1 * * 2,5,7'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-fraser-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger'
+    triggers:
+      - timed: '0 1 * * 1,3'
 
 # --------------------------------------------------------------
 # Enea Armband CI Virtual Triggers running against master branch
@@ -345,21 +345,25 @@
     triggers:
       - timed: ''
 # -------------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against euphrates branch
+# Enea Armband CI Virtual Triggers running against fraser branch
 # -------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-fraser-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-odl-nofeature-ha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''

diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index 1ebb7df..c800872 100644 (file)
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-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/clover/clover-project.yml b/jjb/clover/clover-project.yml
index b31f3de..31eed8f 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'
 
@@ -79,7 +84,7 @@
       - git-scm
 
     triggers:
-      - timed: '0 11 * * *'
+      - timed: '0 8 * * *'
 
     wrappers:
       - fix-workspace-permissions
@@ -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
@@ -147,7 +153,7 @@
       - git-scm
 
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 9 * * *'
 
     builders:
       - shell: |

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 13830ce..dc935f0 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -20,7 +20,7 @@
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 8c04ffd..730c7fc 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'
@@ -119,6 +119,11 @@
     name: 'doctor-verify-{inspector}-{stream}'
     disabled: '{obj:disabled}'
     project-type: 'multijob'
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
     scm:
       - git-scm-gerrit
     triggers:

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/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index dfadf9a..72b94bd 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -28,12 +28,12 @@ check_os_deployment() {
 
 run_tiers() {
     tiers=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -r -t all"
-        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
-    else
+    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
         cmd_opt="prepare_env start && run_tests -r -t all"
         [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all"
+    else
+        cmd_opt="run_tests -r -t all"
+        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
     fi
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
@@ -58,10 +58,10 @@ run_tiers() {
 
 run_test() {
     test_name=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -t ${test_name}"
-    else
+    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
         cmd_opt="prepare_env start && run_tests -t ${test_name}"
+    else
+        cmd_opt="run_tests -t ${test_name}"
     fi
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
@@ -177,7 +177,6 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_
 
 set +e
 
-[[ ${BRANCH##*/} == "master" ]] && check_os_deployment
 if [ ${FUNCTEST_MODE} == 'testcase' ]; then
     echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}"
     run_test ${FUNCTEST_SUITE_NAME}

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 8ffbe9e..52e5b37 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -14,8 +14,8 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
     # -------------------------------
@@ -39,11 +39,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
@@ -56,11 +56,11 @@
       - baremetal:
           slave-label: joid-baremetal
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
@@ -73,11 +73,11 @@
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -88,13 +88,13 @@
           installer: apex
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -107,11 +107,11 @@
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
@@ -124,11 +124,11 @@
       - baremetal:
           slave-label: daisy-baremetal
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: daisy-virtual
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       # netvirt 3rd party ci
       - virtual:
           slave-label: odl-netvirt-virtual
@@ -164,7 +164,7 @@
       - zte-pod1:
           slave-label: '{pod}'
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
@@ -172,7 +172,7 @@
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
@@ -180,7 +180,7 @@
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod9:
           slave-label: '{pod}'
           installer: daisy

diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 9017354..419c4e0 100755 (executable)
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -42,17 +42,23 @@ DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*
 
 set +e
 
-FUNCTEST_IMAGE=opnfv/functest-kubernetes:${DOCKER_TAG}
-echo "Pulling Docker image ${FUNCTEST_IMAGE} ..."
-docker pull ${FUNCTEST_IMAGE}>/dev/null
-cmd_opt="run_tests -r -t all"
-cmd="docker run --rm ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
-echo "Running Functest k8s test cases, CMD: ${cmd}"
-eval ${cmd}
-ret_value=$?
-
 ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
 echo 0 > ${ret_val_file}
-if [ ${ret_value} != 0 ]; then
-  echo ${ret_value} > ${ret_val_file}
-fi
+
+FUNCTEST_IMAGES="\
+opnfv/functest-kubernetes-healthcheck:${DOCKER_TAG} \
+opnfv/functest-kubernetes-smoke:${DOCKER_TAG} \
+opnfv/functest-kubernetes-features:${DOCKER_TAG}"
+cmd_opt="run_tests -r -t all"
+
+for image in ${FUNCTEST_IMAGES}; do
+    echo "Pulling Docker image ${image} ..."
+    docker pull "${image}" >/dev/null
+    cmd="docker run --rm ${envs} ${volumes} ${image} /bin/bash -c '${cmd_opt}'"
+    echo "Running Functest k8s test cases, CMD: ${cmd}"
+    eval ${cmd}
+    ret_value=$?
+    if [ ${ret_value} != 0 ]; then
+        echo ${ret_value} > ${ret_val_file}
+    fi
+done

diff --git a/jjb/functest/functest-kubernetes-docker.yml b/jjb/functest/functest-kubernetes-docker.yml
new file mode 100644 (file)
index 0000000..2085251
--- /dev/null
+++ b/jjb/functest/functest-kubernetes-docker.yml
@@ -0,0 +1,182 @@
+---
+##############################################
+# job configuration for docker build and push
+##############################################
+- project:
+
+    name: functest-kubernetes-docker
+
+    project: functest-kubernetes
+
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          disabled: false
+
+    arch_tag:
+      - 'amd64':
+          slave_label: 'opnfv-build-ubuntu'
+
+    # yamllint disable rule:key-duplicates
+    image:
+      - 'core'
+      - 'healthcheck'
+      - 'smoke'
+      - 'features'
+
+    # settings for jobs run in multijob phases
+    build-job-settings: &build-job-settings
+      current-parameters: false
+      git-revision: true
+      node-parameters: false
+      predefined-parameters: |
+        PUSH_IMAGE=$PUSH_IMAGE
+        COMMIT_ID=$COMMIT_ID
+        GERRIT_REFNAME=$GERRIT_REFNAME
+        DOCKERFILE=$DOCKERFILE
+      kill-phase-on: FAILURE
+      abort-all-jobs: false
+
+    manifest-job-settings: &manifest-job-settings
+      current-parameters: false
+      git-revision: true
+      node-parameters: false
+      predefined-parameters:
+        GERRIT_REFNAME=$GERRIT_REFNAME
+      kill-phase-on: FAILURE
+      abort-all-jobs: false
+
+    # yamllint enable rule:key-duplicates
+    jobs:
+      - "functest-kubernetes-docker-{stream}"
+      - "functest-kubernetes-{image}-docker-build-{arch_tag}-{stream}"
+
+########################
+# job templates
+########################
+- job-template:
+    name: 'functest-kubernetes-docker-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+      - functest-kubernetes-job-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          slave_label: 'opnfv-build-ubuntu'
+          arch_tag: 'amd64'
+
+    properties:
+      - throttle:
+          max-per-node: 1
+          option: 'project'
+
+    scm:
+      - git-scm
+
+    triggers:
+      - pollscm:
+          cron: "*/30 * * * *"
+      - gerrit-trigger-tag-created:
+          project: '{project}'
+
+    builders:
+      - multijob:
+          name: 'build functest-kubernetes-core images'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-kubernetes-core-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+      - multijob:
+          name: 'build functest-kubernetes-[healthcheck,features] image'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-kubernetes-healthcheck-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-kubernetes-features-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+      - multijob:
+          name: 'build functest-kubernetes-smoke image'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-kubernetes-smoke-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+
+    publishers:
+      - 'functest-kubernetes-amd64-recipients'
+
+- job-template:
+    name: 'functest-kubernetes-{image}-docker-build-{arch_tag}-{stream}'
+    disabled: '{obj:disabled}'
+    parameters:
+      - functest-kubernetes-job-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          slave_label: '{slave_label}'
+          arch_tag: '{arch_tag}'
+    scm:
+      - git-scm
+    builders:
+      - shell: |
+          #!/bin/bash -ex
+          sudo amd64_dirs=docker/{image} bash ./build.sh
+          exit $?
+
+# parameter macro
+- parameter:
+    name: functest-kubernetes-job-parameters
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: '{slave_label}'
+          description: 'Slave label on Jenkins'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: PUSH_IMAGE
+          default: "true"
+          description: "To enable/disable pushing the image to Dockerhub."
+      - string:
+          name: COMMIT_ID
+          default: ""
+          description: "commit id to make a snapshot docker image"
+      - string:
+          name: GERRIT_REFNAME
+          default: ""
+          description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1"
+      - string:
+          name: DOCKERFILE
+          default: "Dockerfile"
+          description: "Dockerfile to use for creating the image."
+      - string:
+          name: ARCH_TAG
+          default: "{arch_tag}"
+          description: "If set, this value will be added to the docker image tag as a prefix"
+      - string:
+          name: PROJECT
+          default: "{project}"
+          description: "Project name used to enable job conditions"
+      - string:
+          name: REPO
+          default: "opnfv"
+          description: "Repository name for functest images"
+
+- publisher:
+    name: 'functest-kubernetes-amd64-recipients'
+    publishers:
+      - email:
+          recipients: >
+            jalausuch@suse.com morgan.richomme@orange.com
+            cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
+            juha.kosonen@nokia.com wangwulin@huawei.com
+            valentin.boucher@kontron.com

diff --git a/jjb/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml
index 5d572aa..c88fa00 100644 (file)
--- a/jjb/functest/functest-weekly-jobs.yml
+++ b/jjb/functest/functest-weekly-jobs.yml
@@ -16,11 +16,11 @@
       gs-pathname: ''
       docker-tag: 'latest'
       disabled: false
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-      docker-tag: 'stable'
+      docker-tag: '{stream}'
       disabled: false
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
@@ -43,11 +43,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
     # -------------------------------
     jobs:
       - 'functest-{installer}-{pod}-weekly-{stream}'

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 628c13f..5f003bf 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -1014,9 +1014,8 @@
             - 'doctor-fuel-aarch64'
             - 'doctor-joid-x86_64'
             - 'doctor-daisy-x86_64'
-            - 'not-specified'
           default-slaves:
-            - 'not-specified'
+            - 'doctor-apex-x86_64'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT

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/parser/parser.yml b/jjb/parser/parser.yml
index 8754419..b711985 100644 (file)
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.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/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/releng/opnfv-docker-arm.yml b/jjb/releng/opnfv-docker-arm.yml
index fbf5658..9d79ea5 100644 (file)
--- a/jjb/releng/opnfv-docker-arm.yml
+++ b/jjb/releng/opnfv-docker-arm.yml
@@ -15,6 +15,10 @@
       stream: euphrates
       branch: 'stable/{stream}'
       disabled: false
+    fraser: &fraser
+      stream: fraser
+      branch: 'stable/{stream}'
+      disabled: false
     dovetail-arm-receivers: &dovetail-arm-receivers
       receivers: >
           cristina.pauna@enea.com
@@ -93,35 +97,35 @@
           dockerdir: 'docker/storperf-master'
           docker_repo_name: 'opnfv/storperf-master'
           arch_tag: 'aarch64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-arm-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           docker_repo_name: 'opnfv/storperf-graphite'
           arch_tag: 'aarch64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-arm-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           docker_repo_name: 'opnfv/storperf-httpfrontend'
           arch_tag: 'aarch64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-arm-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           docker_repo_name: 'opnfv/storperf-reporting'
           arch_tag: 'aarch64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-arm-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           docker_repo_name: 'opnfv/storperf-swaggerui'
           arch_tag: 'aarch64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-arm-receivers
       - 'yardstick':
           project: 'yardstick'

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 5406bc8..81e7875 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -77,6 +77,36 @@
           project: 'bottlenecks'
           <<: *master
           <<: *other-receivers
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          <<: *master
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'cperf':
           project: 'cperf'
           <<: *master
@@ -134,15 +164,6 @@
           project: 'yardstick'
           <<: *master
           <<: *other-receivers
-      - 'functest-kubernetes':
-          project: 'functest-kubernetes'
-          <<: *master
-          <<: *other-receivers
-      # projects with jobs for fraser
-      - 'functest-kubernetes':
-          project: 'functest-kubernetes'
-          <<: *fraser
-          <<: *other-receivers
       # projects with jobs for euphrates
       - 'bottlenecks':
           project: 'bottlenecks'
@@ -160,31 +181,31 @@
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
           arch_tag: 'x86_64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           arch_tag: 'x86_64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           arch_tag: 'x86_64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           arch_tag: 'x86_64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           arch_tag: 'x86_64'
-          <<: *euphrates
+          <<: *fraser
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
@@ -195,7 +216,37 @@
           project: 'dovetail'
           <<: *danube
           <<: *other-receivers
-
+      # projects with jobs for fraser
+      - 'clover':
+          project: 'clover'
+          dockerdir: '.'
+          dockerfile: 'docker/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-lb':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-proxy':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-nginx-server':
+          project: 'clover'
+          dockerdir: 'samples/services/nginx/docker'
+          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
+      - 'clover-ns-snort-ids':
+          project: 'clover'
+          dockerdir: 'samples/services/snort_ids/docker'
+          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          <<: *fraser
+          <<: *other-receivers
     # yamllint enable rule:key-duplicates
     jobs:
       - "{dockerrepo}-docker-build-push-{stream}"

diff --git a/jjb/securedlab/check-jinja2.yml b/jjb/securedlab/check-jinja2.yml
index 155be17..f7a7941 100644 (file)
--- a/jjb/securedlab/check-jinja2.yml
+++ b/jjb/securedlab/check-jinja2.yml
@@ -15,7 +15,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - euphrates:
+      - fraser:
           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/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index aa98e07..78b7d44 100755 (executable)
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -55,12 +55,10 @@ export XCI_VENV=/home/devuser/releng-xci/venv
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
 echo "Running functest"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh"
+# Record exit code
+functest_exit=$?
 echo "Functest log"
 echo "---------------------------------------------------------------------------------"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat /root/results/functest.log"
 echo "---------------------------------------------------------------------------------"
-# check the log to see if we have any error
-if ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "grep -q 'FAIL' /root/results/functest.log"; then
-    echo "Error: Functest failed!"
-    exit 1
-fi
+exit ${functest_exit}

diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index c3012cd..3e64ab1 100755 (executable)
--- a/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@ -96,22 +96,22 @@ function determine_generic_scenario() {
 
     # get the changeset
     cd $WORKSPACE
-    CHANGESET=$(git diff HEAD^..HEAD --name-only)
-    for CHANGED_FILE in $CHANGESET; do
+    SCENARIOS=$(git diff HEAD^..HEAD --name-only -- 'xci/scenarios' | cut -d "/" -f 3 | uniq)
+    # We need to set default scenario for changes that do not mess with scenarios
+    NO_SCENARIOS=$(git diff HEAD^..HEAD --name-only | grep -v 'xci/scenarios' | cut -d "/" -f 3 | uniq)
+    for CHANGED_SCENARIO in $SCENARIOS; do
+        [[ ${DEPLOY_SCENARIO[@]} =~ $CHANGED_SCENARIO ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO
+    done
+    for CHANGED_FILE in $NO_SCENARIOS; do
         case $CHANGED_FILE in
-            *k8-nosdn*|*kubespray*)
+            kubespray)
                 [[ ${DEPLOY_SCENARIO[@]} =~ "k8-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature'
                 ;;
-            *os-odl*)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "os-odl-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-odl-nofeature'
-                ;;
-            *os-nosdn*|*osa*)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
-                ;;
+            # Default case (including OSA changes)
             *)
                 [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
                 ;;
-            esac
+        esac
     done
 
     # extract releng-xci sha

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 24c7f31..2eaa0fe 100644 (file)
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -15,8 +15,8 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '{stream}'
       docker-tag: 'stable'
@@ -41,15 +41,15 @@
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # fuel CI PODs
       - baremetal:
           slave-label: fuel-baremetal
@@ -65,12 +65,12 @@
           slave-label: fuel-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -86,12 +86,12 @@
           slave-label: armband-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
@@ -107,12 +107,12 @@
           slave-label: joid-baremetal
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
@@ -128,12 +128,12 @@
           slave-label: compass-baremetal
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
@@ -162,7 +162,7 @@
           slave-label: '{pod}'
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
@@ -330,7 +330,7 @@
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-virtual-euphrates'
+    name: 'yardstick-params-apex-virtual-fraser'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND
@@ -338,7 +338,7 @@
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-baremetal-euphrates'
+    name: 'yardstick-params-apex-baremetal-fraser'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index c036663..56e825e 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -17,7 +17,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -87,7 +87,8 @@
       - string:
           name: GS_URL
           default: '$GS_BASE{gs-pathname}'
-          description: "Directory where the build artifact will be located upon the completion     of the build."
+          description: "Directory where the build artifact will be located upon\
+            \ the completion of the build."
 
     scm:
       - git-scm
@@ -165,9 +166,17 @@
           set -o pipefail
 
           sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev
+          sudo apt-get install -y build-essential python-dev python3-dev rabbitmq-server
           sudo apt-get -y clean && sudo apt-get -y autoremove
 
+          echo "Configure RabbitMQ service"
+          sudo service rabbitmq-server restart
+          sudo rabbitmqctl start_app
+          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
+            sudo rabbitmqctl add_user yardstick yardstick
+            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
+          fi
+
           echo "Running functional tests in Python 2.7 ..."
           cd $WORKSPACE
           tox -efunctional
@@ -181,9 +190,17 @@
           set -o pipefail
 
           sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev
+          sudo apt-get install -y build-essential python-dev python3-dev rabbitmq-server
           sudo apt-get -y clean && sudo apt-get -y autoremove
 
+          echo "Configure RabbitMQ service"
+          sudo service rabbitmq-server restart
+          sudo rabbitmqctl start_app
+          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
+            sudo rabbitmqctl add_user yardstick yardstick
+            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
+          fi
+
           echo "Running functional tests in Python 3 ..."
           cd $WORKSPACE
           tox -efunctional-py3

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

diff --git a/releases/fraser/storperf.yaml b/releases/fraser/storperf.yaml
index 4a1734c..06a37f6 100644 (file)
--- a/releases/fraser/storperf.yaml
+++ b/releases/fraser/storperf.yaml
@@ -4,6 +4,6 @@ project-type: testing
 release-model: stable
 
 branches:
-  - name: stable/euphrates
+  - name: stable/fraser
     location:
       storperf: ce8adafbccb4bc37930f95561fa24874906013ad

diff --git a/tox.ini b/tox.ini
index d3489e5..6618a81 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -17,4 +17,4 @@ setenv=
 deps =
   jenkins-job-builder==1.6.1
 commands=
-  jenkins-jobs test -o job_output -r jjb/
+  jenkins-jobs test -o job_output -r jjb/global:{posargs:"jjb/"}