X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Ftrex%2Ftrex.yaml;h=a81577d630ccdc3bafec31cd9de85a94c53c3d8e;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=21863c62bbc6bcfbda7e77057c940fafa75de735;hpb=2fbb94cc9875397b402cebefffcb412c226f6bab;p=ci-management.git

diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml
index 21863c62b..a81577d63 100644
--- a/jjb/trex/trex.yaml
+++ b/jjb/trex/trex.yaml
@@ -2,6 +2,7 @@
     name: trex
     jobs:
         - 'trex-verify-{stream}-{os}'
+        - 'trex-merge-{stream}-{os}'
 
     project: 'trex'
     os:
@@ -18,14 +19,14 @@
     name: 'trex-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
-      artifactDaysToKeep: '-1'
-      artifactNumToKeep: '-1'
-      daysToKeep: '30'
-      numToKeep: '100'
+    build-discarder:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -34,20 +35,70 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-trex-build.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'trex-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+    concurrent: true
+
+    build-discarder:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
     wrappers:
       - fdio-infra-wrappers:
           build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: H */6 * * *
+        - gerrit-trigger-patch-merged:
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
             !include-raw-escape: include-raw-trex-build.sh
 
-    description: "!!! Playground to verify that TRex and docs can be built. !!!\r\n\
-        \r\n\
-        TODO:\r\n\
-        1) merge doc and core repos\r\n\
-        2) replace pull from github by fd.io gerrit with triggering\r\n\
-        3) add a real regression\r\n\r\n"
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'