VPP: arm voting back on without test

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

diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml
index 7e266e2..2681455 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,13 +24,16 @@
         - 'vpp-merge-{stream}-osleap15'
 
     project: 'vpp'
-    os:
-      - opensuse:
-          repo-os-part: 'opensuse'
+    os: 'opensuse'
+    repo-os-part: 'opensuse'
+
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
 
 - job-template:
     name: 'vpp-verify-{stream}-opensuse'
@@ -54,6 +57,8 @@
             os: 'opensuse'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.opensuse'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -66,7 +71,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -114,6 +119,8 @@
             os: 'opensuse'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.opensuse'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -126,7 +133,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
@@ -179,6 +186,8 @@
             stream: '{stream}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.opensuse'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -224,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:
@@ -316,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: