Merge "Use os-release for opensuse info"

[ci-management.git] / jjb / vpp / vpp-opensuse.yaml

diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml
index 70d936a..8d82e12 100644 (file)
--- a/jjb/vpp/vpp-opensuse.yaml
+++ b/jjb/vpp/vpp-opensuse.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: opensuse423
     jobs:
@@ -5,9 +6,8 @@
         - 'vpp-merge-{stream}-opensuse'
 
     project: 'vpp'
-    os:
-      - opensuse:
-          repo-os-part: 'opensuse'
+    os: 'opensuse'
+    repo-os-part: 'opensuse'
 
     stream:
         - '1801':
@@ -24,9 +24,9 @@
         - 'vpp-merge-{stream}-osleap15'
 
     project: 'vpp'
-    os:
-      - opensuse:
-          repo-os-part: 'opensuse'
+    os: 'opensuse'
+    repo-os-part: 'opensuse'
+
     stream:
         - master:
             branch: 'master'
@@ -42,7 +42,7 @@
     node: 'opensuse-us'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -57,6 +57,8 @@
             os: 'opensuse'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.opensuse'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -102,7 +104,7 @@
     node: 'osleap15-us'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -117,6 +119,8 @@
             os: 'opensuse'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.opensuse'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -129,17 +133,9 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'checkstyle_success'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{name}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
+        - gerrit-trigger-checkstyle:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
@@ -169,7 +165,7 @@
     project-type: freestyle
     node: 'opensuse-us'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -190,6 +186,8 @@
             stream: '{stream}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.opensuse'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -235,11 +233,11 @@
             global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
+                - ../scripts/packagecloud_push.sh
         - shell:
             !include-raw-escape:
-                - ../scripts/packagecloud_push.sh
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
 
     publishers:
         - archive:
@@ -261,7 +259,7 @@
     project-type: freestyle
     node: 'osleap15-us'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -302,11 +300,11 @@
         - config-file-provider:
             files:
               - file-id: '.packagecloud'
-                target: '/home/jenkins'
+                target: '/root'
         - config-file-provider:
             files:
               - file-id: 'packagecloud_api'
-                target: '/home/jenkins'
+                target: '/root'
         - maven-target:
             maven-version: 'mvn33-new'
             goals: '--version'
@@ -327,11 +325,11 @@
             global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
+                - ../scripts/packagecloud_push.sh
         - shell:
             !include-raw-escape:
-                - ../scripts/packagecloud_push.sh
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
 
     publishers:
         - archive: