Build and test rpm-snap using docker

[releng/builder.git] / jjb / packaging / packaging-macros.yaml

diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml
index ea8df73b66d082084200f72ac4a52ba686777fbe..754219b9b6811f5ab2b8cb64740168c961029062 100644 (file)
--- a/jjb/packaging/packaging-macros.yaml
+++ b/jjb/packaging/packaging-macros.yaml
@@ -11,10 +11,10 @@
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y expect nmap
       - shell: !include-raw: test-rpm-deps.sh
-      - shell: !include-raw-escape: install-rpm.sh
+      - shell: !include-raw: install-rpm.sh
       - shell: !include-raw: start-odl.sh
       - shell: !include-raw: test-ports-nofeature.sh
-      - shell: !include-raw: test-karaf.expect
+      - shell: !include-raw: test-karaf-oxygensafe.expect
       # Disable this test until ODLPARENT-139 is fixed
       # - shell: !include-raw: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh