Merge "Fix packaging tox-verify to run only master"

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

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 1dfc0663fe02180021ecea5f4f7d0c00047f682b..664380505825896c1537d22a25cde0bbcc647ff4 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -12,7 +12,9 @@
       - 'packaging-test-rpm-master'
       - 'packaging-test-rpm-upgrade-master'
       - 'packaging-test-deb-master'
-      - gerrit-tox-verify
+      - gerrit-tox-verify:
+          branch: master
+          stream: master
 
     project: 'integration/packaging'
 
@@ -30,7 +32,7 @@
 - job-template:
     name: 'packaging-build-rpm-{stream}'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -92,6 +94,7 @@
           sudo yum install -y nmap
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
@@ -108,7 +111,7 @@
 - job-template:
     name: 'packaging-build-rpm-snap-{stream}'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -175,7 +178,7 @@
 - job-template:
     name: 'packaging-verify-rpm-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -242,7 +245,7 @@
 - job-template:
     name: 'packaging-verify-full-rpm-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -273,9 +276,10 @@
       - shell: !include-raw: build-rpm.sh
 
       # Test Carbon multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20171128.221258-1.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20180115.181738-1.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Carbon snapshot
@@ -296,9 +300,10 @@
       - shell: !include-raw: build-rpm.sh
 
       # Test Nitrogen multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20171128.223150-2.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20180115.183312-2.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Nitrogen snapshot
@@ -307,15 +312,17 @@
       - shell: !include-raw: build-rpm-snap.sh
 
       # Test Oxygen pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
       - shell: !include-raw: build-rpm.sh
 
       # Test Oxygen multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180111.030942-90.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Oxygen snapshot
@@ -344,7 +351,7 @@
 - job-template:
     name: 'packaging-test-rpm-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -379,6 +386,7 @@
           sudo yum install -y nmap
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
 
     publishers:
       # TODO: Remove the archive publisher
@@ -395,7 +403,7 @@
 - job-template:
     name: 'packaging-test-rpm-upgrade-master'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     parameters:
       - opendaylight-infra-parameters:
@@ -439,6 +447,7 @@
       - shell: !include-raw: start-odl.sh
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
 
     publishers:
       - lf-infra-publish