Merge changes from topic 'RELENG-704'

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 437d71bf19749fb8a4e0929f1b9090fdd67e6bf9..4a1338ba02f61826d68b08be063ca178beadea48 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -81,6 +81,17 @@
     builders:
       - shell: !include-raw: build-rpm.sh
       - shell: !include-raw: test-rpm-deps.sh
+      - inject:
+          properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: |
+          # Install expect to interact with Karaf shell
+          sudo yum install -y expect
+          # Install nmap to check status of ODL's SSH port
+          sudo yum install -y nmap
+      - shell: !include-raw: test-karaf.expect
+      - shell: !include-raw: stop-odl.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
@@ -144,6 +155,7 @@
       - inject:
           properties-content: 'STREAM={stream}'
       - shell: !include-raw: build-rpm-snap.sh
+      - shell: !include-raw: test-rpm-deps.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'