X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fpackaging.yaml;h=6af7324a69dd85e263a851823b6b3fac2f1cd469;hb=ea47f7c6b08c9d99742e7725dbc1300c65e4bf98;hp=16cfd77beb6ad50bcad9075e9dccc5c4ad333dd9;hpb=a89c124b4f0535918f1bdd6248098cf55a608984;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 16cfd77be..6af7324a6 100644
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -4,56 +4,23 @@
     project-name: packaging
 
     jobs:
-      - '{project-name}-verify-python-{stream}'
+      - '{project-name}-verify-tox-master'
       - '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}'
+      - 'packaging-test-rpm-master'
+      - 'packaging-test-rpm-upgrade-master'
+      - 'packaging-test-deb-master'
 
     project: 'integration/packaging'
 
     stream:
-      - master:
-          branch: 'master'
-
-- job-template:
-    name: 'packaging-test-puppet-{stream}'
-
-    node: centos7-docker-2c-4g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+      - boron
+      - carbon
+      - nitrogen
+      - oxygen
+    branch: 'master'
 
-    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-puppet.sh
-
-    triggers:
-      - timed: '@daily'
 
 - job-template:
     name: 'packaging-build-rpm-{stream}'
@@ -62,6 +29,10 @@
 
     project-type: freestyle
 
+    mvn-opts: ''
+    mvn-params: ''
+    mvn-version: mvn33
+
     properties:
       - opendaylight-infra-properties:
           build-days-to-keep: 7
@@ -73,15 +44,16 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
+          staging-profile-id: ''
       - 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.2-Boron/distribution-karaf-0.5.2-Boron.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
-      - string:
-          name: CHANGELOG_DATE
-          default: 'Sun Aug 25 1991'
-          description: 'Date this RPM was defined'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'
@@ -102,11 +74,18 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-rpm.sh
+      - shell: !include-raw: build-rpm.sh
+      - lf-infra-deploy-maven-file:
+          global-settings-file: 'global-settings'
+          settings-file: 'packaging-settings'
+          mvn-version: 'mvn33'
+          repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
+          group-id: 'org.opendaylight.integration-packaging'
+          files-dir: '$WORKSPACE/upload_files'
 
     publishers:
-      - archive-artifacts:
-          artifacts: '**/*.rpm'
+      - lf-infra-publish
+
 
 - job-template:
     name: 'packaging-build-rpm-snap-{stream}'
@@ -115,6 +94,10 @@
 
     project-type: freestyle
 
+    mvn-opts: ''
+    mvn-params: ''
+    mvn-version: mvn33
+
     properties:
       - opendaylight-infra-properties:
           build-days-to-keep: 7
@@ -126,9 +109,14 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
+          staging-profile-id: ''
       - string:
           name: VERSION_MAJOR
-          default: '6'
+          default: '7'
           description: 'OpenDaylight major (element) version number to build'
       - string:
           name: VERSION_MINOR
@@ -154,14 +142,24 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-rpm-snap.sh
+      - shell: !include-raw: build-rpm-snap.sh
+      - lf-infra-deploy-maven-file:
+          global-settings-file: 'global-settings'
+          settings-file: 'packaging-settings'
+          mvn-version: 'mvn33'
+          repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
+          group-id: 'org.opendaylight.integration-packaging'
+          files-dir: '$WORKSPACE/upload_files'
+
+    triggers:
+      - timed: '@daily'
 
     publishers:
-      - archive-artifacts:
-          artifacts: '**/*.rpm'
+      - lf-infra-publish
+
 
 - job-template:
-    name: 'packaging-test-rpm-{stream}'
+    name: 'packaging-test-rpm-master'
 
     node: centos7-java-builder-2c-4g
 
@@ -175,12 +173,8 @@
       - string:
           name: URL
           # yamllint disable-line rule:line-length
-          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-52-release.repo'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-60-release.repo'
           description: 'Link to .repo or .rpm file'
-      - string:
-          name: REPO_FILE
-          default: '/etc/yum.repos.d/opendaylight-52-release.repo'
-          description: 'Name of the .repo file'
 
     scm:
       - integration-gerrit-scm:
@@ -193,17 +187,32 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-rpm.sh
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: |
+          # Install expect to interact with Karaf shell
+          sudo yum install -y expect
+          # Install nmap to check status of ODL's SSH port
+          sudo yum install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
-      - archive-artifacts:
+      # TODO: Remove the archive publisher
+      #       small data should be stored on logs.opendaylight.org
+      #       large data should be stored on nexus.opendaylight.org
+      - archive:
           artifacts: '**'
+          allow-empty: true
+          fingerprint: true
+          latest-only: true
+      - lf-infra-publish
+
 
 - job-template:
-    name: 'packaging-test-deb-{stream}'
+    name: 'packaging-test-rpm-upgrade-master'
 
-    node: ubuntu1604-mininet-ovs-25-2c-4g
+    node: centos7-java-builder-2c-4g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -215,12 +224,13 @@
       - 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'
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-6-release.repo'
+          description: 'Link to .repo or .rpm file'
       - string:
-          name: REPO_FILE
-          default: 'ppa:odl-team/boron'
-          description: 'Name of the PPA repository'
+          name: UPGRADE_URL
+          # yamllint disable-line rule:line-length
+          default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-6-testing.repo'
+          description: 'Link to .repo or .rpm file'
 
     scm:
       - integration-gerrit-scm:
@@ -233,23 +243,28 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-deb.sh
+      - shell: !include-raw: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: |
+          # Install expect to interact with Karaf shell
+          sudo yum install -y expect
+          # Install nmap to check status of ODL's SSH port
+          sudo yum install -y nmap
       - shell: !include-raw: include-raw-test-karaf.expect
+      - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: test-rpm-upgrade.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: !include-raw: include-raw-test-karaf.expect
+      - shell: !include-raw: stop-odl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: '**'
+      - lf-infra-publish
 
-- job-template:
-    name: 'packaging-test-ansible-rpm-{stream}'
 
-    node: centos7-java-builder-2c-4g
-
-    project-type: freestyle
+- job-template:
+    name: 'packaging-test-deb-master'
 
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
+    node: ubuntu1604-mininet-ovs-25-2c-4g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -258,6 +273,10 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - string:
+          name: PACKAGE
+          default: 'ppa:odl-team/carbon'
+          description: 'Link to .deb package or name of PPA repo'
 
     scm:
       - integration-gerrit-scm:
@@ -270,19 +289,31 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-ansible-rpm.sh
+      - shell: !include-raw: install-deb.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: |
+          # Install expect to interact with Karaf shell
+          sudo apt-get install -y expect
+          # Install nmap to check status of ODL's SSH port
+          sudo apt-get install -y nmap
+      - shell: !include-raw: include-raw-test-karaf.expect
+      - shell: !include-raw: stop-odl.sh
 
-    triggers:
-      - timed: '@daily'
+    publishers:
+      - lf-infra-publish
 
 
 - job-template:
     name: 'packaging-build-deb-{stream}'
 
-    node: ubuntu1404-mininet-2c-2g
+    node: ubuntu1604-mininet-ovs-25-2c-4g
 
     project-type: freestyle
 
+    mvn-opts: ''
+    mvn-params: ''
+    mvn-version: mvn33
+
     properties:
       - opendaylight-infra-properties:
           build-days-to-keep: 7
@@ -294,13 +325,18 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
+          staging-profile-id: ''
       - string:
           name: VERSION_MAJOR
           default: '5'
           description: 'OpenDaylight major (element) version number to build'
       - string:
           name: VERSION_MINOR
-          default: '2'
+          default: '3'
           description: 'OpenDaylight minor (SR) version number to build'
       - string:
           name: VERSION_PATCH
@@ -316,17 +352,21 @@
           description: 'Version of ODL systemd unitfile to download and package in ODL .deb'
       - string:
           name: CODENAME
-          default: 'Boron-SR2'
+          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.2-Boron/distribution-karaf-0.5.2-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
           default: '8'
           description: Java dependency for the ODL release
+      - string:
+          name: JAVA_HOME
+          default: '/usr/lib/jvm/java-8-openjdk-amd64/'
+          description: Set JAVA_HOME to openjdk8
       - string:
           name: CHANGELOG_DATE
           default: 'Mon, 1 Aug 2016'
@@ -355,44 +395,14 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-build-deb.sh
+      - shell: !include-raw: build-deb.sh
+      - lf-infra-deploy-maven-file:
+          global-settings-file: 'global-settings'
+          settings-file: 'packaging-settings'
+          mvn-version: '{mvn-version}'
+          repo-id: 'opendaylight-{stream}-ubuntu-1604-x86_64-devel'
+          group-id: 'org.opendaylight.integration-packaging'
+          files-dir: '$WORKSPACE/upload_files'
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'packaging/deb/opendaylight/*.deb'
-
-
-- job-template:
-    name: 'packaging-test-ansible-deb-{stream}'
-
-    node: ubuntu1604-mininet-ovs-25-2c-4g
-
-    project-type: freestyle
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    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-ansible-deb.sh
-
-    triggers:
-      - timed: '@daily'
+      - lf-infra-publish