Merge "jjb: xci: xci-verify-jobs: Fix block on bifrost jobs"

diff --git a/jjb/barometer/barometer-build.sh b/jjb/barometer/barometer-build.sh
index e40841b..5f78aae 100644 (file)
--- a/jjb/barometer/barometer-build.sh
+++ b/jjb/barometer/barometer-build.sh
@@ -11,6 +11,7 @@ echo
 cd ci
 ./install_dependencies.sh
 ./build_rpm.sh
+cp utility/rpms_list $WORKSPACE
 cd $WORKSPACE
 
 # save information regarding artifact into file

diff --git a/jjb/barometer/barometer-upload-artifact.sh b/jjb/barometer/barometer-upload-artifact.sh
index 0f639b5..f05dc2a 100644 (file)
--- a/jjb/barometer/barometer-upload-artifact.sh
+++ b/jjb/barometer/barometer-upload-artifact.sh
@@ -2,7 +2,7 @@
 set -o nounset
 set -o pipefail
 
-RPM_LIST=$WORKSPACE/ci/utilities/rpms_list
+RPM_LIST=$WORKSPACE/rpms_list
 RPM_WORKDIR=$WORKSPACE/rpmbuild
 RPM_DIR=$RPM_WORKDIR/RPMS/x86_64/
 cd $WORKSPACE/

diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
index 75d1698..ef0da7f 100644 (file)
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
@@ -116,12 +116,13 @@
 
     builders:
       - anteater-security-audit-weekly
-      - clean-workspace
 
     publishers:
       # defined in jjb/global/releng-macros.yml
       - 'email-{repo}-ptl':
           subject: 'OPNFV Security Scan Result: {repo}'
+      - workspace-cleanup:
+          fail-build: false
 
 - job-template:
     name: 'opnfv-security-audit-verify-{stream}'

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index d554f41..86f4c42 100644 (file)
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -869,7 +869,12 @@
     <<: *email_releng_ptl_defaults
 - publisher:
     name: 'email-releng-testresults-ptl'
-    <<: *email_releng_ptl_defaults
+    publishers:
+      - email-ext:
+          <<: *email_ptl_defaults
+          recipients: >
+            fatih.degirmenci@ericsson.com
+            feng.xiaowei@zte.com.cn
 - publisher:
     name: 'email-releng-utils-ptl'
     <<: *email_releng_ptl_defaults

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 92f7a34..947b2f1 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -316,12 +316,12 @@
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: '5 25 * * *'
+      - timed: '5 23 * * *'
 # os-nosdn-openbaton-ha trigger - branch: master
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
     triggers:
-      - timed: '5 25 * * *'
+      - timed: '5 23 * * *'
 # os-ocl-nofeature-ha trigger - branch: euphrates
 - trigger:
     name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger'

diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index db2fb8b..103069f 100644 (file)
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -7,7 +7,7 @@
     name: qtip-experimental-jobs
     project: qtip
     jobs:
-      - 'qtip-experimental-{stream}'
+      - 'qtip-experimental-{pod}-{stream}'
     stream:
       - master:
           branch: '{stream}'
@@ -18,12 +18,17 @@
           gs-pathname: '/{stream}'
           disabled: false
 
+    pod:
+      - zte-virtual6:
+          installer: fuel
+          pod: zte-virtual6
+
 ################################
 ## job templates
 #################################
 
 - job-template:
-    name: 'qtip-experimental-{stream}'
+    name: 'qtip-experimental-{pod}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -31,9 +36,8 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      # Pin the tests on zte-pod6 with MCP deployment
-      - fuel-defaults
-      - zte-virtual6-defaults
+      - '{installer}-defaults'
+      - '{pod}-defaults'
     scm:
       - git-scm-gerrit
 

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 8250bfe..1a27562 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -39,6 +39,10 @@
           project: 'releng-anteater'
           <<: *master
           <<: *other-receivers
+      - 'barometer':
+          project: 'barometer'
+          <<: *master
+          <<: *other-receivers
       - 'bottlenecks':
           project: 'bottlenecks'
           <<: *master
@@ -93,18 +97,17 @@
           project: 'yardstick'
           <<: *master
           <<: *other-receivers
-      # projects with jobs for Danube
-      - 'qtip':
-          project: 'qtip'
+      # projects with jobs for euphrates
+      - 'bottlenecks':
+          project: 'bottlenecks'
           <<: *euphrates
           <<: *other-receivers
-      - 'yardstick':
-          project: 'yardstick'
+      - 'nfvbench':
+          project: 'nfvbench'
           <<: *euphrates
           <<: *other-receivers
-      # projects with jobs for euphrates
-      - 'bottlenecks':
-          project: 'bottlenecks'
+      - 'qtip':
+          project: 'qtip'
           <<: *euphrates
           <<: *other-receivers
       - 'storperf-master':
@@ -137,8 +140,8 @@
           arch_tag: 'x86_64'
           <<: *euphrates
           <<: *storperf-receivers
-      - 'nfvbench':
-          project: 'nfvbench'
+      - 'yardstick':
+          project: 'yardstick'
           <<: *euphrates
           <<: *other-receivers
 

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index f8d39b2..bbce974 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -70,16 +70,15 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'xci-verify-{distro}-.*'
             - '.*-bifrost-verify.*-{type}'
+
           block-level: 'NODE'
 
     parameters:
       - string:
           name: PROJECT_REPO
           default: 'https://git.openstack.org/openstack/bifrost'
-      - string:
-          name: CLONE_LOCATION
-          default: '$WORKSPACE/bifrost'
       - string:
           name: DISTRO
           default: '{distro}'

diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index a86ba91..263f544 100755 (executable)
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -11,15 +11,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost
 git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci
 
-# checkout the patch
-cd $CLONE_LOCATION
+cd $WORKSPACE
 git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
 
 # combine opnfv and upstream scripts/playbooks
-/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/bifrost/
+/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/
 
 cd $WORKSPACE/releng-xci
 cat > bifrost_test.sh<<EOF
@@ -41,8 +39,11 @@ case ${DISTRO} in
        *suse*) VM_DISTRO=opensuse ;;
 esac
 
+export XCI_BUILD_CLEAN_VM_OS=false
+export XCI_UPDATE_CLEAN_VM_OS=true
+
 ./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
 
-rsync -a $WORKSPACE/releng-xci ${VM_DISTRO}_xci_vm:~/bifrost
+rsync -a $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
 
-ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost && ./bifrost_test.sh"
+ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh"

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 8e00b9c..238c4c6 100644 (file)
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -32,7 +32,7 @@ node_list=(\
 'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \
 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \
 'huawei-virtual5' 'huawei-virtual8' 'huawei-virtual9' \
-'zte-pod2' \
+'zte-pod2' 'zte-pod3' \
 'zte-virtual1')