Merge "pass value to parameters"

diff --git a/jjb/apex/apex-unit-test.sh b/jjb/apex/apex-unit-test.sh
index 3112c9d..3f15847 100755 (executable)
--- a/jjb/apex/apex-unit-test.sh
+++ b/jjb/apex/apex-unit-test.sh
@@ -7,6 +7,8 @@ echo "Starting unit tests for Apex..."
 echo "---------------------------------------------------------------------------------------"
 echo
 
+PATH=$PATH:/usr/sbin
+
 
 pushd build/ > /dev/null
 for pkg in yamllint rpmlint iproute epel-release python34-devel python34-nose python34-PyYAML python-pep8 python34-mock python34-pip; do

diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 6b7271f..7dbd670 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -317,7 +317,7 @@
     builders:
       # yamllint disable rule:line-length
       - shell: |
-          echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os|k8s-.*$') > detected_scenario
+          echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo '(os|k8s)-.*$') > detected_scenario
       # yamllint enable rule:line-length
       - inject:
           properties-file: detected_scenario

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 8497203..587a063 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -82,16 +82,10 @@
           <<: *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':
@@ -496,6 +490,7 @@
       - multijob:
           name: 'Baremetal Deploy'
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'apex-deploy-baremetal-{scenario_stream}'
               node-parameters: true
@@ -505,7 +500,16 @@
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-fetch-logs-{scenario_stream}'
+              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
       - multijob:
@@ -1224,14 +1228,6 @@
               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
@@ -1248,22 +1244,6 @@
               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

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index dac7c3a..4620bbc 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -374,6 +374,7 @@
       - multijob:
           name: 'Baremetal Deploy'
           condition: SUCCESSFUL
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'apex-deploy-baremetal-{scenario_stream}'
               node-parameters: true
@@ -383,7 +384,16 @@
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
+              abort-all-job: true
+              git-revision: false
+            - name: 'apex-fetch-logs-{scenario_stream}'
+              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
       - multijob:

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index c74e3c8..0bf750b 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -250,6 +250,7 @@
           gs-pathname: '{gs-pathname}'
       - '{slave-label}-defaults':
           installer: '{installer}'
+      - testapi-parameter
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
@@ -262,6 +263,7 @@
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
+      - track-begin-timestamp
       - shell:
           !include-raw-escape: ../fuel/fuel-deploy.sh
 
@@ -269,6 +271,7 @@
       - email:
           recipients: armband@enea.com
       - email-jenkins-admins-on-failure
+      - report-provision-result
 
 ########################
 # trigger macros

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 0d5f92c..5f82803 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -790,7 +790,7 @@
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 5 1-29/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
     triggers:
@@ -802,7 +802,7 @@
 - trigger:
     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 7 2-30/2 * *'
 
 # ---------------------
 # noha-baremetal-fraser

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 444b173..c357ff6 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -14,14 +14,14 @@
           gs-pathname: ''
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'ocata'
+          openstack-version: 'pike'
           branch-type: 'master'
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'ocata'
+          openstack-version: 'pike'
           branch-type: 'master'
 
     distro:

diff --git a/jjb/container4nfv/container4nfv-arm64.yml b/jjb/container4nfv/container4nfv-arm64.yml
index 3246243..5f5bc86 100644 (file)
--- a/jjb/container4nfv/container4nfv-arm64.yml
+++ b/jjb/container4nfv/container4nfv-arm64.yml
@@ -4,6 +4,11 @@
     name: 'container4nfv-arm64'
     project: 'container4nfv'
     installer: 'compass'
+    stream:
+      - master:
+          branch: master
+      - fraser:
+          branch: stable/fraser
     scenario:
       - 'k8-multus-nofeature-noha':
           disabled: false
@@ -15,11 +20,11 @@
       - baremetal:
           slave-label: compass-baremetal-arm
     jobs:
-      - 'container4nfv-{scenario}-{pod}-daily-master'
+      - 'container4nfv-{scenario}-{pod}-daily-{stream}'
 
 
 - job-template:
-    name: 'container4nfv-{scenario}-{pod}-daily-master'
+    name: 'container4nfv-{scenario}-{pod}-daily-{stream}'
     disabled: '{obj:disabled}'
     concurrent: false
     node: '{slave-label}'
@@ -28,12 +33,12 @@
       - git:
           url: https://gerrit.opnfv.org/gerrit/compass4nfv
           branches:
-            - origin/master
+            - '{branch}'
           basedir: compass4nfv
           wipe-workspace: true
 
     triggers:
-      - 'trigger-{scenario}-{pod}'
+      - 'trigger-{scenario}-{pod}-{stream}'
 
     wrappers:
       - timeout:
@@ -53,19 +58,38 @@
 
 
 - trigger:
-    name: 'trigger-k8-multus-nofeature-noha-virtual'
+    name: 'trigger-k8-multus-nofeature-noha-virtual-master'
     triggers:
       - timed: '0 12 * * *'
 - trigger:
-    name: 'trigger-k8-sriov-nofeature-noha-virtual'
+    name: 'trigger-k8-sriov-nofeature-noha-virtual-master'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 15 * * *'
 
 - trigger:
-    name: 'trigger-k8-multus-nofeature-noha-baremetal'
+    name: 'trigger-k8-multus-nofeature-noha-virtual-fraser'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 18 * * *'
 - trigger:
-    name: 'trigger-k8-sriov-nofeature-noha-baremetal'
+    name: 'trigger-k8-sriov-nofeature-noha-virtual-fraser'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 21 * * *'
+
+
+- trigger:
+    name: 'trigger-k8-multus-nofeature-noha-baremetal-master'
+    triggers:
+      - timed: '0 12 * * *'
+- trigger:
+    name: 'trigger-k8-sriov-nofeature-noha-baremetal-master'
+    triggers:
+      - timed: '0 15 * * *'
+
+- trigger:
+    name: 'trigger-k8-multus-nofeature-noha-baremetal-fraser'
+    triggers:
+      - timed: '0 18 * * *'
+- trigger:
+    name: 'trigger-k8-sriov-nofeature-noha-baremetal-fraser'
+    triggers:
+      - timed: '0 21 * * *'

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 4eaa39a..593d21a 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -48,9 +48,12 @@
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
-      # - baremetal:
-      #     slave-label: zte-pod3
-      #     <<: *master
+      - zte-pod3:
+          slave-label: zte-pod3
+          <<: *master
+      - zte-pod3:
+          slave-label: zte-pod3
+          <<: *fraser
       - zte-pod9:
           slave-label: zte-pod9
           <<: *master
@@ -121,7 +124,9 @@
       - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
-      - 'deploy-scenario'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
 
     builders:
       - description-setter:
@@ -191,8 +196,8 @@
           blocking-jobs:
             - 'daisy-kolla-build-.*'
             - '{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)'
+            - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
           block-level: 'NODE'
 
     parameters:
@@ -328,6 +333,54 @@
     triggers:
       - timed: ''
 
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against master branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against fraser branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: '0 16,22 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+
 # ----------------------------------------------
 # ZTE POD9 Triggers running against master branch
 # ----------------------------------------------

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 3ea74a9..cb0dea1 100644 (file)
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -219,8 +219,8 @@
           use-build-blocker: true
           blocking-jobs:
             - '{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)'
+            - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
           block-level: 'NODE'
 
     scm:

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 1e92fbf..2719c72 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -316,7 +316,7 @@
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: '5 23 * * *'
+      - timed: ''  # Disabled as there is no branch for orchestra
 # os-nosdn-openbaton-ha trigger - branch: master
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 28f9354..ece8569 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -8,6 +8,8 @@
     stream:
       - master:
           branch: 'master'
+      - fraser:
+          branch: 'stable/{stream}'
       - danube:
           branch: 'stable/{stream}'
       - euphrates:

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 908ddba..5f08f69 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -17,6 +17,10 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
@@ -87,7 +91,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

diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index fb3bab4..19fb4b5 100644 (file)
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -129,6 +129,7 @@
           default-slaves:
             - lf-build1
             - lf-build2
+            - ericsson-build4
           allowed-multiselect: true
           ignore-offline-nodes: true
       - project-parameter:

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 2fb7c21..920ecdc 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -12,19 +12,19 @@
     # -------------------------------
     distro:
       - 'xenial':
-          disabled: false
+          disabled: true
           dib-os-release: 'xenial'
           dib-os-element: 'ubuntu-minimal'
           dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
       - 'centos7':
-          disabled: false
+          disabled: true
           dib-os-release: '7'
           dib-os-element: 'centos-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
       - 'opensuse423':
-          disabled: false
+          disabled: true
           dib-os-release: '42.3'
           dib-os-element: 'opensuse-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index fefa8e6..9814d47 100644 (file)
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -178,6 +178,11 @@
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
+      - zte-pod3:
+          slave-label: '{pod}'
+          installer: daisy
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *fraser
       - orange-pod2:
           slave-label: '{pod}'
           installer: joid