Merge "Fail with helpful message if RPM not found"

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 9cdddc543add1206d93c676a4d7afe373ce05e6c..4179e504454712cb6daf939953fcb0e6f33902b6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -36,4 +36,4 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23h'
+    robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index e7ae4f40ba56b8d2610660e72a2083661890fc59..e25dde647bb5f92d1e0183fd9a58335236baf456 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -25,7 +25,9 @@
           scope: 'only'
 
     # Job images
+    odl_system_flavor: 'v1-performance-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+    tools_system_flavor: 'v1-performance-2'
 
     # Features to install
     install-features: >

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index 5d2b55c21a4bc74753a66fe06a9475776ed117b8..64c8ff1f08db2eaead6dd80e5e7c7b4f068d244b 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -41,8 +41,8 @@ elif  [ "$SILO" == "releng" ]; then
   # Move RPMs (SRPM and noarch) to dir of files that will be uploaded to Nexus
   UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
   mkdir -p "$UPLOAD_FILES_PATH"
-  mv "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
-  mv "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
+  cp "/home/$USER/rpmbuild/RPMS/noarch/"*.rpm "$_"
+  cp "/home/$USER/rpmbuild/SRPMS/"*.rpm "$_"
 else
   echo "Unknown Jenkins silo: $SILO"
   exit 1