Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 8908b74f83dc15c5067e8b5a5fc31f7009832e5c..ed52c008bd813a89bed953712e821062d46ac59a 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -19,6 +19,7 @@
     project: 'integration/packaging'
 
     stream:
+      - fluorine
       - carbon
       - nitrogen
       - oxygen
@@ -198,6 +199,7 @@
 
       # Test Oxygen pre-release autorelease tarball
       # FIXME: There aren't any available Oxygen autorelease builds, add one once possible
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
       # - inject:
       # yamllint disable-line rule:line-length
       #    properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
@@ -205,17 +207,19 @@
       # - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
-      - 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.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
+      # - 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.8.0-SNAPSHOT/karaf-0.8.0-20180204.191936-134.zip'
+      # - shell: !include-raw-escape: build-rpm.sh
+      # - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
-      - inject:
-          properties-content: 'STREAM=oxygen'
-      - shell: !include-raw: build-rpm-snap.sh
-      - install-test-uninstall-rpm
+      # 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
 
     triggers:
       - gerrit:
@@ -310,8 +314,9 @@
       - install-test-uninstall-rpm
 
       # Test Oxygen pre-release autorelease tarball
-      # NB: This will need to be updated as old builds expire
       # FIXME: There aren't any available Oxygen autorelease builds, add one once possible
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
+      # 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-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
@@ -319,15 +324,17 @@
       # - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
-      # FIXME: Something is wrong with current Oxygen multipatch builds
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
       # 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.8.0-SNAPSHOT/karaf-0.8.0-20180111.030942-90.zip'
+      #     properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180204.191936-134.zip'
       # - shell: !include-raw: build-rpm.sh
       # - 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
@@ -380,14 +387,16 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw-escape: install-rpm.sh
-      - shell: !include-raw: start-odl.sh
       - 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-escape: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: !include-raw-escape: test-ports-nofeature.sh
       - shell: !include-raw: test-karaf.expect
-      - shell: !include-raw-escape: test-rest-ok.sh
+      # 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: uninstall-rpm.sh