Merge "Update RPM tests to Oxygen SR4"

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 2f120cdcbf78c25c6ae89cc14af37016f9cd3813..e7412b9c95893d21f858f78ec26e04ce01682580 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -68,7 +68,7 @@
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
       - string:
           name: CHANGELOG_NAME
@@ -161,6 +161,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - inject:
           properties-content: |
               STREAM={stream}
@@ -209,10 +210,10 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Oxygen SR3 release tarball
+      # Test Oxygen SR4 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.3/karaf-0.8.3.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -291,10 +292,10 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Oxygen SR3 release tarball
+      # Test Oxygen SR4 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.3/karaf-0.8.3.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.4/karaf-0.8.4.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -615,6 +616,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw: build-deb.sh
       - install-test-uninstall-deb
       - lf-infra-deploy-maven-file: