Consolidate recent view into 1

[releng/builder.git] / jjb / packaging / test-rpm-docker.sh

diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh
index 5f4fa30fc51222865e1a40f6f971baf560d3862b..c91acc53a26c223ab4686b39310f78616d8e2e1b 100644 (file)
--- a/jjb/packaging/test-rpm-docker.sh
+++ b/jjb/packaging/test-rpm-docker.sh
@@ -9,9 +9,13 @@ set -ex -o pipefail
 scripts_path=/builder/jjb/packaging
 
 # A docker container must have been created by the build script
-docker_id=$(sudo docker ps -qf name=build_rpm_epel)
-
-sudo docker exec $docker_id /usr/bin/yum -y install curl expect nmap openssh
+if [ "$DISTRO" == "epel-7" ]; then
+  docker_id=$(sudo docker ps -qf name=build_rpm_epel)
+  sudo docker exec $docker_id /usr/bin/yum -y install curl expect nmap openssh
+elif [ "$DISTRO" == "opensuse-42" ]; then
+  docker_id=$(sudo docker ps -qf name=build_rpm_suse)
+  sudo docker exec $docker_id /usr/bin/zypper -n install curl expect nmap openssh
+fi
 
 sudo docker exec $docker_id /bin/bash $scripts_path/test-rpm-deps.sh
 
@@ -22,7 +26,7 @@ sudo docker exec $docker_id /bin/bash $scripts_path/start-odl.sh
 sudo docker exec $docker_id /bin/bash $scripts_path/test-ports-nofeature.sh
 
 # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it
-if [ "$STREAM" == "oxygen" ]; then
+if [ "$STREAM" == "oxygen" ] || [ "$STREAM" == "fluorine" ]; then
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect
 else
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf.expect