Merge "Remove snmp carbon jobs"

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

diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml
index 57830eaea0109373c7f5158e8907c304c9482141..568f942239313c766fb585e7d2d004cceceda75f 100644 (file)
--- a/jjb/packaging/packaging-macros.yaml
+++ b/jjb/packaging/packaging-macros.yaml
@@ -5,18 +5,43 @@
     builders:
       - inject:
           properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
-      # Use *-escape to make double brace expansion work. JJB strangeness.
-      - shell: !include-raw: test-rpm-deps.sh
-      - shell: !include-raw-escape: install-rpm.sh
-      - shell: !include-raw: start-odl.sh
       # Install deps needed interactive Karaf shell tests
       - shell: |
           # Install expect to interact with Karaf shell
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y expect nmap
-      - shell: !include-raw: test-karaf.expect
+      - shell: !include-raw: test-rpm-deps.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-oxygensafe.expect
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw: uninstall-rpm.sh
       - shell: |
           # Remove old host key so future installs don't fail to SSH
-          rm /home/jenkins/.ssh/known_hosts
+          rm /home/jenkins/.ssh/known_hosts || echo "No known_hosts file"
+
+- builder:
+    name: install-test-uninstall-deb
+    builders:
+      - inject:
+          properties-content: 'PACKAGE=$WORKSPACE/packaging/packages/deb/opendaylight/*.deb'
+      # Install deps needed interactive Karaf shell tests
+      - shell: |
+          # Install expect to interact with Karaf shell
+          # Install nmap to check status of ODL's SSH port
+          sudo apt-get install -y expect nmap
+      - shell: !include-raw: test-deb-deps.sh
+      - shell: !include-raw: install-deb.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: !include-raw: test-ports-nofeature.sh
+      - 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
+      - shell: !include-raw: uninstall-deb.sh
+      - shell: |
+          # Remove old host key so future installs don't fail to SSH
+          rm /home/jenkins/.ssh/known_hosts || echo "No known_hosts file"