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 e9d49f02b8cb5e147b773f3e320bb42a7d4e6b99..4a1338ba02f61826d68b08be063ca178beadea48 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -30,7 +30,7 @@
 - job-template:
     name: 'packaging-build-rpm-{stream}'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     project-type: freestyle
 
@@ -80,6 +80,18 @@
 
     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'
@@ -96,7 +108,7 @@
 - job-template:
     name: 'packaging-build-rpm-snap-{stream}'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     project-type: freestyle
 
@@ -143,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'
@@ -162,7 +175,7 @@
 - job-template:
     name: 'packaging-verify-rpm-master'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     project-type: freestyle
 
@@ -229,7 +242,7 @@
 - job-template:
     name: 'packaging-verify-full-rpm-master'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     project-type: freestyle
 
@@ -331,7 +344,7 @@
 - job-template:
     name: 'packaging-test-rpm-master'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -382,7 +395,7 @@
 - job-template:
     name: 'packaging-test-rpm-upgrade-master'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-1c-4g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -434,7 +447,7 @@
 - job-template:
     name: 'packaging-test-deb-master'
 
-    node: ubuntu1604-mininet-ovs-25-2c-4g
+    node: ubuntu1604-mininet-ovs-25-1c-4g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -476,7 +489,7 @@
 - job-template:
     name: 'packaging-build-deb-{stream}'
 
-    node: ubuntu1604-mininet-ovs-25-2c-4g
+    node: ubuntu1604-mininet-ovs-25-1c-4g
 
     project-type: freestyle