Merge "Use new verify-tox job name, vs verify-python"

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 417c59238688f5fd3f3b0ba5666abf758c9ec1cc..6186b00ef1f5dab41ef10d8e77a0e8443dda8012 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -4,11 +4,12 @@
     project-name: packaging
 
     jobs:
-      - '{project-name}-verify-python-{stream}'
+      - '{project-name}-verify-tox-{stream}'
       - 'packaging-build-rpm-{stream}'
       - 'packaging-build-rpm-snap-{stream}'
       - 'packaging-build-deb-{stream}'
       - 'packaging-test-rpm-{stream}'
+      - 'packaging-test-deb-{stream}'
       - 'packaging-test-puppet-{stream}'
       - 'packaging-test-ansible-rpm-{stream}'
       - 'packaging-test-ansible-deb-{stream}'
@@ -32,6 +33,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -66,6 +68,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -73,16 +76,8 @@
       - 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/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
-      - string:
-          name: SYSD_COMMIT
-          default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'
-          description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
-      - string:
-          name: CHANGELOG_DATE
-          default: 'Sun Aug 25 1991'
-          description: 'Date this RPM was defined'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'
@@ -122,22 +117,19 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           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'
-          description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'
@@ -171,6 +163,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -178,12 +171,48 @@
       - 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'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: 'packaging'
+          refspec: '$GERRIT_REFSPEC'
+          branch: 'master'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - shell: !include-raw: include-raw-test-rpm.sh
+      - shell: !include-raw: include-raw-test-karaf.expect
+
+    publishers:
+      - archive-artifacts:
+          artifacts: '**'
+
+- job-template:
+    name: 'packaging-test-deb-{stream}'
+
+    node: ubuntu1604-mininet-ovs-25-2c-4g
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - string:
+          name: URL
+          # yamllint disable-line rule:line-length
+          default: 'http://download.opensuse.org/repositories/home:/akshitajha/xUbuntu_16.04/all/opendaylight_5.0.0-1_all.deb'
+          description: 'Link to .deb file'
       - string:
           name: REPO_FILE
-          default: '/etc/yum.repos.d/opendaylight-51-release.repo'
-          description: 'Name of the .repo file'
+          default: 'ppa:odl-team/boron'
+          description: 'Name of the PPA repository'
 
     scm:
       - integration-gerrit-scm:
@@ -196,8 +225,8 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-rpm.sh
-      - shell: !include-raw: include-raw-test-karaf.sh
+      - shell: !include-raw: include-raw-test-deb.sh
+      - shell: !include-raw: include-raw-test-karaf.expect
 
     publishers:
       - archive-artifacts:
@@ -216,6 +245,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -241,7 +271,7 @@
 - job-template:
     name: 'packaging-build-deb-{stream}'
 
-    node: ubuntu-trusty-mininet-2c-2g
+    node: ubuntu1404-mininet-2c-2g
 
     project-type: freestyle
 
@@ -251,6 +281,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -261,7 +292,7 @@
           description: 'OpenDaylight major (element) version number to build'
       - string:
           name: VERSION_MINOR
-          default: '0'
+          default: '3'
           description: 'OpenDaylight minor (SR) version number to build'
       - string:
           name: VERSION_PATCH
@@ -273,16 +304,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-SR3'
           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/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into .deb'
       - string:
           name: JAVA_VERSION
@@ -326,7 +357,7 @@
 - job-template:
     name: 'packaging-test-ansible-deb-{stream}'
 
-    node: ubuntu-trusty-mininet-2c-2g
+    node: ubuntu1604-mininet-ovs-25-2c-4g
 
     project-type: freestyle
 
@@ -336,6 +367,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'