Merge "Add job to install ODL via ansible-opendaylight"

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 417c59238688f5fd3f3b0ba5666abf758c9ec1cc..b66a1271727f8df1292dc0bf609367fcf43e0347 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -73,11 +73,11 @@
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.2-Boron/distribution-karaf-0.5.2-Boron.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
       - string:
           name: SYSD_COMMIT
-          default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'
+          default: 'ba1f409c1a46efd068b16ced6ddc8b32a412b03a'
           description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
       - string:
           name: CHANGELOG_DATE
@@ -128,15 +128,15 @@
           artifacts: '{archive-artifacts}'
       - string:
           name: VERSION_MAJOR
-          default: '5'
+          default: '6'
           description: 'OpenDaylight major (element) version number to build'
       - string:
           name: VERSION_MINOR
-          default: '2'
+          default: '0'
           description: 'OpenDaylight minor (SR) version number to build'
       - string:
           name: SYSD_COMMIT
-          default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'
+          default: 'ba1f409c1a46efd068b16ced6ddc8b32a412b03a'
           description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
       - string:
           name: CHANGELOG_NAME
@@ -178,11 +178,11 @@
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-51-release.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-52-release.repo'
           description: 'Link to .repo or .rpm file'
       - string:
           name: REPO_FILE
-          default: '/etc/yum.repos.d/opendaylight-51-release.repo'
+          default: '/etc/yum.repos.d/opendaylight-52-release.repo'
           description: 'Name of the .repo file'
 
     scm:
@@ -197,7 +197,7 @@
 
     builders:
       - shell: !include-raw: include-raw-test-rpm.sh
-      - shell: !include-raw: include-raw-test-karaf.sh
+      - shell: !include-raw: include-raw-test-karaf.expect
 
     publishers:
       - archive-artifacts:
@@ -261,7 +261,7 @@
           description: 'OpenDaylight major (element) version number to build'
       - string:
           name: VERSION_MINOR
-          default: '0'
+          default: '2'
           description: 'OpenDaylight minor (SR) version number to build'
       - string:
           name: VERSION_PATCH
@@ -273,16 +273,16 @@
           description: 'Deb version for the given ODL major.minor.patch'
       - string:
           name: SYSD_COMMIT
-          default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'
+          default: 'ba1f409c1a46efd068b16ced6ddc8b32a412b03a'
           description: 'Version of ODL systemd unitfile to download and package in ODL .deb'
       - string:
           name: CODENAME
-          default: 'Boron'
+          default: 'Boron-SR2'
           description: 'Elemental codename for the ODL release, including SR if applicable'
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.2-Boron/distribution-karaf-0.5.2-Boron.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into .deb'
       - string:
           name: JAVA_VERSION