Code Review
/
releng
/
builder.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
a307f49
)
Merge "Avoid ODLPARENT-139 for Fluorine snap builds"
author
Jamo Luhrsen
<jluhrsen@redhat.com>
Thu, 22 Mar 2018 15:17:26 +0000
(15:17 +0000)
committer
Gerrit Code Review
<gerrit@opendaylight.org>
Thu, 22 Mar 2018 15:17:26 +0000
(15:17 +0000)
jjb/packaging/test-rpm-docker.sh
patch
|
blob
|
history
diff --git
a/jjb/packaging/test-rpm-docker.sh
b/jjb/packaging/test-rpm-docker.sh
index a5c15f471093738c9f2563207354ff24b41b3599..c91acc53a26c223ab4686b39310f78616d8e2e1b 100644
(file)
--- a/
jjb/packaging/test-rpm-docker.sh
+++ b/
jjb/packaging/test-rpm-docker.sh
@@
-26,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