Merge "Create install-test-uninstall-deb builder"

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 8a7c0b0ee2e37c5a199faae5bf42c63cd33cd749..bb7add2fbb79eb9afc3ad59acbe7c87958aced6f 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -4,6 +4,11 @@
     project-name: packaging
 
     jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: integration/packaging
+          rtd-project: odl-integrationpackaging
       - 'packaging-build-rpm-{stream}'
       - 'packaging-build-rpm-{distro}-snap-{stream}'
       - 'packaging-build-deb-{stream}'
@@ -492,15 +497,18 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: install-deb.sh
+      - shell: !include-raw-escape: install-deb.sh
       - shell: !include-raw: start-odl.sh
+      - shell: !include-raw-escape: test-ports-nofeature.sh
       - shell: |
           # Install expect to interact with Karaf shell
-          sudo apt-get install -y expect
           # Install nmap to check status of ODL's SSH port
-          sudo apt-get install -y nmap
+          sudo apt-get install -y expect nmap
       - shell: !include-raw: test-karaf-oxygensafe.expect
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw-escape: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw-escape: uninstall-deb.sh
 
     publishers:
       - lf-infra-publish
@@ -560,6 +568,7 @@
 
     builders:
       - shell: !include-raw: build-deb.sh
+      - install-test-uninstall-deb
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'