Merge "jjb: xci: bifrost-verify.sh: Do not build OS images"

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/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')