From: Daniel Farrell <dfarrell@redhat.com>
Date: Mon, 5 Mar 2018 13:50:47 +0000 (-0500)
Subject: Use Karaf test script that avoids ODLPARENT-139
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b7e22fdc1df69cfc3f514d51d8e88bf1f282dc82;p=releng%2Fbuilder.git

Use Karaf test script that avoids ODLPARENT-139

Change-Id: I85bd3fc6ea696c7b811de1873ed874410ea112c0
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
---

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 341138af62..833de59731 100644
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -215,11 +215,10 @@
       # - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
-      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
-      # - inject:
-      #     properties-content: 'STREAM=oxygen'
-      # - shell: !include-raw: build-rpm-snap.sh
-      # - install-test-uninstall-rpm
+      - inject:
+          properties-content: 'STREAM=oxygen'
+      - shell: !include-raw: build-rpm-snap.sh
+      - install-test-uninstall-rpm
 
     triggers:
       - gerrit:
@@ -336,8 +335,6 @@
       # - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
-      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
-      # NB: Leaving this one known-failing Oxygen test running so can watch for fix
       - inject:
           properties-content: 'STREAM=oxygen'
       - shell: !include-raw: build-rpm-snap.sh