Merge "Move dlux Sonar scan to Sonarcloud"

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

diff --git a/jjb/packaging/build-rpm-snap-docker.sh b/jjb/packaging/build-rpm-snap-docker.sh
index 0da5178cacba3d3d0669b66394d31089e8caf3b4..2879745ee4d8f3d107d32be57c5dc027e0bdd7c8 100644 (file)
--- a/jjb/packaging/build-rpm-snap-docker.sh
+++ b/jjb/packaging/build-rpm-snap-docker.sh
@@ -10,12 +10,16 @@ env | grep STREAM > env-file
 
 scripts_path=/builder/jjb/packaging
 
-docker_id=$(sudo docker run --env-file env-file --name build_rpm_epel -di --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro centos /usr/lib/systemd/systemd)
+if [ "$DISTRO" == "epel-7" ]; then
+  docker_id=$(sudo docker run --env-file env-file --name build_rpm_epel -di --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro centos /usr/lib/systemd/systemd)
+  sudo docker exec "$docker_id" /usr/bin/yum -y install sudo rpmdevtools rpmbuild git python-virtualenv python
+elif [ "$DISTRO" == "opensuse-42" ]; then
+  docker_id=$(sudo docker run --env-file env-file --name build_rpm_suse -di --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro opensuse /usr/lib/systemd/systemd)
+  sudo docker exec "$docker_id" /usr/bin/zypper -n install sudo rpmdevtools rpmbuild git python-virtualenv python
+fi
 
-sudo docker cp "$(pwd)"/packaging/ $docker_id:/packaging
+sudo docker cp "$(pwd)"/packaging/ "$docker_id":/packaging
 
-sudo docker exec $docker_id /usr/bin/yum -y install sudo rpmdevtools rpmbuild git python-virtualenv python
+sudo docker exec "$docker_id" git clone https://git.opendaylight.org/gerrit/releng/builder
 
-sudo docker exec $docker_id git clone https://git.opendaylight.org/gerrit/releng/builder
-
-sudo docker exec $docker_id /bin/bash $scripts_path/build-rpm-snap.sh
+sudo docker exec "$docker_id" /bin/bash $scripts_path/build-rpm-snap.sh