Remove traces of Boron logic

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index d8f59253445cf9134b2105eae9e6d323288d2384..83c2c629a618ecb318821bc402a4e506cb8b061b 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -15,12 +15,15 @@
     project: 'integration/packaging'
 
     stream:
-      - boron
       - carbon
       - nitrogen
       - oxygen
     branch: 'master'
 
+    # common parameters required for 'lf-infra-deploy-maven-file' builder
+    group-id: 'org.opendaylight.integration-packaging'
+    upload-files-dir: '$WORKSPACE/upload_files'
+    maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
 
 - job-template:
     name: 'packaging-build-rpm-{stream}'
@@ -78,11 +81,27 @@
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
-          mvn-version: 'mvn33'
-          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
+          mvn-version: '{mvn-version}'
           repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
-          group-id: 'org.opendaylight.integration-packaging'
-          upload-files-dir: '$WORKSPACE/upload_files'
+          group-id: '{group-id}'
+          upload-files-dir: '{upload-files-dir}'
+          maven-repo-url: '{maven-repo-url}'
+
+    triggers:
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-rpm-direct'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'packages/**'
 
     publishers:
       - lf-infra-publish
@@ -115,14 +134,6 @@
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
           staging-profile-id: ''
-      - string:
-          name: VERSION_MAJOR
-          default: '7'
-          description: 'OpenDaylight major (element) version number to build'
-      - string:
-          name: VERSION_MINOR
-          default: '0'
-          description: 'OpenDaylight minor (SR) version number to build'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'
@@ -147,14 +158,28 @@
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
-          mvn-version: 'mvn33'
-          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
+          mvn-version: '{mvn-version}'
           repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
-          group-id: 'org.opendaylight.integration-packaging'
-          upload-files-dir: '$WORKSPACE/upload_files'
+          group-id: '{group-id}'
+          upload-files-dir: '{upload-files-dir}'
+          maven-repo-url: '{maven-repo-url}'
 
     triggers:
       - timed: '@daily'
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-rpm-snap'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'packages/**'
 
     publishers:
       - lf-infra-publish
@@ -196,7 +221,7 @@
           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: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
 
     publishers:
@@ -252,11 +277,11 @@
           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: 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: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
 
     publishers:
@@ -298,7 +323,7 @@
           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: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
 
     publishers:
@@ -334,6 +359,7 @@
           staging-profile-id: ''
       - string:
           name: DOWNLOAD_URL
+          # FIXME: Update the default value to an active stream.
           # yamllint disable-line rule:line-length
           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'
@@ -362,10 +388,26 @@
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
           mvn-version: '{mvn-version}'
-          maven-repo-url: '$NEXUS_URL/content/repositories/$REPO_ID'
           repo-id: 'opendaylight-{stream}-ubuntu-1604-x86_64-devel'
-          group-id: 'org.opendaylight.integration-packaging'
-          upload-files-dir: '$WORKSPACE/upload_files'
+          group-id: '{group-id}'
+          upload-files-dir: '{upload-files-dir}'
+          maven-repo-url: '{maven-repo-url}'
+
+    triggers:
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-deb'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'packages/**'
 
     publishers:
       - lf-infra-publish