Merge "Add Neon packaging support, tests"

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index cffc29bdbbb79b39716f2ada594d6d5fd570cc09..7076350381c4057f3a25b5b6b4cc6c462342bb60 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -19,6 +19,8 @@ if [ "$STREAM" == "oxygen" ]; then
   VERSION_MAJOR=8
 elif [ "$STREAM" == "fluorine" ]; then
   VERSION_MAJOR=9
+elif [ "$STREAM" == "neon" ]; then
+  VERSION_MAJOR=10
 else
   echo "Unable to convert stream to major version"
   exit 1

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 0d00e97ffe176ac072207c56c389af6245c397af..fd0ce972ef79fcc50a49e9fce403a7901911da13 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -239,6 +239,28 @@
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
+      # Test Neon pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
+      - inject:
+          # yamllint disable-line rule:line-length
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2393/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
+
+      # Test Neon multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
+      - inject:
+          # yamllint disable-line rule:line-length
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20180925.093600-5.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
+
+      # Test latest Neon snapshot
+      - inject:
+          properties-content: 'STREAM=neon'
+      - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
+
     triggers:
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
@@ -320,6 +342,28 @@
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
+      # Test Neon pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
+      - inject:
+          # yamllint disable-line rule:line-length
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2393/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
+
+      # Test Neon multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
+      - inject:
+          # yamllint disable-line rule:line-length
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20180925.093600-5.zip'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
+
+      # Test latest Neon snapshot
+      - inject:
+          properties-content: 'STREAM=neon'
+      - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
+
     triggers:
       - timed: '@daily'
       - gerrit:

diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh
index c91acc53a26c223ab4686b39310f78616d8e2e1b..a7faeb446229094923f756f0160c521ab3959b2e 100644 (file)
--- a/jjb/packaging/test-rpm-docker.sh
+++ b/jjb/packaging/test-rpm-docker.sh
@@ -26,7 +26,7 @@ sudo docker exec $docker_id /bin/bash $scripts_path/start-odl.sh
 sudo docker exec $docker_id /bin/bash $scripts_path/test-ports-nofeature.sh
 
 # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it
-if [ "$STREAM" == "oxygen" ] || [ "$STREAM" == "fluorine" ]; then
+if [ "$STREAM" == "oxygen" ] || [ "$STREAM" == "fluorine" ] || [ "$STREAM" == "neon" ]; then
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect
 else
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf.expect